From: Filippo Valsorda <filippo@golang.org>
Date: Mon, 15 Oct 2018 21:09:34 +0000 (-0400)
Subject: [dev.boringcrypto] all: merge master into dev.boringcrypto
X-Git-Tag: go1.19beta1~484^2~135
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=623650b27a;p=gostls13.git

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

Change-Id: I218ba1b89a2df6e4335c6a5846889d9a04affe5d
---

623650b27aa42dd2ccd20fc4a79f8fe7b8559987
diff --cc src/crypto/rand/rand_unix.go
index 13c874a961,d49f693746..272b83d52b
--- a/src/crypto/rand/rand_unix.go
+++ b/src/crypto/rand/rand_unix.go
@@@ -51,7 -48,12 +53,13 @@@ type devReader struct 
  var altGetRandom func([]byte) (ok bool)
  
  func (r *devReader) Read(b []byte) (n int, err error) {
 +	boring.Unreachable()
+ 	if atomic.CompareAndSwapInt32(&r.used, 0, 1) {
+ 		// First use of randomness. Start timer to warn about
+ 		// being blocked on entropy not being available.
+ 		t := time.AfterFunc(60*time.Second, warnBlocked)
+ 		defer t.Stop()
+ 	}
  	if altGetRandom != nil && r.name == urandomDevice && altGetRandom(b) {
  		return len(b), nil
  	}