projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cf37aaa
)
Set randomness buffer pointer in get_entropy calls.
author
Dr. Stephen Henson
<steve@openssl.org>
Sat, 5 Aug 2017 10:19:27 +0000
(11:19 +0100)
committer
Dr. Stephen Henson
<steve@openssl.org>
Sat, 5 Aug 2017 10:19:27 +0000
(11:19 +0100)
Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
(Merged from https://github.com/openssl/openssl/pull/4092)
crypto/rand/rand_lib.c
patch
|
blob
|
history
diff --git
a/crypto/rand/rand_lib.c
b/crypto/rand/rand_lib.c
index d6cb717489e10615df0380e2cdf3d704928de3c2..79b2cce249252b4618c0c334a80f87c98d24ebdc 100644
(file)
--- a/
crypto/rand/rand_lib.c
+++ b/
crypto/rand/rand_lib.c
@@
-143,6
+143,7
@@
size_t drbg_entropy_from_system(RAND_DRBG *drbg,
memmove(rand_bytes.buff, &rand_bytes.buff[min_len], rand_bytes.curr);
}
CRYPTO_THREAD_unlock(rand_bytes.lock);
+ *pout = drbg->randomness;
return min_len;
}
@@
-163,6
+164,7
@@
size_t drbg_entropy_from_parent(RAND_DRBG *drbg,
if (st == 0)
return 0;
drbg->filled = 1;
+ *pout = drbg->randomness;
return min_len;
}