Fix runner tests with Go 1.13.
Go 1.13 will add Ed25519 support to the standard library. Switch the
order of our vendored Ed25519 bits so we do not get mixed up by this.
When Go 1.13 is released, we can then unwind all this in favor of the
standard library version.
Update-Note: See b/135634259
Change-Id: Iddc0ea58db5b2181cecacfcdd3cc058159271787
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/36504
Reviewed-by: Adam Langley <agl@google.com>
diff --git a/ssl/test/runner/tls.go b/ssl/test/runner/tls.go
index 128d22e..1862b3d 100644
--- a/ssl/test/runner/tls.go
+++ b/ssl/test/runner/tls.go
@@ -276,15 +276,13 @@
}
func getCertificatePublicKey(cert *x509.Certificate) crypto.PublicKey {
- if cert.PublicKey != nil {
- return cert.PublicKey
- }
-
+ // TODO(davidben): When Go 1.13 is released, use the Ed25519 support in
+ // the standard library.
if isEd25519Certificate(cert) {
return ed25519.PublicKey(cert.RawSubjectPublicKeyInfo[len(ed25519SPKIPrefix):])
}
- return nil
+ return cert.PublicKey
}
var ed25519PKCS8Prefix = []byte{0x30, 0x2e, 0x02, 0x01, 0x00, 0x30, 0x05, 0x06, 0x03, 0x2b, 0x65, 0x70,
@@ -294,6 +292,12 @@
// PKCS#1 private keys by default, while OpenSSL 1.0.0 generates PKCS#8 keys.
// OpenSSL ecparam generates SEC1 EC private keys for ECDSA. We try all three.
func parsePrivateKey(der []byte) (crypto.PrivateKey, error) {
+ // TODO(davidben): When Go 1.13 is released, use the Ed25519 support in
+ // the standard library.
+ if bytes.HasPrefix(der, ed25519PKCS8Prefix) && len(der) == len(ed25519PKCS8Prefix)+32 {
+ seed := der[len(ed25519PKCS8Prefix):]
+ return ed25519.NewKeyFromSeed(seed), nil
+ }
if key, err := x509.ParsePKCS1PrivateKey(der); err == nil {
return key, nil
}
@@ -309,10 +313,5 @@
return key, nil
}
- if bytes.HasPrefix(der, ed25519PKCS8Prefix) && len(der) == len(ed25519PKCS8Prefix)+32 {
- seed := der[len(ed25519PKCS8Prefix):]
- return ed25519.NewKeyFromSeed(seed), nil
- }
-
return nil, errors.New("crypto/tls: failed to parse private key")
}
