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:
8017970
)
Fix a possible crash in rand_drbg_get_entropy
author
Bernd Edlinger
<bernd.edlinger@hotmail.de>
Tue, 23 Oct 2018 14:30:20 +0000
(16:30 +0200)
committer
Bernd Edlinger
<bernd.edlinger@hotmail.de>
Fri, 26 Oct 2018 13:26:21 +0000
(15:26 +0200)
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/7474)
(cherry picked from commit
21311777ad8b8c2f2fb8eb7a4f9618ceae1e043d
)
crypto/rand/rand_lib.c
patch
|
blob
|
history
diff --git
a/crypto/rand/rand_lib.c
b/crypto/rand/rand_lib.c
index e6fcbce7fd8a60742334c13d952452e54fb54e15..29d93a829bf60727daa317f508606fc5385d0755 100644
(file)
--- a/
crypto/rand/rand_lib.c
+++ b/
crypto/rand/rand_lib.c
@@
-151,6
+151,8
@@
size_t rand_drbg_get_entropy(RAND_DRBG *drbg,
pool->entropy_requested = entropy;
} else {
pool = rand_pool_new(entropy, min_len, max_len);
+ if (pool == NULL)
+ return 0;
}
if (drbg->parent) {