From 33b40a1027bfa6c400f24938093e80579c37586c Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Fri, 19 Apr 2019 16:48:09 +0100 Subject: If key or iv is NULL set the respective length to 0 [extended tests] Reviewed-by: Bernd Edlinger (Merged from https://github.com/openssl/openssl/pull/8794) --- crypto/evp/evp_enc.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c index c2411f496c..676eaabbc4 100644 --- a/crypto/evp/evp_enc.c +++ b/crypto/evp/evp_enc.c @@ -243,9 +243,11 @@ int EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, return ctx->cipher->einit(ctx->provctx, key, - EVP_CIPHER_CTX_key_length(ctx), + key == NULL ? 0 + : EVP_CIPHER_CTX_key_length(ctx), iv, - EVP_CIPHER_CTX_iv_length(ctx)); + iv == NULL ? 0 + : EVP_CIPHER_CTX_iv_length(ctx)); } if (ctx->cipher->dinit == NULL) { @@ -255,9 +257,11 @@ int EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, return ctx->cipher->dinit(ctx->provctx, key, - EVP_CIPHER_CTX_key_length(ctx), + key == NULL ? 0 + : EVP_CIPHER_CTX_key_length(ctx), iv, - EVP_CIPHER_CTX_iv_length(ctx)); + iv == NULL ? 0 + : EVP_CIPHER_CTX_iv_length(ctx)); /* TODO(3.0): Remove legacy code below */ legacy: -- cgit v1.2.3