Configure, e_aes.c: allow for XTS assembler implementation [from HEAD].

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

diff --git a/crypto/evp/e_null.c b/crypto/evp/e_null.c
index 698a8e379c9ba8d2cee6c4255cbad2a085e7ddfb..f0c1f78b5fec941308d5528d6f56c751af7c61c5 100644 (file)
--- a/crypto/evp/e_null.c
+++ b/crypto/evp/e_null.c
@@ -61,10 +61,12 @@
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 
+#ifndef OPENSSL_FIPS
+
 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,
@@ -76,6 +78,7 @@ static const EVP_CIPHER n_cipher=
        0,
        NULL,
        NULL,
+       NULL,
        NULL
        };
 
@@ -92,10 +95,10 @@ static int null_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
        }
 
 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,(const char *)in,(size_t)inl);
+               memcpy((char *)out,(const char *)in,inl);
        return 1;
        }
-
+#endif