From: Chressie Himpel <chressie@google.com>
Date: Thu, 21 Apr 2022 15:30:08 +0000 (+0200)
Subject: [dev.boringcrypto] all: merge master into dev.boringcrypto
X-Git-Tag: go1.19beta1~484^2~14
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=19e4b10f2f;p=gostls13.git

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

Change-Id: I30dbbe508a6252d50b4154cb9a8299cf0a054449
---

19e4b10f2fcad0a43adcd3e59877e9f638330f44
diff --cc src/crypto/rand/rand_unix.go
index 0b137e131f,07715bd5ee..87ba9e3af7
--- a/src/crypto/rand/rand_unix.go
+++ b/src/crypto/rand/rand_unix.go
@@@ -94,11 -59,7 +65,8 @@@ func warnBlocked() 
  }
  
  func (r *reader) Read(b []byte) (n int, err error) {
 +	boring.Unreachable()
- 	r.mu.Lock()
- 	defer r.mu.Unlock()
- 	if !r.used {
- 		r.used = true
+ 	if atomic.CompareAndSwapUint32(&r.used, 0, 1) {
  		// First use of randomness. Start timer to warn about
  		// being blocked on entropy not being available.
  		t := time.AfterFunc(time.Minute, warnBlocked)