Commit 2fe9ab8e authored by Richard Levitte's avatar Richard Levitte
Browse files

It was pointed out to me that if the requested size is 0, we shouldn't 

ty to allocate anything at all.  This will allow eNULL to still work.

PR: 751
Notified by: Lutz Jaenicke
parent 1145e038

crypto/evp/evp_enc.c

+11 −4
Original line number Diff line number Diff line
@@ -148,12 +148,19 @@ int EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *imp 
#endif



		ctx->cipher=cipher;

		if (ctx->cipher->ctx_size)

			{

			ctx->cipher_data=OPENSSL_malloc(ctx->cipher->ctx_size);

			if (!ctx->cipher_data)

				{

				EVPerr(EVP_F_EVP_CIPHERINIT, ERR_R_MALLOC_FAILURE);

				return 0;

				}

			}

		else

			{

			ctx->cipher_data = NULL;

			}

		ctx->key_len = cipher->key_len;

		ctx->flags = 0;

		if(ctx->cipher->flags & EVP_CIPH_CTRL_INIT)