diff options
author | Dmitri Shuralyov <dmitshur@google.com> | 2022-06-01 17:42:39 +0000 |
---|---|---|
committer | Dmitri Shuralyov <dmitshur@google.com> | 2022-06-01 17:42:39 +0000 |
commit | 4658e6e324a85b0076f66acdab77799ffa9ac7bb (patch) | |
tree | f3b4de12074d583057060fdf35d91b6591859644 /src/crypto/rand/rand_unix.go | |
parent | 6b07de790c08967d0dbe3a36ec86f3d13e1cfcbd (diff) | |
parent | 26cdea3acca29db94541236f0037a20aa22ce2d7 (diff) | |
download | go-4658e6e324a85b0076f66acdab77799ffa9ac7bb.tar.gz go-4658e6e324a85b0076f66acdab77799ffa9ac7bb.zip |
[dev.boringcrypto.go1.17] all: merge go1.17.11 into dev.boringcrypto.go1.17
Change-Id: I563433b2d02a5abea610a1561139d0980d5c2102
Diffstat (limited to 'src/crypto/rand/rand_unix.go')
-rw-r--r-- | src/crypto/rand/rand_unix.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/crypto/rand/rand_unix.go b/src/crypto/rand/rand_unix.go index 34f4481a9b..526e54a5c9 100644 --- a/src/crypto/rand/rand_unix.go +++ b/src/crypto/rand/rand_unix.go @@ -52,7 +52,7 @@ type devReader struct { // altGetRandom if non-nil specifies an OS-specific function to get // urandom-style randomness. -var altGetRandom func([]byte) (ok bool) +var altGetRandom func([]byte) (err error) func warnBlocked() { println("crypto/rand: blocked for 60 seconds waiting to read random data from the kernel") @@ -66,7 +66,7 @@ func (r *devReader) Read(b []byte) (n int, err error) { t := time.AfterFunc(60*time.Second, warnBlocked) defer t.Stop() } - if altGetRandom != nil && r.name == urandomDevice && altGetRandom(b) { + if altGetRandom != nil && r.name == urandomDevice && altGetRandom(b) == nil { return len(b), nil } r.mu.Lock() |