add null cipher to FIPS module

diff --git a/Makefile.fips b/Makefile.fips
index 619b9cd3aecb521737abfbc9aaea2eb77b393845..e60a728dc3b34bc324582aa84fd4a969ec39f3e2 100644 (file)
--- 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 21a7a3751e17e34427b4538eaa58e6b10ee61ad0..3e95c0a025f958ba9623c53415aa62e4fe2fba46 100644 (file)
--- 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 7cf50e1416583dbd239163b1a0a0c0cc48f8e614..067a03cc5971f7072729684691b121d8f58f38d7 100644 (file)
--- 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 bdbc2faab99ff9cb590ff26422d916be27813b57..fed9b9a59f9fe2b18eba4ab7e7937efa37dbde5e 100644 (file)
--- 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