[release-branch.go1] crypto/x509: fix panic when using unavailable hash function.

««« backport d8d358ddc6e0
crypto/x509: fix panic when using unavailable hash function.

crypto.Hash.New() changed to panicking when the hash function isn't
linked in, but crypto/x509 still expects it to return nil.

R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/6175047

»»»

diff --git a/src/pkg/crypto/x509/x509.go b/src/pkg/crypto/x509/x509.go
index 8dae7e7fcf948c302c0ac97dd1fa415e5fb6334a..c4d85e67f0c28667229388c19a061fe0540367b8 100644 (file)
--- a/src/pkg/crypto/x509/x509.go
+++ b/src/pkg/crypto/x509/x509.go
@@ -388,10 +388,10 @@ func (c *Certificate) CheckSignature(algo SignatureAlgorithm, signed, signature
                return ErrUnsupportedAlgorithm
        }
 
-       h := hashType.New()
-       if h == nil {
+       if !hashType.Available() {
                return ErrUnsupportedAlgorithm
        }
+       h := hashType.New()
 
        h.Write(signed)
        digest := h.Sum(nil)