Commit 33b40a10 authored by Matt Caswell's avatar Matt Caswell
Browse files

If key or iv is NULL set the respective length to 0 



[extended tests]

Reviewed-by: default avatarBernd Edlinger <bernd.edlinger@hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/8794)
parent 361ecb1d

crypto/evp/evp_enc.c

+8 −4
Original line number Diff line number Diff line
@@ -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: