Skip to content

Commit c1bf7b9

Browse files
authored
Merge pull request #1119 from jbampton/fix-spelling
Fix spelling
2 parents 9ccff9a + a22fd94 commit c1bf7b9

File tree

15 files changed

+18
-18
lines changed

15 files changed

+18
-18
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ services:
3030

3131
# Only build pull requests, pushes to the master branch, and branches
3232
# starting with `test-`. This is a convenient way to push branches to
33-
# your own fork of the repostiory to ensure Travis passes before submitting
33+
# your own fork of the repository to ensure Travis passes before submitting
3434
# a PR. For instance, you might run:
3535
# git push myremote branchname:test-branchname
3636
branches:

api/api.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ type Response struct {
176176
Messages []ResponseMessage `json:"messages"`
177177
}
178178

179-
// NewSuccessResponse is a shortcut for creating new successul API
179+
// NewSuccessResponse is a shortcut for creating new successful API
180180
// responses.
181181
func NewSuccessResponse(result interface{}) Response {
182182
return Response{

api/bundle/bundle.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func (h *Handler) Handle(w http.ResponseWriter, r *http.Request) error {
6262
case "certificate":
6363
bundle, err := h.bundler.BundleFromPEMorDER([]byte(blob["certificate"]), []byte(blob["private_key"]), bf, "")
6464
if err != nil {
65-
log.Warning("bad PEM certifcate or private key")
65+
log.Warning("bad PEM certificate or private key")
6666
return err
6767
}
6868

api/certinfo/certinfo.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func (h *Handler) Handle(w http.ResponseWriter, r *http.Request) (err error) {
5858
}
5959
case "certificate":
6060
if cert, err = certinfo.ParseCertificatePEM([]byte(blob["certificate"])); err != nil {
61-
log.Warningf("bad PEM certifcate: %v", err)
61+
log.Warningf("bad PEM certificate: %v", err)
6262
return err
6363
}
6464
case "serial", "authority_key_id":

api/client/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ func (ar *AuthRemote) Sign(req []byte) ([]byte, error) {
328328
return ar.AuthSign(req, nil, ar.provider)
329329
}
330330

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

bundler/bundler.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ const (
4444
// by the most platforms.
4545
Ubiquitous BundleFlavor = "ubiquitous"
4646

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

@@ -470,7 +470,7 @@ func constructCertFileName(cert *x509.Certificate) string {
470470
// intermediate pool, the certificate is saved to file and added to
471471
// the list of intermediates to be used for verification. This will
472472
// not add any new certificates to the root pool; if the ultimate
473-
// issuer is not trusted, fetching the certicate here will not change
473+
// issuer is not trusted, fetching the certificate here will not change
474474
// that.
475475
func (b *Bundler) fetchIntermediates(certs []*x509.Certificate) (err error) {
476476
if IntermediateStash != "" {

bundler/bundler_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -774,7 +774,7 @@ func newBundlerFromPEM(t *testing.T, caBundlePEM, intBundlePEM []byte) (b *Bundl
774774
}
775775

776776
// newCustomizedBundleCreator is a helper function that returns a new Bundler
777-
// takes specified CA bundle, intermediate bundle, and any additional intermdiate certs to generate a bundler.
777+
// takes specified CA bundle, intermediate bundle, and any additional intermediate certs to generate a bundler.
778778
func newCustomizedBundlerFromFile(t *testing.T, caBundle, intBundle, adhocInters string) (b *Bundler) {
779779
b, err := NewBundler(caBundle, intBundle)
780780
if err != nil {

certdb/sql/database_accessor.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ func (d *Accessor) UpdateOCSP(serial, aki, body string, expiry time.Time) error
327327
// We didn't implement 'upsert' with SQL statement and we lost race condition
328328
// prevention provided by underlying DBMS.
329329
// Reasoning:
330-
// 1. it's diffcult to support multiple DBMS backends in the same time, the
330+
// 1. it's difficult to support multiple DBMS backends in the same time, the
331331
// SQL syntax differs from one to another.
332332
// 2. we don't need a strict simultaneous consistency between OCSP and certificate
333333
// status. It's OK that a OCSP response still shows 'good' while the

cli/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ func registerFlags(c *Config, f *flag.FlagSet) {
124124
f.StringVar(&c.Password, "password", "0", "Password for accessing PKCS #12 data passed to bundler")
125125
f.StringVar(&c.Usage, "usage", "", "usage of private key")
126126
f.StringVar(&c.PGPPrivate, "pgp-private", "", "file to load a PGP Private key decryption")
127-
f.StringVar(&c.PGPName, "pgp-name", "", "PGP public key name, can be a comma-sepearted key name list")
127+
f.StringVar(&c.PGPName, "pgp-name", "", "PGP public key name, can be a comma-separated key name list")
128128
f.StringVar(&c.Serial, "serial", "", "certificate serial number")
129129
f.StringVar(&c.CNOverride, "cn", "", "certificate common name (CN)")
130130
f.StringVar(&c.AKI, "aki", "", "certificate issuer (authority) key identifier")

cli/serve/static/assets/cfssl.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
'scan.tlshandshake.title': 'TLS Handshake',
8282
'scan.tlshandshake.description': 'Scans for host\'s SSL and TLS versions and cipher suite negotiation.',
8383
'scan.tlshandshake.CipherSuite.title': 'Cipher Suite Matrix',
84-
'scan.tlshandshake.CipherSuite.body': 'Determines host\'s cipher suite accepted and prefered order.',
84+
'scan.tlshandshake.CipherSuite.body': 'Determines host\'s cipher suite accepted and preferred order.',
8585
'scan.tlssession.title': 'TLS Session',
8686
'scan.tlssession.description': 'Scans host\'s implementation of TLS session resumption using session ticket and session IDs.',
8787
'scan.tlssession.SessionResume.title': 'Session Resumption',

0 commit comments

Comments
 (0)