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/krb5kdf.c | |
| parent | 5cceedb5830216dfec503127d810ee1ccaaaec0a (diff) | |
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/krb5kdf.c')
| -rw-r--r-- | providers/implementations/kdfs/krb5kdf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/providers/implementations/kdfs/krb5kdf.c b/providers/implementations/kdfs/krb5kdf.c index 35d6ccb680..041c3e32b2 100644 --- a/providers/implementations/kdfs/krb5kdf.c +++ b/providers/implementations/kdfs/krb5kdf.c @@ -101,14 +101,14 @@ static int krb5kdf_set_membuf(unsigned char **dst, size_t *dst_len, return OSSL_PARAM_get_octet_string(p, (void **)dst, 0, dst_len); } -static int krb5kdf_derive(void *vctx, unsigned char *key, - size_t keylen) +static int krb5kdf_derive(void *vctx, unsigned char *key, size_t keylen, + const OSSL_PARAM params[]) { KRB5KDF_CTX *ctx = (KRB5KDF_CTX *)vctx; const EVP_CIPHER *cipher; ENGINE *engine; - if (!ossl_prov_is_running()) + if (!ossl_prov_is_running() || !krb5kdf_set_ctx_params(ctx, params)) return 0; cipher = ossl_prov_cipher_cipher(&ctx->cipher); |