[dev.boringcrypto] crypto/internal/boring: fall back to standard crypto when using...

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>

diff --git a/src/crypto/internal/boring/aes.go b/src/crypto/internal/boring/aes.go
index cd7064e68679534253368f1597b31a9a71730cd3..12e5c38a06760c19008d1250286523fb7ef8eae6 100644 (file)
--- 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 1dd49fecfbae4ddd339db11f8dfbcb2b2d0d760f..98aa851de7dd3d9939960dd0f0502c0d116270ab 100644 (file)
--- 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 f931d732f43fce215782856d58be59417238de4a..6f6bcf6a4a2a08652e5f2802f9381d42518d8205 100644 (file)
--- 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 673b007e595450738105e6df479e5d3c03aea025..aecb1870f52ad51e71707c910bccc76452580c3d 100644 (file)
--- 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 22f3553324624e9894ffd22c1e55491a6085ca97..257aa3b8b470e8683dd8fc53d345a0fc1d2d8c74 100644 (file)
--- 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 71c644bdf46b2722dda66a1b46e14200bc89ca2c..c3fc27cc08b01f8f712c89f38b3bcf9dab1bb0c0 100644 (file)
--- 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 c31554de0ca7567df53fedc729a88d0f8044fa01..8a077b71df0ac89895402de4e6159249ba01572a 100644 (file)
--- 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 bc91f4a49018fe9f06627a1694c59c7949090def..b8e6e576840f53220da521d41851a3d9c7976ae5 100644 (file)
--- 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