]> Cypherpunks repositories - gostls13.git/commitdiff
crypto/x509: fix build break on darwin/{arm,arm64}
authorDave Cheney <dave@cheney.net>
Fri, 1 Apr 2016 00:49:25 +0000 (11:49 +1100)
committerDave Cheney <dave@cheney.net>
Fri, 1 Apr 2016 01:10:59 +0000 (01:10 +0000)
Fix build error on darwin/{arm,arm64} caused by a62ae9f6.

Change-Id: I7da4d147a529b11b3e71352a9276a57595ec4b05
Reviewed-on: https://go-review.googlesource.com/21356
Run-TryBot: Dave Cheney <dave@cheney.net>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
src/crypto/x509/root_darwin_arm_gen.go
src/crypto/x509/root_darwin_armx.go

index 6b373b9d536b0504fc680180e778ecc745e5d101..fc2488adc6fa56f25384c9da7021a0728af04679 100644 (file)
@@ -187,6 +187,6 @@ package x509
 func loadSystemRoots() (*CertPool, error) {
        p := NewCertPool()
        p.AppendCertsFromPEM([]byte(systemRootsPEM))
-       return p
+       return p, nil
 }
 `
index 66b70516843018eb60fb02316497e3449d9920e1..ad1c53d8a4262eae949ffa95cbbbee6cb1587b06 100644 (file)
@@ -13,7 +13,7 @@ package x509
 func loadSystemRoots() (*CertPool, error) {
        p := NewCertPool()
        p.AppendCertsFromPEM([]byte(systemRootsPEM))
-       return p
+       return p, nil
 }
 
 const systemRootsPEM = `