diff options
| author | Pauli <ppzgs1@gmail.com> | 2021-02-23 11:49:55 +1000 |
|---|---|---|
| committer | Pauli <ppzgs1@gmail.com> | 2021-02-26 18:08:41 +1000 |
| commit | e79fb279dfc146af0948d2727656f72226ef104f (patch) | |
| tree | 06860f6abf37354da7bfebd86dfe0a78f4bd6bd8 | |
| parent | fe20a66ed4f911f641af4123f931319677b1e8b7 (diff) | |
core: support modified gettable/settable ctx calls for ciphers
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14240)
| -rw-r--r-- | include/openssl/core_dispatch.h | 4 | ||||
| -rw-r--r-- | util/libcrypto.num | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/openssl/core_dispatch.h b/include/openssl/core_dispatch.h index cb4506f617..634159524d 100644 --- a/include/openssl/core_dispatch.h +++ b/include/openssl/core_dispatch.h @@ -315,9 +315,9 @@ OSSL_CORE_MAKE_FUNC(int, cipher_set_ctx_params, (void *cctx, OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *, cipher_gettable_params, (void *provctx)) OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *, cipher_settable_ctx_params, - (void *provctx)) + (void *cctx, void *provctx)) OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *, cipher_gettable_ctx_params, - (void *provctx)) + (void *cctx, void *provctx)) /* MACs */ diff --git a/util/libcrypto.num b/util/libcrypto.num index ac6a7ace64..aa3071ec30 100644 --- a/util/libcrypto.num +++ b/util/libcrypto.num @@ -5302,6 +5302,8 @@ EVP_PKEY_fromdata_settable ? 3_0_0 EXIST::FUNCTION: EVP_PKEY_param_check_quick ? 3_0_0 EXIST::FUNCTION: EVP_PKEY_public_check_quick ? 3_0_0 EXIST::FUNCTION: EVP_PKEY_CTX_is_a ? 3_0_0 EXIST::FUNCTION: +EVP_CIPHER_CTX_settable_params ? 3_0_0 EXIST::FUNCTION: +EVP_CIPHER_CTX_gettable_params ? 3_0_0 EXIST::FUNCTION: EVP_KDF_CTX_gettable_params ? 3_0_0 EXIST::FUNCTION: EVP_KDF_CTX_settable_params ? 3_0_0 EXIST::FUNCTION: EVP_MAC_CTX_gettable_params ? 3_0_0 EXIST::FUNCTION: |