From b41997502231034da80688797fa333e02cb9f568 Mon Sep 17 00:00:00 2001 From: Arnaud Hillen Date: Tue, 27 Aug 2024 12:18:11 +0000 Subject: [PATCH] fix maxConstraintComparisions typo (should be maxConstraintComparisons) --- api/go1.10.txt | 2 +- .../vendor/golang.org/x/tools/internal/stdlib/manifest.go | 2 +- src/crypto/x509/verify.go | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/api/go1.10.txt b/api/go1.10.txt index 250c10f6abe..6a35be38119 100644 --- a/api/go1.10.txt +++ b/api/go1.10.txt @@ -42,7 +42,7 @@ pkg crypto/x509, type Certificate struct, PermittedURIDomains []string pkg crypto/x509, type Certificate struct, URIs []*url.URL pkg crypto/x509, type CertificateInvalidError struct, Detail string pkg crypto/x509, type CertificateRequest struct, URIs []*url.URL -pkg crypto/x509, type VerifyOptions struct, MaxConstraintComparisions int +pkg crypto/x509, type VerifyOptions struct, MaxConstraintComparisons int pkg crypto/x509/pkix, method (Name) String() string pkg crypto/x509/pkix, method (RDNSequence) String() string pkg database/sql, func OpenDB(driver.Connector) *DB diff --git a/src/cmd/vendor/golang.org/x/tools/internal/stdlib/manifest.go b/src/cmd/vendor/golang.org/x/tools/internal/stdlib/manifest.go index a928acf29fa..4f68b53997c 100644 --- a/src/cmd/vendor/golang.org/x/tools/internal/stdlib/manifest.go +++ b/src/cmd/vendor/golang.org/x/tools/internal/stdlib/manifest.go @@ -1269,7 +1269,7 @@ var PackageSymbols = map[string][]Symbol{ {"VerifyOptions.DNSName", Field, 0}, {"VerifyOptions.Intermediates", Field, 0}, {"VerifyOptions.KeyUsages", Field, 1}, - {"VerifyOptions.MaxConstraintComparisions", Field, 10}, + {"VerifyOptions.MaxConstraintComparisons", Field, 10}, {"VerifyOptions.Roots", Field, 0}, }, "crypto/x509/pkix": { diff --git a/src/crypto/x509/verify.go b/src/crypto/x509/verify.go index 71700872876..81bce3a2f7c 100644 --- a/src/crypto/x509/verify.go +++ b/src/crypto/x509/verify.go @@ -49,7 +49,7 @@ const ( UnconstrainedName // TooManyConstraints results when the number of comparison operations // needed to check a certificate exceeds the limit set by - // VerifyOptions.MaxConstraintComparisions. This limit exists to + // VerifyOptions.MaxConstraintComparisons. This limit exists to // prevent pathological certificates can consuming excessive amounts of // CPU time to verify. TooManyConstraints @@ -195,12 +195,12 @@ type VerifyOptions struct { // means ExtKeyUsageServerAuth. To accept any key usage, include ExtKeyUsageAny. KeyUsages []ExtKeyUsage - // MaxConstraintComparisions is the maximum number of comparisons to + // MaxConstraintComparisons is the maximum number of comparisons to // perform when checking a given certificate's name constraints. If // zero, a sensible default is used. This limit prevents pathological // certificates from consuming excessive amounts of CPU time when // validating. It does not apply to the platform verifier. - MaxConstraintComparisions int + MaxConstraintComparisons int } const ( @@ -590,7 +590,7 @@ func (c *Certificate) isValid(certType int, currentChain []*Certificate, opts *V } } - maxConstraintComparisons := opts.MaxConstraintComparisions + maxConstraintComparisons := opts.MaxConstraintComparisons if maxConstraintComparisons == 0 { maxConstraintComparisons = 250000 }