X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fevp%2Fe_null.c;h=7cf50e1416583dbd239163b1a0a0c0cc48f8e614;hp=e0702cf818eeb5f88389a0d474258844e6179dd2;hb=c6fa97a6d6fffb057b3b96e7c0b75711dfd3bbc8;hpb=1921eaad645c9a9f62c1ed79b7ae87c417aa8a3c

diff --git a/crypto/evp/e_null.c b/crypto/evp/e_null.c
index e0702cf818..7cf50e1416 100644
--- a/crypto/evp/e_null.c
+++ b/crypto/evp/e_null.c
@@ -64,8 +64,8 @@
 static int null_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
 	const unsigned char *iv,int enc);
 static int null_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-	const unsigned char *in, unsigned int inl);
-static EVP_CIPHER n_cipher=
+	const unsigned char *in, size_t inl);
+static const EVP_CIPHER n_cipher=
 	{
 	NID_undef,
 	1,0,0,
@@ -76,10 +76,11 @@ static EVP_CIPHER n_cipher=
 	0,
 	NULL,
 	NULL,
+	NULL,
 	NULL
 	};
 
-EVP_CIPHER *EVP_enc_null(void)
+const EVP_CIPHER *EVP_enc_null(void)
 	{
 	return(&n_cipher);
 	}
@@ -87,15 +88,15 @@ EVP_CIPHER *EVP_enc_null(void)
 static int null_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
 	     const unsigned char *iv, int enc)
 	{
-	memset(&(ctx->c),0,sizeof(ctx->c));
+	/*	memset(&(ctx->c),0,sizeof(ctx->c));*/
 	return 1;
 	}
 
 static int null_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-	     const unsigned char *in, unsigned int inl)
+	     const unsigned char *in, size_t inl)
 	{
 	if (in != out)
-		memcpy((char *)out,(char *)in,(int)inl);
+		memcpy((char *)out,(const char *)in,inl);
 	return 1;
 	}