Imported Upstream version 4.8.1

[platform/upstream/gcc48.git] / libgo / go / crypto / x509 / pkcs8.go

diff --git a/libgo/go/crypto/x509/pkcs8.go b/libgo/go/crypto/x509/pkcs8.go
index 4d8e051..30caacb 100644 (file)
--- a/libgo/go/crypto/x509/pkcs8.go
+++ b/libgo/go/crypto/x509/pkcs8.go
@@ -11,8 +11,9 @@ import (
        "fmt"
 )
 
-// pkcs8 reflects an ASN.1, PKCS#8 PrivateKey. See 
-// ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-8/pkcs-8v1_2.asn.
+// pkcs8 reflects an ASN.1, PKCS#8 PrivateKey. See
+// ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-8/pkcs-8v1_2.asn
+// and RFC5208.
 type pkcs8 struct {
        Version    int
        Algo       pkix.AlgorithmIdentifier
@@ -21,19 +22,32 @@ type pkcs8 struct {
 }
 
 // ParsePKCS8PrivateKey parses an unencrypted, PKCS#8 private key. See
-// http://www.rsa.com/rsalabs/node.asp?id=2130
+// http://www.rsa.com/rsalabs/node.asp?id=2130 and RFC5208.
 func ParsePKCS8PrivateKey(der []byte) (key interface{}, err error) {
        var privKey pkcs8
        if _, err := asn1.Unmarshal(der, &privKey); err != nil {
                return nil, err
        }
        switch {
-       case privKey.Algo.Algorithm.Equal(oidRSA):
+       case privKey.Algo.Algorithm.Equal(oidPublicKeyRSA):
                key, err = ParsePKCS1PrivateKey(privKey.PrivateKey)
                if err != nil {
                        return nil, errors.New("crypto/x509: failed to parse RSA private key embedded in PKCS#8: " + err.Error())
                }
                return key, nil
+
+       case privKey.Algo.Algorithm.Equal(oidPublicKeyECDSA):
+               bytes := privKey.Algo.Parameters.FullBytes
+               namedCurveOID := new(asn1.ObjectIdentifier)
+               if _, err := asn1.Unmarshal(bytes, namedCurveOID); err != nil {
+                       namedCurveOID = nil
+               }
+               key, err = parseECPrivateKey(namedCurveOID, privKey.PrivateKey)
+               if err != nil {
+                       return nil, errors.New("crypto/x509: failed to parse EC private key embedded in PKCS#8: " + err.Error())
+               }
+               return key, nil
+
        default:
                return nil, fmt.Errorf("crypto/x509: PKCS#8 wrapping contained private key with unknown algorithm: %v", privKey.Algo.Algorithm)
        }