evp/e_aes_cbc_hmac_sha*.c: improve cache locality.

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

diff --git a/crypto/evp/e_null.c b/crypto/evp/e_null.c
index fbfa59183598a86916978946fbd2e5fce5bf55cd..9ca12ee2439455b24e5941efc93eda5f919b97c6 100644 (file)
--- a/crypto/evp/e_null.c
+++ b/crypto/evp/e_null.c
@@ -64,18 +64,19 @@
 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);
+       const unsigned char *in, size_t inl);
 static const EVP_CIPHER n_cipher=
        {
        NID_undef,
        1,0,0,
-       0,
+       EVP_CIPH_FLAG_FIPS,
        null_init_key,
        null_cipher,
        NULL,
        0,
        NULL,
        NULL,
+       NULL,
        NULL
        };
 
@@ -87,15 +88,14 @@ const 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;
        }
-