]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
prov: support param argument to null cipher init calls
authorPauli <ppzgs1@gmail.com>
Tue, 2 Mar 2021 12:45:13 +0000 (22:45 +1000)
committerPauli <ppzgs1@gmail.com>
Thu, 11 Mar 2021 22:27:21 +0000 (08:27 +1000)
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/14383)

providers/implementations/ciphers/cipher_null.c

index 00c97aad7a58528c50eb22fb913c91254f2b7598..0df97a7f8bc3b9312f2ac0a7e9acbc88945573b3 100644 (file)
@@ -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;