From: Dr. Stephen Henson <steve@openssl.org>
Date: Mon, 20 Jun 2011 20:00:10 +0000 (+0000)
Subject: Redirect null cipher to FIPS module.
X-Git-Tag: OpenSSL_1_0_1-beta1~231
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=bf0736eb1fe0d4ab2da6e449c290d5e08c32d05b;p=oweals%2Fopenssl.git

Redirect null cipher to FIPS module.
---

diff --git a/crypto/evp/e_null.c b/crypto/evp/e_null.c
index 7cf50e1416..f0c1f78b5f 100644
--- a/crypto/evp/e_null.c
+++ b/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
diff --git a/crypto/evp/evp_fips.c b/crypto/evp/evp_fips.c
index 033aecc654..cb7f4fc0fa 100644
--- a/crypto/evp/evp_fips.c
+++ b/crypto/evp/evp_fips.c
@@ -98,6 +98,7 @@ const EVP_CIPHER *EVP_des_ede_cbc(void)  { return FIPS_evp_des_ede_cbc(); }
 const EVP_CIPHER *EVP_des_ede_cfb64(void)  { return FIPS_evp_des_ede_cfb64(); }
 const EVP_CIPHER *EVP_des_ede_ecb(void)  { return FIPS_evp_des_ede_ecb(); }
 const EVP_CIPHER *EVP_des_ede_ofb(void)  { return FIPS_evp_des_ede_ofb(); }
+const EVP_CIPHER *EVP_enc_null(void)  { return FIPS_evp_enc_null(); }
 
 const EVP_MD *EVP_sha1(void)  { return FIPS_evp_sha1(); }
 const EVP_MD *EVP_sha224(void)  { return FIPS_evp_sha224(); }