Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #1119 from jbampton/fix-spelling
Fix spelling
  • Loading branch information
nickysemenza committed Nov 13, 2020
2 parents 9ccff9a + a22fd94 commit c1bf7b9
Show file tree
Hide file tree
Showing 15 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -30,7 +30,7 @@ services:

# Only build pull requests, pushes to the master branch, and branches
# starting with `test-`. This is a convenient way to push branches to
# your own fork of the repostiory to ensure Travis passes before submitting
# your own fork of the repository to ensure Travis passes before submitting
# a PR. For instance, you might run:
# git push myremote branchname:test-branchname
branches:
Expand Down
2 changes: 1 addition & 1 deletion api/api.go
Expand Up @@ -176,7 +176,7 @@ type Response struct {
Messages []ResponseMessage `json:"messages"`
}

// NewSuccessResponse is a shortcut for creating new successul API
// NewSuccessResponse is a shortcut for creating new successful API
// responses.
func NewSuccessResponse(result interface{}) Response {
return Response{
Expand Down
2 changes: 1 addition & 1 deletion api/bundle/bundle.go
Expand Up @@ -62,7 +62,7 @@ func (h *Handler) Handle(w http.ResponseWriter, r *http.Request) error {
case "certificate":
bundle, err := h.bundler.BundleFromPEMorDER([]byte(blob["certificate"]), []byte(blob["private_key"]), bf, "")
if err != nil {
log.Warning("bad PEM certifcate or private key")
log.Warning("bad PEM certificate or private key")
return err
}

Expand Down
2 changes: 1 addition & 1 deletion api/certinfo/certinfo.go
Expand Up @@ -58,7 +58,7 @@ func (h *Handler) Handle(w http.ResponseWriter, r *http.Request) (err error) {
}
case "certificate":
if cert, err = certinfo.ParseCertificatePEM([]byte(blob["certificate"])); err != nil {
log.Warningf("bad PEM certifcate: %v", err)
log.Warningf("bad PEM certificate: %v", err)
return err
}
case "serial", "authority_key_id":
Expand Down
2 changes: 1 addition & 1 deletion api/client/client.go
Expand Up @@ -328,7 +328,7 @@ func (ar *AuthRemote) Sign(req []byte) ([]byte, error) {
return ar.AuthSign(req, nil, ar.provider)
}

// nomalizeURL checks for http/https protocol, appends "http" as default protocol if not defiend in url
// normalizeURL checks for http/https protocol, appends "http" as default protocol if not defined in url
func normalizeURL(addr string) (*url.URL, error) {
addr = strings.TrimSpace(addr)

Expand Down
4 changes: 2 additions & 2 deletions bundler/bundler.go
Expand Up @@ -44,7 +44,7 @@ const (
// by the most platforms.
Ubiquitous BundleFlavor = "ubiquitous"

// Force means the bundler only verfiies the input as a valid bundle, not optimization is done.
// Force means the bundler only verifies the input as a valid bundle, not optimization is done.
Force BundleFlavor = "force"
)

Expand Down Expand Up @@ -470,7 +470,7 @@ func constructCertFileName(cert *x509.Certificate) string {
// intermediate pool, the certificate is saved to file and added to
// the list of intermediates to be used for verification. This will
// not add any new certificates to the root pool; if the ultimate
// issuer is not trusted, fetching the certicate here will not change
// issuer is not trusted, fetching the certificate here will not change
// that.
func (b *Bundler) fetchIntermediates(certs []*x509.Certificate) (err error) {
if IntermediateStash != "" {
Expand Down
2 changes: 1 addition & 1 deletion bundler/bundler_test.go
Expand Up @@ -774,7 +774,7 @@ func newBundlerFromPEM(t *testing.T, caBundlePEM, intBundlePEM []byte) (b *Bundl
}

// newCustomizedBundleCreator is a helper function that returns a new Bundler
// takes specified CA bundle, intermediate bundle, and any additional intermdiate certs to generate a bundler.
// takes specified CA bundle, intermediate bundle, and any additional intermediate certs to generate a bundler.
func newCustomizedBundlerFromFile(t *testing.T, caBundle, intBundle, adhocInters string) (b *Bundler) {
b, err := NewBundler(caBundle, intBundle)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion certdb/sql/database_accessor.go
Expand Up @@ -327,7 +327,7 @@ func (d *Accessor) UpdateOCSP(serial, aki, body string, expiry time.Time) error
// We didn't implement 'upsert' with SQL statement and we lost race condition
// prevention provided by underlying DBMS.
// Reasoning:
// 1. it's diffcult to support multiple DBMS backends in the same time, the
// 1. it's difficult to support multiple DBMS backends in the same time, the
// SQL syntax differs from one to another.
// 2. we don't need a strict simultaneous consistency between OCSP and certificate
// status. It's OK that a OCSP response still shows 'good' while the
Expand Down
2 changes: 1 addition & 1 deletion cli/config.go
Expand Up @@ -124,7 +124,7 @@ func registerFlags(c *Config, f *flag.FlagSet) {
f.StringVar(&c.Password, "password", "0", "Password for accessing PKCS #12 data passed to bundler")
f.StringVar(&c.Usage, "usage", "", "usage of private key")
f.StringVar(&c.PGPPrivate, "pgp-private", "", "file to load a PGP Private key decryption")
f.StringVar(&c.PGPName, "pgp-name", "", "PGP public key name, can be a comma-sepearted key name list")
f.StringVar(&c.PGPName, "pgp-name", "", "PGP public key name, can be a comma-separated key name list")
f.StringVar(&c.Serial, "serial", "", "certificate serial number")
f.StringVar(&c.CNOverride, "cn", "", "certificate common name (CN)")
f.StringVar(&c.AKI, "aki", "", "certificate issuer (authority) key identifier")
Expand Down
2 changes: 1 addition & 1 deletion cli/serve/static/assets/cfssl.js
Expand Up @@ -81,7 +81,7 @@
'scan.tlshandshake.title': 'TLS Handshake',
'scan.tlshandshake.description': 'Scans for host\'s SSL and TLS versions and cipher suite negotiation.',
'scan.tlshandshake.CipherSuite.title': 'Cipher Suite Matrix',
'scan.tlshandshake.CipherSuite.body': 'Determines host\'s cipher suite accepted and prefered order.',
'scan.tlshandshake.CipherSuite.body': 'Determines host\'s cipher suite accepted and preferred order.',
'scan.tlssession.title': 'TLS Session',
'scan.tlssession.description': 'Scans host\'s implementation of TLS session resumption using session ticket and session IDs.',
'scan.tlssession.SessionResume.title': 'Session Resumption',
Expand Down
2 changes: 1 addition & 1 deletion cmd/cfssl/cfssl.go
Expand Up @@ -54,7 +54,7 @@ import (
// main defines the cfssl usage and registers all defined commands and flags.
func main() {
// Add command names to cfssl usage
flag.Usage = nil // this is set to nil for testabilty
flag.Usage = nil // this is set to nil for testability
// Register commands.
cmds := map[string]*cli.Command{
"bundle": bundle.Command,
Expand Down
2 changes: 1 addition & 1 deletion config/config.go
Expand Up @@ -85,7 +85,7 @@ type SigningProfile struct {
BackdateString string `json:"backdate"`
AuthKeyName string `json:"auth_key"`
CopyExtensions bool `json:"copy_extensions"`
PrevAuthKeyName string `json:"prev_auth_key"` // to suppport key rotation
PrevAuthKeyName string `json:"prev_auth_key"` // to support key rotation
RemoteName string `json:"remote"`
NotBefore time.Time `json:"not_before"`
NotAfter time.Time `json:"not_after"`
Expand Down
4 changes: 2 additions & 2 deletions config/config_test.go
Expand Up @@ -401,9 +401,9 @@ func TestParse(t *testing.T) {
for _, p := range invalidProfiles {
if p.populate(nil) == nil {
if p != nil {
t.Fatalf("ExpiryString=%s should not be parseable", p.ExpiryString)
t.Fatalf("ExpiryString=%s should not be parsable", p.ExpiryString)
}
t.Fatalf("Nil profile should not be parseable")
t.Fatalf("Nil profile should not be parsable")
}
}

Expand Down
2 changes: 1 addition & 1 deletion doc/cmd/cfssl.txt
Expand Up @@ -89,7 +89,7 @@ blank.
+ Key Usages
+ signing
+ digital signature
+ content committment
+ content commitment
+ key encipherment
+ key agreement
+ data encipherment
Expand Down
4 changes: 2 additions & 2 deletions helpers/derhelpers/ed25519.go
Expand Up @@ -26,7 +26,7 @@ type subjectPublicKeyInfo struct {

// MarshalEd25519PublicKey creates a DER-encoded SubjectPublicKeyInfo for an
// ed25519 public key, as defined in
// https://tools.ietf.org/html/draft-ietf-curdle-pkix-04. This is analagous to
// https://tools.ietf.org/html/draft-ietf-curdle-pkix-04. This is analogous to
// MarshalPKIXPublicKey in crypto/x509, which doesn't currently support Ed25519.
func MarshalEd25519PublicKey(pk crypto.PublicKey) ([]byte, error) {
pub, ok := pk.(ed25519.PublicKey)
Expand Down Expand Up @@ -82,7 +82,7 @@ type oneAsymmetricKey struct {
// oneAsymmetricKey.
type curvePrivateKey []byte

// MarshalEd25519PrivateKey returns a DER encdoing of the input private key as
// MarshalEd25519PrivateKey returns a DER encoding of the input private key as
// specified in https://tools.ietf.org/html/draft-ietf-curdle-pkix-04.
func MarshalEd25519PrivateKey(sk crypto.PrivateKey) ([]byte, error) {
priv, ok := sk.(ed25519.PrivateKey)
Expand Down

0 comments on commit c1bf7b9

Please sign in to comment.