From: Dr. Stephen Henson <steve@openssl.org>
Date: Mon, 20 Jun 2011 19:48:44 +0000 (+0000)
Subject: add null cipher to FIPS module
X-Git-Tag: OpenSSL-fips-2_0-rc1~311
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=9ebc37e667704041f9d31f916f41e7d2e0b3feb0

add null cipher to FIPS module
---

diff --git a/Makefile.fips b/Makefile.fips
index 619b9cd3ae..e60a728dc3 100644
--- a/Makefile.fips
+++ b/Makefile.fips
@@ -329,6 +329,7 @@ FIPS_EX_OBJ= ../crypto/aes/aes_cfb.o \
 	../crypto/ecdsa/ecs_ossl.o \
 	../crypto/evp/e_aes.o \
 	../crypto/evp/e_des3.o \
+	../crypto/evp/e_null.o \
 	../crypto/evp/m_sha1.o \
 	../crypto/evp/m_dss1.o \
 	../crypto/evp/m_dss.o \
diff --git a/Makefile.org b/Makefile.org
index 21a7a3751e..3e95c0a025 100644
--- a/Makefile.org
+++ b/Makefile.org
@@ -322,6 +322,7 @@ FIPS_EX_OBJ= ../crypto/aes/aes_cfb.o \
 	../crypto/ecdsa/ecs_ossl.o \
 	../crypto/evp/e_aes.o \
 	../crypto/evp/e_des3.o \
+	../crypto/evp/e_null.o \
 	../crypto/evp/m_sha1.o \
 	../crypto/evp/m_dss1.o \
 	../crypto/evp/m_dss.o \
diff --git a/crypto/evp/e_null.c b/crypto/evp/e_null.c
index 7cf50e1416..067a03cc59 100644
--- a/crypto/evp/e_null.c
+++ b/crypto/evp/e_null.c
@@ -69,7 +69,7 @@ static const EVP_CIPHER n_cipher=
 	{
 	NID_undef,
 	1,0,0,
-	0,
+	EVP_CIPH_FLAG_FIPS,
 	null_init_key,
 	null_cipher,
 	NULL,
diff --git a/fips/fipssyms.h b/fips/fipssyms.h
index bdbc2faab9..fed9b9a59f 100644
--- a/fips/fipssyms.h
+++ b/fips/fipssyms.h
@@ -342,6 +342,7 @@
 #define EVP_des_ede_cfb64 FIPS_evp_des_ede_cfb64
 #define EVP_des_ede_ecb FIPS_evp_des_ede_ecb
 #define EVP_des_ede_ofb FIPS_evp_des_ede_ofb
+#define EVP_null FIPS_evp_null
 #define EVP_sha1 FIPS_evp_sha1
 #define EVP_dss FIPS_evp_dss
 #define EVP_dss1 FIPS_evp_dss1