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

Redirect null cipher to FIPS module.

parent 3a5b97b7

crypto/evp/e_null.c

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

crypto/evp/evp_fips.c

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