Commit c500d447 authored by Geoff Thorpe's avatar Geoff Thorpe
Browse files

Change some EVP prototypes to use "cipher" rather than "type" as a variable 

name. The implementations already use this anyway.
parent 18eda732

crypto/evp/evp.h

+6 −6
Original line number Diff line number Diff line
@@ -477,26 +477,26 @@ int EVP_BytesToKey(const EVP_CIPHER *type,const EVP_MD *md, 
		const unsigned char *salt, const unsigned char *data,

		int datal, int count, unsigned char *key,unsigned char *iv);



int	EVP_EncryptInit(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *type,

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

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

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

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

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

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

		int *outl, const unsigned char *in, int inl);

int	EVP_EncryptFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);



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

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

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

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

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

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

int	EVP_DecryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out,

		int *outl, const unsigned char *in, int inl);

int	EVP_DecryptFinal(EVP_CIPHER_CTX *ctx, unsigned char *outm, int *outl);



int	EVP_CipherInit(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *type,

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

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

		       int enc);

int	EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *type, ENGINE *impl,

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

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

		       int enc);

int	EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out,