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:
1f9eac2
)
crypto/evp/kdf_meth.c: Add the reset function to the method
author
Richard Levitte
<levitte@openssl.org>
Fri, 30 Aug 2019 12:32:33 +0000
(14:32 +0200)
committer
Pauli
<paul.dale@oracle.com>
Fri, 6 Sep 2019 09:27:57 +0000
(19:27 +1000)
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/9662)
crypto/evp/kdf_meth.c
patch
|
blob
|
history
diff --git
a/crypto/evp/kdf_meth.c
b/crypto/evp/kdf_meth.c
index f45fa3f74f81e0de90ed9522b55a7c3edc1a1cff..c2db21271032d5ca57494e22da0f6e4c8f776f49 100644
(file)
--- a/
crypto/evp/kdf_meth.c
+++ b/
crypto/evp/kdf_meth.c
@@
-85,6
+85,11
@@
static void *evp_kdf_from_dispatch(const char *name, const OSSL_DISPATCH *fns,
kdf->freectx = OSSL_get_OP_kdf_freectx(fns);
fnctxcnt++;
break;
+ case OSSL_FUNC_KDF_RESET:
+ if (kdf->reset != NULL)
+ break;
+ kdf->reset = OSSL_get_OP_kdf_reset(fns);
+ break;
case OSSL_FUNC_KDF_DERIVE:
if (kdf->derive != NULL)
break;