Commit cf6bc841 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Update from HEAD.

parent 36d51bea

crypto/evp/evp.h

+2 −0
Original line number Diff line number Diff line
@@ -580,6 +580,8 @@ int EVP_DecodeBlock(unsigned char *t, const unsigned char *f, int n); 


void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a);

int EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a);

EVP_CIPHER_CTX *EVP_CIPHER_CTX_new(void);

void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *a);

int EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);

int EVP_CIPHER_CTX_set_padding(EVP_CIPHER_CTX *c, int pad);

int EVP_CIPHER_CTX_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr);

crypto/evp/evp_enc.c

+16 −0
Original line number Diff line number Diff line
@@ -74,6 +74,13 @@ void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *ctx) 
	/* ctx->cipher=NULL; */

	}



EVP_CIPHER_CTX *EVP_CIPHER_CTX_new(void)

	{

	EVP_CIPHER_CTX *ctx=OPENSSL_malloc(sizeof *ctx);

	if (ctx)

		EVP_CIPHER_CTX_init(ctx);

	return ctx;

	}



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

	     const unsigned char *key, const unsigned char *iv, int enc)
@@ -472,6 +479,15 @@ int EVP_DecryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl) 
	return(1);

	}



void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *ctx)

	{

	if (ctx)

		{

		EVP_CIPHER_CTX_cleanup(ctx);

		OPENSSL_free(ctx);

		}

	}



int EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *c)

	{

	if (c->cipher != NULL)