Update filenames in makefiles.

[openssl.git] / crypto / evp / e_null.c

diff --git a/crypto/evp/e_null.c b/crypto/evp/e_null.c
index d507337df64389f2ad6433991aba530dd30ac474..5205259f18ca2249a5cfaaef1140b6df8b4d2c4b 100644 (file)
--- a/crypto/evp/e_null.c
+++ b/crypto/evp/e_null.c
@@ -61,11 +61,11 @@
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 
-static int null_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
-       unsigned char *iv,int enc);
+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,
-       unsigned char *in, unsigned int inl);
-static EVP_CIPHER n_cipher=
+       const unsigned char *in, unsigned int inl);
+static const EVP_CIPHER n_cipher=
        {
        NID_undef,
        1,0,0,
@@ -76,26 +76,27 @@ 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);
        }
 
-static int null_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
-            unsigned char *iv, int enc)
+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,
-            unsigned char *in, unsigned int inl)
+            const unsigned char *in, unsigned int inl)
        {
        if (in != out)
-               memcpy((char *)out,(char *)in,(int)inl);
+               memcpy((char *)out,(const char *)in,(size_t)inl);
        return 1;
        }