From: Dave Cheney <dave@cheney.net>
Date: Fri, 1 Apr 2016 00:49:25 +0000 (+1100)
Subject: crypto/x509: fix build break on darwin/{arm,arm64}
X-Git-Tag: go1.7beta1~962
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=42d62946946eb0e6dc55fe76973c84eafd113154;p=gostls13.git

crypto/x509: fix build break on darwin/{arm,arm64}

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>
---

diff --git a/src/crypto/x509/root_darwin_arm_gen.go b/src/crypto/x509/root_darwin_arm_gen.go
index 6b373b9d53..fc2488adc6 100644
--- a/src/crypto/x509/root_darwin_arm_gen.go
+++ b/src/crypto/x509/root_darwin_arm_gen.go
@@ -187,6 +187,6 @@ package x509
 func loadSystemRoots() (*CertPool, error) {
 	p := NewCertPool()
 	p.AppendCertsFromPEM([]byte(systemRootsPEM))
-	return p
+	return p, nil
 }
 `
diff --git a/src/crypto/x509/root_darwin_armx.go b/src/crypto/x509/root_darwin_armx.go
index 66b7051684..ad1c53d8a4 100644
--- a/src/crypto/x509/root_darwin_armx.go
+++ b/src/crypto/x509/root_darwin_armx.go
@@ -13,7 +13,7 @@ package x509
 func loadSystemRoots() (*CertPool, error) {
 	p := NewCertPool()
 	p.AppendCertsFromPEM([]byte(systemRootsPEM))
-	return p
+	return p, nil
 }
 
 const systemRootsPEM = `