diff options
| author | Pauli <ppzgs1@gmail.com> | 2021-02-26 10:07:23 +1000 |
|---|---|---|
| committer | Pauli <ppzgs1@gmail.com> | 2021-02-28 17:25:49 +1000 |
| commit | 3469b388164775546022635d6695cae17104faa6 (patch) | |
| tree | 5729ef71645944a042581a89f8b4eb9c1fb05386 /providers/implementations/kdfs/kbkdf.c | |
| parent | 5cceedb5830216dfec503127d810ee1ccaaaec0a (diff) | |
| download | openssl-new-3469b388164775546022635d6695cae17104faa6.tar.gz | |
prov: add extra params argument to KDF implementations
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/14310)
Diffstat (limited to 'providers/implementations/kdfs/kbkdf.c')
| -rw-r--r-- | providers/implementations/kdfs/kbkdf.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/providers/implementations/kdfs/kbkdf.c b/providers/implementations/kdfs/kbkdf.c index ab6e5c87a9..2f6171baa7 100644 --- a/providers/implementations/kdfs/kbkdf.c +++ b/providers/implementations/kdfs/kbkdf.c @@ -209,7 +209,8 @@ done: return ret; } -static int kbkdf_derive(void *vctx, unsigned char *key, size_t keylen) +static int kbkdf_derive(void *vctx, unsigned char *key, size_t keylen, + const OSSL_PARAM params[]) { KBKDF *ctx = (KBKDF *)vctx; int ret = 0; @@ -217,7 +218,7 @@ static int kbkdf_derive(void *vctx, unsigned char *key, size_t keylen) uint32_t l = 0; size_t h = 0; - if (!ossl_prov_is_running()) + if (!ossl_prov_is_running() || !kbkdf_set_ctx_params(ctx, params)) return 0; /* label, context, and iv are permitted to be empty. Check everything |