Fix (most) WIN32 warnings and errors.

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

diff --git a/crypto/evp/e_null.c b/crypto/evp/e_null.c
index e0702cf818eeb5f88389a0d474258844e6179dd2..5205259f18ca2249a5cfaaef1140b6df8b4d2c4b 100644 (file)
--- a/crypto/evp/e_null.c
+++ b/crypto/evp/e_null.c
@@ -65,7 +65,7 @@ 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=
+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,7 +88,7 @@ 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;
        }
 
@@ -95,7 +96,7 @@ static int null_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
             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;
        }