From 67326634496ef21b4acbf4cef2f05040d34aef9b Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Tue, 10 Apr 2012 11:41:26 +0200
Subject: Update to openssl-1.0.1

---
 openssl/crypto/evp/e_null.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'openssl/crypto/evp/e_null.c')

diff --git a/openssl/crypto/evp/e_null.c b/openssl/crypto/evp/e_null.c
index 7cf50e141..f0c1f78b5 100644
--- a/openssl/crypto/evp/e_null.c
+++ b/openssl/crypto/evp/e_null.c
@@ -61,6 +61,8 @@
 #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,
@@ -99,4 +101,4 @@ static int null_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 		memcpy((char *)out,(const char *)in,inl);
 	return 1;
 	}
-
+#endif
-- 
cgit v1.2.3