mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-03-07 19:38:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Redirect null cipher to FIPS module.

Browse Source
This commit is contained in:
Dr. Stephen Henson 2011-06-20 20:00:10 +00:00
parent 3a5b97b7f1
commit bf0736eb1f
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crypto/evp/e_null.c
View File

@ -61,6 +61,8 @@
#include <openssl/evp.h>
#include <openssl/objects.h>
#ifndef OPENSSL_FIPS
static int null_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
const unsigned char *iv,int enc);
static int null_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
@ -99,4 +101,4 @@ static int null_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
memcpy((char *)out,(const char *)in,inl);
return 1;
}
#endif

1
crypto/evp/evp_fips.c
View File

@ -98,6 +98,7 @@ const EVP_CIPHER *EVP_des_ede_cbc(void) { return FIPS_evp_des_ede_cbc(); }
const EVP_CIPHER *EVP_des_ede_cfb64(void) { return FIPS_evp_des_ede_cfb64(); }
const EVP_CIPHER *EVP_des_ede_ecb(void) { return FIPS_evp_des_ede_ecb(); }
const EVP_CIPHER *EVP_des_ede_ofb(void) { return FIPS_evp_des_ede_ofb(); }
const EVP_CIPHER *EVP_enc_null(void) { return FIPS_evp_enc_null(); }
const EVP_MD *EVP_sha1(void) { return FIPS_evp_sha1(); }
const EVP_MD *EVP_sha224(void) { return FIPS_evp_sha224(); }