aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2017-09-14 11:10:23 -0400
committerRuss Cox <rsc@golang.org>2017-09-22 20:08:21 +0000
commit39d24b6b6d3e25b4e3a5ad6c7b79891fc3020319 (patch)
treeac88f1a06e0a061acb8c55834344cb9c0a224607
parent52f2e650605c359250e03ee21342287579a1d08c (diff)
downloadgo-39d24b6b6d3e25b4e3a5ad6c7b79891fc3020319.tar.gz
go-39d24b6b6d3e25b4e3a5ad6c7b79891fc3020319.zip
[dev.boringcrypto.go1.8] crypto/internal/boring: fall back to standard crypto when using -msan
The syso is not compiled with -fsanitize=memory, so don't try to use it. Otherwise the first time it calls out to memcmp, memcmp complains that it is being asked to compare uninitialized memory. Change-Id: I85ab707cfbe64eded8e110d4d6b40d1b75f50541 Reviewed-on: https://go-review.googlesource.com/63916 Reviewed-by: Adam Langley <agl@golang.org> Reviewed-on: https://go-review.googlesource.com/65487 Run-TryBot: Russ Cox <rsc@golang.org> Reviewed-by: Russ Cox <rsc@golang.org>
-rw-r--r--src/crypto/internal/boring/aes.go1
-rw-r--r--src/crypto/internal/boring/boring.go1
-rw-r--r--src/crypto/internal/boring/ecdsa.go1
-rw-r--r--src/crypto/internal/boring/hmac.go1
-rw-r--r--src/crypto/internal/boring/notboring.go2
-rw-r--r--src/crypto/internal/boring/rand.go1
-rw-r--r--src/crypto/internal/boring/rsa.go1
-rw-r--r--src/crypto/internal/boring/sha.go1
8 files changed, 8 insertions, 1 deletions
diff --git a/src/crypto/internal/boring/aes.go b/src/crypto/internal/boring/aes.go
index cd7064e686..12e5c38a06 100644
--- a/src/crypto/internal/boring/aes.go
+++ b/src/crypto/internal/boring/aes.go
@@ -5,6 +5,7 @@
// +build linux,amd64
// +build !android
// +build !cmd_go_bootstrap
+// +build !msan
package boring
diff --git a/src/crypto/internal/boring/boring.go b/src/crypto/internal/boring/boring.go
index 1dd49fecfb..98aa851de7 100644
--- a/src/crypto/internal/boring/boring.go
+++ b/src/crypto/internal/boring/boring.go
@@ -5,6 +5,7 @@
// +build linux,amd64
// +build !android
// +build !cmd_go_bootstrap
+// +build !msan
package boring
diff --git a/src/crypto/internal/boring/ecdsa.go b/src/crypto/internal/boring/ecdsa.go
index f931d732f4..6f6bcf6a4a 100644
--- a/src/crypto/internal/boring/ecdsa.go
+++ b/src/crypto/internal/boring/ecdsa.go
@@ -5,6 +5,7 @@
// +build linux,amd64
// +build !android
// +build !cmd_go_bootstrap
+// +build !msan
package boring
diff --git a/src/crypto/internal/boring/hmac.go b/src/crypto/internal/boring/hmac.go
index 673b007e59..aecb1870f5 100644
--- a/src/crypto/internal/boring/hmac.go
+++ b/src/crypto/internal/boring/hmac.go
@@ -5,6 +5,7 @@
// +build linux,amd64
// +build !android
// +build !cmd_go_bootstrap
+// +build !msan
package boring
diff --git a/src/crypto/internal/boring/notboring.go b/src/crypto/internal/boring/notboring.go
index 22f3553324..257aa3b8b4 100644
--- a/src/crypto/internal/boring/notboring.go
+++ b/src/crypto/internal/boring/notboring.go
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-// +build !linux !amd64 cmd_go_bootstrap android !cgo
+// +build !linux !amd64 !cgo android cmd_go_bootstrap msan
package boring
diff --git a/src/crypto/internal/boring/rand.go b/src/crypto/internal/boring/rand.go
index 71c644bdf4..c3fc27cc08 100644
--- a/src/crypto/internal/boring/rand.go
+++ b/src/crypto/internal/boring/rand.go
@@ -5,6 +5,7 @@
// +build linux,amd64
// +build !android
// +build !cmd_go_bootstrap
+// +build !msan
package boring
diff --git a/src/crypto/internal/boring/rsa.go b/src/crypto/internal/boring/rsa.go
index c31554de0c..8a077b71df 100644
--- a/src/crypto/internal/boring/rsa.go
+++ b/src/crypto/internal/boring/rsa.go
@@ -5,6 +5,7 @@
// +build linux,amd64
// +build !android
// +build !cmd_go_bootstrap
+// +build !msan
package boring
diff --git a/src/crypto/internal/boring/sha.go b/src/crypto/internal/boring/sha.go
index bc91f4a490..b8e6e57684 100644
--- a/src/crypto/internal/boring/sha.go
+++ b/src/crypto/internal/boring/sha.go
@@ -5,6 +5,7 @@
// +build linux,amd64
// +build !android
// +build !cmd_go_bootstrap
+// +build !msan
package boring