artulab
projects
/
openbsd
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5c6c152
)
Avoid malloc(0) in EVP_PKEY_CTX_set1_hkdf_key()
author
tb
<tb@openbsd.org>
Thu, 5 May 2022 19:46:36 +0000
(19:46 +0000)
committer
tb
<tb@openbsd.org>
Thu, 5 May 2022 19:46:36 +0000
(19:46 +0000)
ok jsing
lib/libcrypto/kdf/hkdf_evp.c
patch
|
blob
|
history
diff --git
a/lib/libcrypto/kdf/hkdf_evp.c
b/lib/libcrypto/kdf/hkdf_evp.c
index
b334c4a
..
dd79665
100644
(file)
--- a/
lib/libcrypto/kdf/hkdf_evp.c
+++ b/
lib/libcrypto/kdf/hkdf_evp.c
@@
-1,4
+1,4
@@
-/* $OpenBSD: hkdf_evp.c,v 1.1
6 2022/05/05 19:44:23
tb Exp $ */
+/* $OpenBSD: hkdf_evp.c,v 1.1
7 2022/05/05 19:46:36
tb Exp $ */
/* ====================================================================
* Copyright (c) 2016-2018 The OpenSSL Project. All rights reserved.
*
@@
-132,7
+132,7
@@
pkey_hkdf_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
return 1;
case EVP_PKEY_CTRL_HKDF_KEY:
- if (p1 < 0)
+ if (p1 <
=
0)
return 0;
if (kctx->key != NULL)