[dev.boringcrypto] all: merge master into dev.boringcrypto

[gostls13.git] / src / crypto / rand / rand_unix.go

diff --git a/src/crypto/rand/rand_unix.go b/src/crypto/rand/rand_unix.go
index 07715bd5ee02662dac715fdbd9817746cfb2c1d0..87ba9e3af7aaa8bf601fab3f997d54e5beef794b 100644 (file)
--- a/src/crypto/rand/rand_unix.go
+++ b/src/crypto/rand/rand_unix.go
@@ -19,9 +19,15 @@ import (
        "time"
 )
 
+import "crypto/internal/boring"
+
 const urandomDevice = "/dev/urandom"
 
 func init() {
+       if boring.Enabled {
+               Reader = boring.RandReader
+               return
+       }
        Reader = &reader{}
 }
 
@@ -59,6 +65,7 @@ func warnBlocked() {
 }
 
 func (r *reader) Read(b []byte) (n int, err error) {
+       boring.Unreachable()
        if atomic.CompareAndSwapUint32(&r.used, 0, 1) {
                // First use of randomness. Start timer to warn about
                // being blocked on entropy not being available.