add null cipher to FIPS module
authorDr. Stephen Henson <steve@openssl.org>
Mon, 20 Jun 2011 19:48:44 +0000 (19:48 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Mon, 20 Jun 2011 19:48:44 +0000 (19:48 +0000)
Makefile.fips
Makefile.org
crypto/evp/e_null.c
fips/fipssyms.h

index 619b9cd..e60a728 100644 (file)
@@ -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 \
index 21a7a37..3e95c0a 100644 (file)
@@ -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 \
index 7cf50e1..067a03c 100644 (file)
@@ -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,
index bdbc2fa..fed9b9a 100644 (file)
 #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