diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2011-06-20 19:48:44 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2011-06-20 19:48:44 +0000 |
commit | 9ebc37e667704041f9d31f916f41e7d2e0b3feb0 (patch) | |
tree | ecdc73c23fedfa85f7751fcb80d2cdf1d75b58e5 | |
parent | a2ab6986e43e60c980561b6865d8cf986d9e021d (diff) | |
download | openssl-9ebc37e667704041f9d31f916f41e7d2e0b3feb0.tar.gz |
add null cipher to FIPS module
-rw-r--r-- | Makefile.fips | 1 | ||||
-rw-r--r-- | Makefile.org | 1 | ||||
-rw-r--r-- | crypto/evp/e_null.c | 2 | ||||
-rw-r--r-- | fips/fipssyms.h | 1 |
4 files changed, 4 insertions, 1 deletions
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 |