]> Cypherpunks.ru repositories - gostls13.git/blobdiff - src/crypto/x509/verify.go
[dev.boringcrypto] all: merge master (nearly Go 1.10 beta 1) into dev.boringcrypto
[gostls13.git] / src / crypto / x509 / verify.go
index 999cb08cf3bc315e5d5b98a5f700aea5c3a80ca8..d27ee3e249f15976ae815bc9ae8105fbc4cee435 100644 (file)
@@ -9,6 +9,8 @@ import (
        "errors"
        "fmt"
        "net"
+       "net/url"
+       "reflect"
        "runtime"
        "strings"
        "time"
@@ -25,8 +27,8 @@ const (
        // given in the VerifyOptions.
        Expired
        // CANotAuthorizedForThisName results when an intermediate or root
-       // certificate has a name constraint which doesn't include the name
-       // being checked.
+       // certificate has a name constraint which doesn't permit a DNS or
+       // other name (including IP address) in the leaf certificate.
        CANotAuthorizedForThisName
        // TooManyIntermediates results when a path length constraint is
        // violated.
@@ -37,6 +39,24 @@ const (
        // NameMismatch results when the subject name of a parent certificate
        // does not match the issuer name in the child.
        NameMismatch
+       // NameConstraintsWithoutSANs results when a leaf certificate doesn't
+       // contain a Subject Alternative Name extension, but a CA certificate
+       // contains name constraints.
+       NameConstraintsWithoutSANs
+       // UnconstrainedName results when a CA certificate contains permitted
+       // name constraints, but leaf certificate contains a name of an
+       // unsupported or unconstrained type.
+       UnconstrainedName
+       // TooManyConstraints results when the number of comparision operations
+       // needed to check a certificate exceeds the limit set by
+       // VerifyOptions.MaxConstraintComparisions. This limit exists to
+       // prevent pathological certificates can consuming excessive amounts of
+       // CPU time to verify.
+       TooManyConstraints
+       // CANotAuthorizedForExtKeyUsage results when an intermediate or root
+       // certificate does not permit an extended key usage that is claimed by
+       // the leaf certificate.
+       CANotAuthorizedForExtKeyUsage
 )
 
 // CertificateInvalidError results when an odd error occurs. Users of this
@@ -44,6 +64,7 @@ const (
 type CertificateInvalidError struct {
        Cert   *Certificate
        Reason InvalidReason
+       Detail string
 }
 
 func (e CertificateInvalidError) Error() string {
@@ -53,13 +74,19 @@ func (e CertificateInvalidError) Error() string {
        case Expired:
                return "x509: certificate has expired or is not yet valid"
        case CANotAuthorizedForThisName:
-               return "x509: a root or intermediate certificate is not authorized to sign in this domain"
+               return "x509: a root or intermediate certificate is not authorized to sign for this name: " + e.Detail
+       case CANotAuthorizedForExtKeyUsage:
+               return "x509: a root or intermediate certificate is not authorized for an extended key usage: " + e.Detail
        case TooManyIntermediates:
                return "x509: too many intermediates for path length constraint"
        case IncompatibleUsage:
-               return "x509: certificate specifies an incompatible key usage"
+               return "x509: certificate specifies an incompatible key usage: " + e.Detail
        case NameMismatch:
                return "x509: issuer name does not match subject from issuing certificate"
+       case NameConstraintsWithoutSANs:
+               return "x509: issuer has name constraints but leaf doesn't have a SAN extension"
+       case UnconstrainedName:
+               return "x509: issuer has name constraints but leaf contains unknown or unconstrained name: " + e.Detail
        }
        return "x509: unknown error"
 }
@@ -147,6 +174,11 @@ var errNotParsed = errors.New("x509: missing ASN.1 contents; use ParseCertificat
 // VerifyOptions contains parameters for Certificate.Verify. It's a structure
 // because other PKIX verification APIs have ended up needing many options.
 type VerifyOptions struct {
+       // IsBoring is a validity check for BoringCrypto.
+       // If not nil, it will be called to check whether a given certificate
+       // can be used for constructing verification chains.
+       IsBoring func(*Certificate) bool
+
        DNSName       string
        Intermediates *CertPool
        Roots         *CertPool // if nil, the system roots are used
@@ -156,11 +188,12 @@ type VerifyOptions struct {
        // constraint down the chain which mirrors Windows CryptoAPI behavior,
        // but not the spec. To accept any key usage, include ExtKeyUsageAny.
        KeyUsages []ExtKeyUsage
-
-       // IsBoring is a validity check for BoringCrypto.
-       // If not nil, it will be called to check whether a given certificate
-       // can be used for constructing verification chains.
-       IsBoring func(*Certificate) bool
+       // MaxConstraintComparisions 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 pathalogical
+       // certificates from consuming excessive amounts of CPU time when
+       // validating.
+       MaxConstraintComparisions int
 }
 
 const (
@@ -169,32 +202,389 @@ const (
        rootCertificate
 )
 
-func matchNameConstraint(domain, constraint string) bool {
+// rfc2821Mailbox represents a “mailbox” (which is an email address to most
+// people) by breaking it into the “local” (i.e. before the '@') and “domain”
+// parts.
+type rfc2821Mailbox struct {
+       local, domain string
+}
+
+// parseRFC2821Mailbox parses an email address into local and domain parts,
+// based on the ABNF for a “Mailbox” from RFC 2821. According to
+// https://tools.ietf.org/html/rfc5280#section-4.2.1.6 that's correct for an
+// rfc822Name from a certificate: “The format of an rfc822Name is a "Mailbox"
+// as defined in https://tools.ietf.org/html/rfc2821#section-4.1.2”.
+func parseRFC2821Mailbox(in string) (mailbox rfc2821Mailbox, ok bool) {
+       if len(in) == 0 {
+               return mailbox, false
+       }
+
+       localPartBytes := make([]byte, 0, len(in)/2)
+
+       if in[0] == '"' {
+               // Quoted-string = DQUOTE *qcontent DQUOTE
+               // non-whitespace-control = %d1-8 / %d11 / %d12 / %d14-31 / %d127
+               // qcontent = qtext / quoted-pair
+               // qtext = non-whitespace-control /
+               //         %d33 / %d35-91 / %d93-126
+               // quoted-pair = ("\" text) / obs-qp
+               // text = %d1-9 / %d11 / %d12 / %d14-127 / obs-text
+               //
+               // (Names beginning with “obs-” are the obsolete syntax from
+               // https://tools.ietf.org/html/rfc2822#section-4. Since it has
+               // been 16 years, we no longer accept that.)
+               in = in[1:]
+       QuotedString:
+               for {
+                       if len(in) == 0 {
+                               return mailbox, false
+                       }
+                       c := in[0]
+                       in = in[1:]
+
+                       switch {
+                       case c == '"':
+                               break QuotedString
+
+                       case c == '\\':
+                               // quoted-pair
+                               if len(in) == 0 {
+                                       return mailbox, false
+                               }
+                               if in[0] == 11 ||
+                                       in[0] == 12 ||
+                                       (1 <= in[0] && in[0] <= 9) ||
+                                       (14 <= in[0] && in[0] <= 127) {
+                                       localPartBytes = append(localPartBytes, in[0])
+                                       in = in[1:]
+                               } else {
+                                       return mailbox, false
+                               }
+
+                       case c == 11 ||
+                               c == 12 ||
+                               // Space (char 32) is not allowed based on the
+                               // BNF, but RFC 3696 gives an example that
+                               // assumes that it is. Several “verified”
+                               // errata continue to argue about this point.
+                               // We choose to accept it.
+                               c == 32 ||
+                               c == 33 ||
+                               c == 127 ||
+                               (1 <= c && c <= 8) ||
+                               (14 <= c && c <= 31) ||
+                               (35 <= c && c <= 91) ||
+                               (93 <= c && c <= 126):
+                               // qtext
+                               localPartBytes = append(localPartBytes, c)
+
+                       default:
+                               return mailbox, false
+                       }
+               }
+       } else {
+               // Atom ("." Atom)*
+       NextChar:
+               for len(in) > 0 {
+                       // atext from https://tools.ietf.org/html/rfc2822#section-3.2.4
+                       c := in[0]
+
+                       switch {
+                       case c == '\\':
+                               // Examples given in RFC 3696 suggest that
+                               // escaped characters can appear outside of a
+                               // quoted string. Several “verified” errata
+                               // continue to argue the point. We choose to
+                               // accept it.
+                               in = in[1:]
+                               if len(in) == 0 {
+                                       return mailbox, false
+                               }
+                               fallthrough
+
+                       case ('0' <= c && c <= '9') ||
+                               ('a' <= c && c <= 'z') ||
+                               ('A' <= c && c <= 'Z') ||
+                               c == '!' || c == '#' || c == '$' || c == '%' ||
+                               c == '&' || c == '\'' || c == '*' || c == '+' ||
+                               c == '-' || c == '/' || c == '=' || c == '?' ||
+                               c == '^' || c == '_' || c == '`' || c == '{' ||
+                               c == '|' || c == '}' || c == '~' || c == '.':
+                               localPartBytes = append(localPartBytes, in[0])
+                               in = in[1:]
+
+                       default:
+                               break NextChar
+                       }
+               }
+
+               if len(localPartBytes) == 0 {
+                       return mailbox, false
+               }
+
+               // https://tools.ietf.org/html/rfc3696#section-3
+               // “period (".") may also appear, but may not be used to start
+               // or end the local part, nor may two or more consecutive
+               // periods appear.”
+               twoDots := []byte{'.', '.'}
+               if localPartBytes[0] == '.' ||
+                       localPartBytes[len(localPartBytes)-1] == '.' ||
+                       bytes.Contains(localPartBytes, twoDots) {
+                       return mailbox, false
+               }
+       }
+
+       if len(in) == 0 || in[0] != '@' {
+               return mailbox, false
+       }
+       in = in[1:]
+
+       // The RFC species a format for domains, but that's known to be
+       // violated in practice so we accept that anything after an '@' is the
+       // domain part.
+       if _, ok := domainToReverseLabels(in); !ok {
+               return mailbox, false
+       }
+
+       mailbox.local = string(localPartBytes)
+       mailbox.domain = in
+       return mailbox, true
+}
+
+// domainToReverseLabels converts a textual domain name like foo.example.com to
+// the list of labels in reverse order, e.g. ["com", "example", "foo"].
+func domainToReverseLabels(domain string) (reverseLabels []string, ok bool) {
+       for len(domain) > 0 {
+               if i := strings.LastIndexByte(domain, '.'); i == -1 {
+                       reverseLabels = append(reverseLabels, domain)
+                       domain = ""
+               } else {
+                       reverseLabels = append(reverseLabels, domain[i+1:len(domain)])
+                       domain = domain[:i]
+               }
+       }
+
+       if len(reverseLabels) > 0 && len(reverseLabels[0]) == 0 {
+               // An empty label at the end indicates an absolute value.
+               return nil, false
+       }
+
+       for _, label := range reverseLabels {
+               if len(label) == 0 {
+                       // Empty labels are otherwise invalid.
+                       return nil, false
+               }
+
+               for _, c := range label {
+                       if c < 33 || c > 126 {
+                               // Invalid character.
+                               return nil, false
+                       }
+               }
+       }
+
+       return reverseLabels, true
+}
+
+func matchEmailConstraint(mailbox rfc2821Mailbox, constraint string) (bool, error) {
+       // If the constraint contains an @, then it specifies an exact mailbox
+       // name.
+       if strings.Contains(constraint, "@") {
+               constraintMailbox, ok := parseRFC2821Mailbox(constraint)
+               if !ok {
+                       return false, fmt.Errorf("x509: internal error: cannot parse constraint %q", constraint)
+               }
+               return mailbox.local == constraintMailbox.local && strings.EqualFold(mailbox.domain, constraintMailbox.domain), nil
+       }
+
+       // Otherwise the constraint is like a DNS constraint of the domain part
+       // of the mailbox.
+       return matchDomainConstraint(mailbox.domain, constraint)
+}
+
+func matchURIConstraint(uri *url.URL, constraint string) (bool, error) {
+       // https://tools.ietf.org/html/rfc5280#section-4.2.1.10
+       // “a uniformResourceIdentifier that does not include an authority
+       // component with a host name specified as a fully qualified domain
+       // name (e.g., if the URI either does not include an authority
+       // component or includes an authority component in which the host name
+       // is specified as an IP address), then the application MUST reject the
+       // certificate.”
+
+       host := uri.Host
+       if len(host) == 0 {
+               return false, fmt.Errorf("URI with empty host (%q) cannot be matched against constraints", uri.String())
+       }
+
+       if strings.Contains(host, ":") && !strings.HasSuffix(host, "]") {
+               var err error
+               host, _, err = net.SplitHostPort(uri.Host)
+               if err != nil {
+                       return false, err
+               }
+       }
+
+       if strings.HasPrefix(host, "[") && strings.HasSuffix(host, "]") ||
+               net.ParseIP(host) != nil {
+               return false, fmt.Errorf("URI with IP (%q) cannot be matched against constraints", uri.String())
+       }
+
+       return matchDomainConstraint(host, constraint)
+}
+
+func matchIPConstraint(ip net.IP, constraint *net.IPNet) (bool, error) {
+       if len(ip) != len(constraint.IP) {
+               return false, nil
+       }
+
+       for i := range ip {
+               if mask := constraint.Mask[i]; ip[i]&mask != constraint.IP[i]&mask {
+                       return false, nil
+               }
+       }
+
+       return true, nil
+}
+
+func matchDomainConstraint(domain, constraint string) (bool, error) {
        // The meaning of zero length constraints is not specified, but this
        // code follows NSS and accepts them as matching everything.
        if len(constraint) == 0 {
-               return true
+               return true, nil
        }
 
-       if len(domain) < len(constraint) {
-               return false
+       domainLabels, ok := domainToReverseLabels(domain)
+       if !ok {
+               return false, fmt.Errorf("x509: internal error: cannot parse domain %q", domain)
        }
 
-       prefixLen := len(domain) - len(constraint)
-       if !strings.EqualFold(domain[prefixLen:], constraint) {
-               return false
+       // RFC 5280 says that a leading period in a domain name means that at
+       // least one label must be prepended, but only for URI and email
+       // constraints, not DNS constraints. The code also supports that
+       // behaviour for DNS constraints.
+
+       mustHaveSubdomains := false
+       if constraint[0] == '.' {
+               mustHaveSubdomains = true
+               constraint = constraint[1:]
+       }
+
+       constraintLabels, ok := domainToReverseLabels(constraint)
+       if !ok {
+               return false, fmt.Errorf("x509: internal error: cannot parse domain %q", constraint)
+       }
+
+       if len(domainLabels) < len(constraintLabels) ||
+               (mustHaveSubdomains && len(domainLabels) == len(constraintLabels)) {
+               return false, nil
+       }
+
+       for i, constraintLabel := range constraintLabels {
+               if !strings.EqualFold(constraintLabel, domainLabels[i]) {
+                       return false, nil
+               }
+       }
+
+       return true, nil
+}
+
+// checkNameConstraints checks that c permits a child certificate to claim the
+// given name, of type nameType. The argument parsedName contains the parsed
+// form of name, suitable for passing to the match function. The total number
+// of comparisons is tracked in the given count and should not exceed the given
+// limit.
+func (c *Certificate) checkNameConstraints(count *int,
+       maxConstraintComparisons int,
+       nameType string,
+       name string,
+       parsedName interface{},
+       match func(parsedName, constraint interface{}) (match bool, err error),
+       permitted, excluded interface{}) error {
+
+       excludedValue := reflect.ValueOf(excluded)
+
+       *count += excludedValue.Len()
+       if *count > maxConstraintComparisons {
+               return CertificateInvalidError{c, TooManyConstraints, ""}
+       }
+
+       for i := 0; i < excludedValue.Len(); i++ {
+               constraint := excludedValue.Index(i).Interface()
+               match, err := match(parsedName, constraint)
+               if err != nil {
+                       return CertificateInvalidError{c, CANotAuthorizedForThisName, err.Error()}
+               }
+
+               if match {
+                       return CertificateInvalidError{c, CANotAuthorizedForThisName, fmt.Sprintf("%s %q is excluded by constraint %q", nameType, name, constraint)}
+               }
+       }
+
+       permittedValue := reflect.ValueOf(permitted)
+
+       *count += permittedValue.Len()
+       if *count > maxConstraintComparisons {
+               return CertificateInvalidError{c, TooManyConstraints, ""}
+       }
+
+       ok := true
+       for i := 0; i < permittedValue.Len(); i++ {
+               constraint := permittedValue.Index(i).Interface()
+
+               var err error
+               if ok, err = match(parsedName, constraint); err != nil {
+                       return CertificateInvalidError{c, CANotAuthorizedForThisName, err.Error()}
+               }
+
+               if ok {
+                       break
+               }
+       }
+
+       if !ok {
+               return CertificateInvalidError{c, CANotAuthorizedForThisName, fmt.Sprintf("%s %q is not permitted by any constraint", nameType, name)}
+       }
+
+       return nil
+}
+
+// ekuPermittedBy returns true iff the given extended key usage is permitted by
+// the given EKU from a certificate. Normally, this would be a simple
+// comparison plus a special case for the “any” EKU. But, in order to support
+// existing certificates, some exceptions are made.
+func ekuPermittedBy(eku, certEKU ExtKeyUsage) bool {
+       if certEKU == ExtKeyUsageAny || eku == certEKU {
+               return true
+       }
+
+       // Some exceptions are made to support existing certificates. Firstly,
+       // the ServerAuth and SGC EKUs are treated as a group.
+       mapServerAuthEKUs := func(eku ExtKeyUsage) ExtKeyUsage {
+               if eku == ExtKeyUsageNetscapeServerGatedCrypto || eku == ExtKeyUsageMicrosoftServerGatedCrypto {
+                       return ExtKeyUsageServerAuth
+               }
+               return eku
        }
 
-       if prefixLen == 0 {
+       eku = mapServerAuthEKUs(eku)
+       certEKU = mapServerAuthEKUs(certEKU)
+
+       if eku == certEKU ||
+               // ServerAuth in a CA permits ClientAuth in the leaf.
+               (eku == ExtKeyUsageClientAuth && certEKU == ExtKeyUsageServerAuth) ||
+               // Any CA may issue an OCSP responder certificate.
+               eku == ExtKeyUsageOCSPSigning ||
+               // Code-signing CAs can use Microsoft's commercial and
+               // kernel-mode EKUs.
+               ((eku == ExtKeyUsageMicrosoftCommercialCodeSigning || eku == ExtKeyUsageMicrosoftKernelCodeSigning) && certEKU == ExtKeyUsageCodeSigning) {
                return true
        }
 
-       isSubdomain := domain[prefixLen-1] == '.'
-       constraintHasLeadingDot := constraint[0] == '.'
-       return isSubdomain != constraintHasLeadingDot
+       return false
 }
 
-// isValid performs validity checks on the c.
+// isValid performs validity checks on c given that it is a candidate to append
+// to the chain in currentChain.
 func (c *Certificate) isValid(certType int, currentChain []*Certificate, opts *VerifyOptions) error {
        if len(c.UnhandledCriticalExtensions) > 0 {
                return UnhandledCriticalExtension{}
@@ -203,7 +593,7 @@ func (c *Certificate) isValid(certType int, currentChain []*Certificate, opts *V
        if len(currentChain) > 0 {
                child := currentChain[len(currentChain)-1]
                if !bytes.Equal(child.RawIssuer, c.RawSubject) {
-                       return CertificateInvalidError{c, NameMismatch}
+                       return CertificateInvalidError{c, NameMismatch, ""}
                }
        }
 
@@ -212,26 +602,148 @@ func (c *Certificate) isValid(certType int, currentChain []*Certificate, opts *V
                now = time.Now()
        }
        if now.Before(c.NotBefore) || now.After(c.NotAfter) {
-               return CertificateInvalidError{c, Expired}
+               return CertificateInvalidError{c, Expired, ""}
        }
 
-       if len(c.PermittedDNSDomains) > 0 {
-               ok := false
-               for _, constraint := range c.PermittedDNSDomains {
-                       ok = matchNameConstraint(opts.DNSName, constraint)
-                       if ok {
-                               break
-                       }
+       maxConstraintComparisons := opts.MaxConstraintComparisions
+       if maxConstraintComparisons == 0 {
+               maxConstraintComparisons = 250000
+       }
+       comparisonCount := 0
+
+       var leaf *Certificate
+       if certType == intermediateCertificate || certType == rootCertificate {
+               if len(currentChain) == 0 {
+                       return errors.New("x509: internal error: empty chain when appending CA cert")
                }
+               leaf = currentChain[0]
+       }
 
+       if (certType == intermediateCertificate || certType == rootCertificate) && c.hasNameConstraints() {
+               sanExtension, ok := leaf.getSANExtension()
                if !ok {
-                       return CertificateInvalidError{c, CANotAuthorizedForThisName}
+                       // This is the deprecated, legacy case of depending on
+                       // the CN as a hostname. Chains modern enough to be
+                       // using name constraints should not be depending on
+                       // CNs.
+                       return CertificateInvalidError{c, NameConstraintsWithoutSANs, ""}
+               }
+
+               err := forEachSAN(sanExtension, func(tag int, data []byte) error {
+                       switch tag {
+                       case nameTypeEmail:
+                               name := string(data)
+                               mailbox, ok := parseRFC2821Mailbox(name)
+                               if !ok {
+                                       // This certificate should not have parsed.
+                                       return errors.New("x509: internal error: rfc822Name SAN failed to parse")
+                               }
+
+                               if err := c.checkNameConstraints(&comparisonCount, maxConstraintComparisons, "email address", name, mailbox,
+                                       func(parsedName, constraint interface{}) (bool, error) {
+                                               return matchEmailConstraint(parsedName.(rfc2821Mailbox), constraint.(string))
+                                       }, c.PermittedEmailAddresses, c.ExcludedEmailAddresses); err != nil {
+                                       return err
+                               }
+
+                       case nameTypeDNS:
+                               name := string(data)
+                               if err := c.checkNameConstraints(&comparisonCount, maxConstraintComparisons, "DNS name", name, name,
+                                       func(parsedName, constraint interface{}) (bool, error) {
+                                               return matchDomainConstraint(parsedName.(string), constraint.(string))
+                                       }, c.PermittedDNSDomains, c.ExcludedDNSDomains); err != nil {
+                                       return err
+                               }
+
+                       case nameTypeURI:
+                               name := string(data)
+                               uri, err := url.Parse(name)
+                               if err != nil {
+                                       return fmt.Errorf("x509: internal error: URI SAN %q failed to parse", name)
+                               }
+
+                               if err := c.checkNameConstraints(&comparisonCount, maxConstraintComparisons, "URI", name, uri,
+                                       func(parsedName, constraint interface{}) (bool, error) {
+                                               return matchURIConstraint(parsedName.(*url.URL), constraint.(string))
+                                       }, c.PermittedURIDomains, c.ExcludedURIDomains); err != nil {
+                                       return err
+                               }
+
+                       case nameTypeIP:
+                               ip := net.IP(data)
+                               if l := len(ip); l != net.IPv4len && l != net.IPv6len {
+                                       return fmt.Errorf("x509: internal error: IP SAN %x failed to parse", data)
+                               }
+
+                               if err := c.checkNameConstraints(&comparisonCount, maxConstraintComparisons, "IP address", ip.String(), ip,
+                                       func(parsedName, constraint interface{}) (bool, error) {
+                                               return matchIPConstraint(parsedName.(net.IP), constraint.(*net.IPNet))
+                                       }, c.PermittedIPRanges, c.ExcludedIPRanges); err != nil {
+                                       return err
+                               }
+
+                       default:
+                               // Unknown SAN types are ignored.
+                       }
+
+                       return nil
+               })
+
+               if err != nil {
+                       return err
+               }
+       }
+
+       checkEKUs := certType == intermediateCertificate
+
+       // If no extended key usages are specified, then all are acceptable.
+       if checkEKUs && (len(c.ExtKeyUsage) == 0 && len(c.UnknownExtKeyUsage) == 0) {
+               checkEKUs = false
+       }
+
+       // If the “any” key usage is permitted, then no more checks are needed.
+       if checkEKUs {
+               for _, caEKU := range c.ExtKeyUsage {
+                       comparisonCount++
+                       if caEKU == ExtKeyUsageAny {
+                               checkEKUs = false
+                               break
+                       }
                }
        }
 
-       for _, constraint := range c.ExcludedDNSDomains {
-               if matchNameConstraint(opts.DNSName, constraint) {
-                       return CertificateInvalidError{c, CANotAuthorizedForThisName}
+       if checkEKUs {
+       NextEKU:
+               for _, eku := range leaf.ExtKeyUsage {
+                       if comparisonCount > maxConstraintComparisons {
+                               return CertificateInvalidError{c, TooManyConstraints, ""}
+                       }
+
+                       for _, caEKU := range c.ExtKeyUsage {
+                               comparisonCount++
+                               if ekuPermittedBy(eku, caEKU) {
+                                       continue NextEKU
+                               }
+                       }
+
+                       oid, _ := oidFromExtKeyUsage(eku)
+                       return CertificateInvalidError{c, CANotAuthorizedForExtKeyUsage, fmt.Sprintf("EKU not permitted: %#v", oid)}
+               }
+
+       NextUnknownEKU:
+               for _, eku := range leaf.UnknownExtKeyUsage {
+                       if comparisonCount > maxConstraintComparisons {
+                               return CertificateInvalidError{c, TooManyConstraints, ""}
+                       }
+
+                       for _, caEKU := range c.UnknownExtKeyUsage {
+                               comparisonCount++
+                               if caEKU.Equal(eku) {
+                                       continue NextUnknownEKU
+                               }
+                       }
+
+                       return CertificateInvalidError{c, CANotAuthorizedForExtKeyUsage, fmt.Sprintf("EKU not permitted: %#v", eku)}
                }
        }
 
@@ -253,13 +765,13 @@ func (c *Certificate) isValid(certType int, currentChain []*Certificate, opts *V
        // encryption key could only be used for Diffie-Hellman key agreement.
 
        if certType == intermediateCertificate && (!c.BasicConstraintsValid || !c.IsCA) {
-               return CertificateInvalidError{c, NotAuthorizedToSign}
+               return CertificateInvalidError{c, NotAuthorizedToSign, ""}
        }
 
        if c.BasicConstraintsValid && c.MaxPathLen >= 0 {
                numIntermediates := len(currentChain) - 1
                if numIntermediates > c.MaxPathLen {
-                       return CertificateInvalidError{c, TooManyIntermediates}
+                       return CertificateInvalidError{c, TooManyIntermediates, ""}
                }
        }
 
@@ -267,7 +779,7 @@ func (c *Certificate) isValid(certType int, currentChain []*Certificate, opts *V
                // IncompatibleUsage is not quite right here,
                // but it's also the "no chains found" error
                // and is close enough.
-               return CertificateInvalidError{c, IncompatibleUsage}
+               return CertificateInvalidError{c, IncompatibleUsage, ""}
        }
 
        return nil
@@ -320,39 +832,46 @@ func (c *Certificate) Verify(opts VerifyOptions) (chains [][]*Certificate, err e
                }
        }
 
-       var candidateChains [][]*Certificate
-       if opts.Roots.contains(c) {
-               candidateChains = append(candidateChains, []*Certificate{c})
-       } else {
-               if candidateChains, err = c.buildChains(make(map[int][][]*Certificate), []*Certificate{c}, &opts); err != nil {
-                       return nil, err
-               }
+       requestedKeyUsages := make([]ExtKeyUsage, len(opts.KeyUsages))
+       copy(requestedKeyUsages, opts.KeyUsages)
+       if len(requestedKeyUsages) == 0 {
+               requestedKeyUsages = append(requestedKeyUsages, ExtKeyUsageServerAuth)
        }
 
-       keyUsages := opts.KeyUsages
-       if len(keyUsages) == 0 {
-               keyUsages = []ExtKeyUsage{ExtKeyUsageServerAuth}
-       }
+       // If no key usages are specified, then any are acceptable.
+       checkEKU := len(c.ExtKeyUsage) > 0
 
-       // If any key usage is acceptable then we're done.
-       for _, usage := range keyUsages {
-               if usage == ExtKeyUsageAny {
-                       chains = candidateChains
-                       return
+       for _, eku := range requestedKeyUsages {
+               if eku == ExtKeyUsageAny {
+                       checkEKU = false
+                       break
                }
        }
 
-       for _, candidate := range candidateChains {
-               if checkChainForKeyUsage(candidate, keyUsages) {
-                       chains = append(chains, candidate)
+       if checkEKU {
+       NextUsage:
+               for _, eku := range requestedKeyUsages {
+                       for _, leafEKU := range c.ExtKeyUsage {
+                               if ekuPermittedBy(eku, leafEKU) {
+                                       continue NextUsage
+                               }
+                       }
+
+                       oid, _ := oidFromExtKeyUsage(eku)
+                       return nil, CertificateInvalidError{c, IncompatibleUsage, fmt.Sprintf("%#v", oid)}
                }
        }
 
-       if len(chains) == 0 {
-               err = CertificateInvalidError{c, IncompatibleUsage}
+       var candidateChains [][]*Certificate
+       if opts.Roots.contains(c) {
+               candidateChains = append(candidateChains, []*Certificate{c})
+       } else {
+               if candidateChains, err = c.buildChains(make(map[int][][]*Certificate), []*Certificate{c}, &opts); err != nil {
+                       return nil, err
+               }
        }
 
-       return
+       return candidateChains, nil
 }
 
 func appendToFreshChain(chain []*Certificate, cert *Certificate) []*Certificate {
@@ -513,65 +1032,3 @@ func (c *Certificate) VerifyHostname(h string) error {
 
        return HostnameError{c, h}
 }
-
-func checkChainForKeyUsage(chain []*Certificate, keyUsages []ExtKeyUsage) bool {
-       usages := make([]ExtKeyUsage, len(keyUsages))
-       copy(usages, keyUsages)
-
-       if len(chain) == 0 {
-               return false
-       }
-
-       usagesRemaining := len(usages)
-
-       // We walk down the list and cross out any usages that aren't supported
-       // by each certificate. If we cross out all the usages, then the chain
-       // is unacceptable.
-
-NextCert:
-       for i := len(chain) - 1; i >= 0; i-- {
-               cert := chain[i]
-               if len(cert.ExtKeyUsage) == 0 && len(cert.UnknownExtKeyUsage) == 0 {
-                       // The certificate doesn't have any extended key usage specified.
-                       continue
-               }
-
-               for _, usage := range cert.ExtKeyUsage {
-                       if usage == ExtKeyUsageAny {
-                               // The certificate is explicitly good for any usage.
-                               continue NextCert
-                       }
-               }
-
-               const invalidUsage ExtKeyUsage = -1
-
-       NextRequestedUsage:
-               for i, requestedUsage := range usages {
-                       if requestedUsage == invalidUsage {
-                               continue
-                       }
-
-                       for _, usage := range cert.ExtKeyUsage {
-                               if requestedUsage == usage {
-                                       continue NextRequestedUsage
-                               } else if requestedUsage == ExtKeyUsageServerAuth &&
-                                       (usage == ExtKeyUsageNetscapeServerGatedCrypto ||
-                                               usage == ExtKeyUsageMicrosoftServerGatedCrypto) {
-                                       // In order to support COMODO
-                                       // certificate chains, we have to
-                                       // accept Netscape or Microsoft SGC
-                                       // usages as equal to ServerAuth.
-                                       continue NextRequestedUsage
-                               }
-                       }
-
-                       usages[i] = invalidUsage
-                       usagesRemaining--
-                       if usagesRemaining == 0 {
-                               return false
-                       }
-               }
-       }
-
-       return true
-}