Commit 18eda732 authored by Geoff Thorpe's avatar Geoff Thorpe
Browse files

EVP_EncryptInit_ex() and EVP_DecryptInit_ex() had been defined in evp.h but 

not implemented. (Bug reported by Martin Szotkowski)

This also changes the non-"_ex" versions to defer directly to
EVP_CipherInit_ex() rather than EVP_CipherInit() to avoid an unecessary
level of indirection.
parent 7526e2c0

crypto/evp/evp_enc.c

+14 −2
Original line number Diff line number Diff line
@@ -197,13 +197,25 @@ int EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl) 
int EVP_EncryptInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,

	     const unsigned char *key, const unsigned char *iv)

	{

	return EVP_CipherInit(ctx, cipher, key, iv, 1);

	return EVP_CipherInit_ex(ctx, cipher, NULL, key, iv, 1);

	}



int EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *cipher, ENGINE *impl,

		const unsigned char *key, const unsigned char *iv)

	{

	return EVP_CipherInit_ex(ctx, cipher, impl, key, iv, 1);

	}



int EVP_DecryptInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,

	     const unsigned char *key, const unsigned char *iv)

	{

	return EVP_CipherInit(ctx, cipher, key, iv, 0);

	return EVP_CipherInit_ex(ctx, cipher, NULL, key, iv, 0);

	}



int EVP_DecryptInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl,

	     const unsigned char *key, const unsigned char *iv)

	{

	return EVP_CipherInit_ex(ctx, cipher, impl, key, iv, 0);

	}



int EVP_EncryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl,