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:
d2b194d
)
mac siphash: add missing NULL check on context creation
author
Pauli
<paul.dale@oracle.com>
Wed, 11 Dec 2019 21:34:22 +0000
(07:34 +1000)
committer
Pauli
<paul.dale@oracle.com>
Fri, 13 Dec 2019 00:31:28 +0000
(10:31 +1000)
Bug reported by Kihong Heo.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10613)
providers/implementations/macs/siphash_prov.c
patch
|
blob
|
history
diff --git
a/providers/implementations/macs/siphash_prov.c
b/providers/implementations/macs/siphash_prov.c
index d1cb5cf1e7599d15acd10c8ce3cd7c10d5a97bca..e82f94ce7bd939bbd4d1845c467c9b40a2022944 100644
(file)
--- a/
providers/implementations/macs/siphash_prov.c
+++ b/
providers/implementations/macs/siphash_prov.c
@@
-51,7
+51,8
@@
static void *siphash_new(void *provctx)
{
struct siphash_data_st *ctx = OPENSSL_zalloc(sizeof(*ctx));
- ctx->provctx = provctx;
+ if (ctx != NULL)
+ ctx->provctx = provctx;
return ctx;
}