crypto/x509: fix build

This pulls in changes that should have been in 3faf9d0c10c0, but
weren't because x509.go was part of another changelist.

TBR=bradfitzgo

R=bradfitzgo
CC=golang-dev
https://golang.org/cl/4433056

diff --git a/src/pkg/crypto/x509/x509.go b/src/pkg/crypto/x509/x509.go
index 2a57f875837490cdb85e1ec26f39aac77d6f267c..39cb3443aed115b41749c9cf5d8657fef8738a85 100644 (file)
--- a/src/pkg/crypto/x509/x509.go
+++ b/src/pkg/crypto/x509/x509.go
@@ -15,7 +15,6 @@ import (
        "hash"
        "io"
        "os"
-       "strings"
        "time"
 )
 
@@ -442,63 +441,6 @@ func (c *Certificate) CheckSignatureFrom(parent *Certificate) (err os.Error) {
        return rsa.VerifyPKCS1v15(pub, hashType, digest, c.Signature)
 }
 
-func matchHostnames(pattern, host string) bool {
-       if len(pattern) == 0 || len(host) == 0 {
-               return false
-       }
-
-       patternParts := strings.Split(pattern, ".", -1)
-       hostParts := strings.Split(host, ".", -1)
-
-       if len(patternParts) != len(hostParts) {
-               return false
-       }
-
-       for i, patternPart := range patternParts {
-               if patternPart == "*" {
-                       continue
-               }
-               if patternPart != hostParts[i] {
-                       return false
-               }
-       }
-
-       return true
-}
-
-type HostnameError struct {
-       Certificate *Certificate
-       Host        string
-}
-
-func (h *HostnameError) String() string {
-       var valid string
-       c := h.Certificate
-       if len(c.DNSNames) > 0 {
-               valid = strings.Join(c.DNSNames, ", ")
-       } else {
-               valid = c.Subject.CommonName
-       }
-       return "certificate is valid for " + valid + ", not " + h.Host
-}
-
-// VerifyHostname returns nil if c is a valid certificate for the named host.
-// Otherwise it returns an os.Error describing the mismatch.
-func (c *Certificate) VerifyHostname(h string) os.Error {
-       if len(c.DNSNames) > 0 {
-               for _, match := range c.DNSNames {
-                       if matchHostnames(match, h) {
-                               return nil
-                       }
-               }
-               // If Subject Alt Name is given, we ignore the common name.
-       } else if matchHostnames(c.Subject.CommonName, h) {
-               return nil
-       }
-
-       return &HostnameError{c, h}
-}
-
 type UnhandledCriticalExtension struct{}
 
 func (h UnhandledCriticalExtension) String() string {