Commit 9ebc37e6 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

add null cipher to FIPS module

parent a2ab6986

Makefile.fips

+1 −0
Original line number Diff line number Diff line
@@ -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 \

Makefile.org

+1 −0
Original line number Diff line number Diff line
@@ -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 \

crypto/evp/e_null.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

fips/fipssyms.h

+1 −0
Original line number Diff line number Diff line
@@ -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