diff options
| author | Matt Caswell <matt@openssl.org> | 2020-06-22 15:04:50 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-07-06 09:26:09 +0100 |
| commit | 978cc3648d02551c6ada328708306dad2d3ce07a (patch) | |
| tree | e6e4213fd964feb3df1b01d7ed247b6edddbd7db /providers | |
| parent | 1ae7354c049cb3e45bfb17c0c1bf3ff04814fa4d (diff) | |
Ensure cipher_generic_initkey gets passed the actual provider ctx
We were not correctly passing the provider ctx down the chain during
initialisation of a new cipher ctx. Instead the provider ctx got set to
NULL.
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12288)
Diffstat (limited to 'providers')
| -rw-r--r-- | providers/implementations/include/prov/ciphercommon.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/providers/implementations/include/prov/ciphercommon.h b/providers/implementations/include/prov/ciphercommon.h index 18bb579026..55adf3caa2 100644 --- a/providers/implementations/include/prov/ciphercommon.h +++ b/providers/implementations/include/prov/ciphercommon.h @@ -175,7 +175,8 @@ static void * alg##_##kbits##_##lcmode##_newctx(void *provctx) \ if (ctx != NULL) { \ cipher_generic_initkey(ctx, kbits, blkbits, ivbits, \ EVP_CIPH_##UCMODE##_MODE, flags, \ - PROV_CIPHER_HW_##alg##_##lcmode(kbits), NULL); \ + PROV_CIPHER_HW_##alg##_##lcmode(kbits), \ + provctx); \ } \ return ctx; \ } \ |