summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPauli <ppzgs1@gmail.com>2021-03-02 22:45:13 +1000
committerPauli <ppzgs1@gmail.com>2021-03-12 08:27:21 +1000
commit8b81a89d06ab0eb4121c7f9eaf1454aef3180289 (patch)
treefab14f3cc9595bfb0136e1d072dfdf6fa17e29d7
parentf336f98dbf80af632ea142ea3d43fe1e9d727e14 (diff)
prov: support param argument to null cipher init calls
Reviewed-by: Shane Lontis <shane.lontis@oracle.com> (Merged from https://github.com/openssl/openssl/pull/14383)
-rw-r--r--providers/implementations/ciphers/cipher_null.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/providers/implementations/ciphers/cipher_null.c b/providers/implementations/ciphers/cipher_null.c
index 00c97aad7a..0df97a7f8b 100644
--- a/providers/implementations/ciphers/cipher_null.c
+++ b/providers/implementations/ciphers/cipher_null.c
@@ -38,7 +38,8 @@ static void null_freectx(void *vctx)
static OSSL_FUNC_cipher_encrypt_init_fn null_einit;
static int null_einit(void *vctx, const unsigned char *key, size_t keylen,
- const unsigned char *iv, size_t ivlen)
+ const unsigned char *iv, size_t ivlen,
+ const OSSL_PARAM params[])
{
PROV_CIPHER_NULL_CTX *ctx = (PROV_CIPHER_NULL_CTX *)vctx;
@@ -51,7 +52,8 @@ static int null_einit(void *vctx, const unsigned char *key, size_t keylen,
static OSSL_FUNC_cipher_decrypt_init_fn null_dinit;
static int null_dinit(void *vctx, const unsigned char *key, size_t keylen,
- const unsigned char *iv, size_t ivlen)
+ const unsigned char *iv, size_t ivlen,
+ const OSSL_PARAM params[])
{
if (!ossl_prov_is_running())
return 0;