Commit 52fc641d authored by Ben Laurie's avatar Ben Laurie
Browse files

Add RSA to FIPS.

parent f29f610b

crypto/rsa/rsa_eay.c

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ 
#include <openssl/rsa.h>

#include <openssl/rand.h>



#ifndef RSA_NULL

#if !defined(RSA_NULL) && !defined(OPENSSL_FIPS)



static int RSA_eay_public_encrypt(int flen, const unsigned char *from,

		unsigned char *to, RSA *rsa,int padding);

crypto/rsa/rsa_gen.c

+3 −0
Original line number Diff line number Diff line
@@ -62,6 +62,8 @@ 
#include <openssl/bn.h>

#include <openssl/rsa.h>



#ifndef OPENSSL_FIPS



RSA *RSA_generate_key(int bits, unsigned long e_value,

	     void (*callback)(int,int,void *), void *cb_arg)

	{
@@ -195,3 +197,4 @@ err: 
		return(rsa);

	}



#endif

crypto/sha/Makefile.ssl

+1 −8
Original line number Diff line number Diff line
@@ -102,14 +102,7 @@ sha1_one.o: ../../include/openssl/opensslconf.h 
sha1_one.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h

sha1_one.o: ../../include/openssl/sha.h ../../include/openssl/stack.h

sha1_one.o: ../../include/openssl/symhacks.h sha1_one.c

sha1dgst.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h

sha1dgst.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h

sha1dgst.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h

sha1dgst.o: ../../include/openssl/opensslconf.h

sha1dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h

sha1dgst.o: ../../include/openssl/sha.h ../../include/openssl/stack.h

sha1dgst.o: ../../include/openssl/symhacks.h ../md32_common.h sha1dgst.c

sha1dgst.o: sha_locl.h

sha1dgst.o: ../../include/openssl/opensslv.h sha1dgst.c

sha_dgst.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h

sha_dgst.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h

sha_dgst.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h

fips/Makefile.ssl

+8 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ CFLAGS= $(INCLUDE) $(CFLAG) 


LIBS=



FDIRS=sha1 rand des aes dsa

FDIRS=sha1 rand des aes dsa rsa



GENERAL=Makefile README fips-lib.com install.com
@@ -186,4 +186,10 @@ fips.o: ../include/openssl/rsa.h ../include/openssl/safestack.h 
fips.o: ../include/openssl/sha.h ../include/openssl/stack.h

fips.o: ../include/openssl/symhacks.h ../include/openssl/ui.h

fips.o: ../include/openssl/ui_compat.h fips.c

fips_err_wrapper.o: fips_err_wrapper.c
 
fips_err_wrapper.o: ../include/openssl/bio.h ../include/openssl/crypto.h

fips_err_wrapper.o: ../include/openssl/e_os2.h ../include/openssl/err.h

fips_err_wrapper.o: ../include/openssl/fips.h ../include/openssl/lhash.h

fips_err_wrapper.o: ../include/openssl/opensslconf.h

fips_err_wrapper.o: ../include/openssl/opensslv.h

fips_err_wrapper.o: ../include/openssl/safestack.h ../include/openssl/stack.h

fips_err_wrapper.o: ../include/openssl/symhacks.h fips_err.h fips_err_wrapper.c

fips/fips_make_sha1

+3 −0
Original line number Diff line number Diff line
@@ -22,3 +22,6 @@ $S fips_dsa_ossl.c fips_dsa_gen.c > fingerprint.sha1 


cd ../des

$S fips_des_enc.c fips_des_selftest.c fips_des_locl.h > fingerprint.sha1



cd ../rsa

$S fips_rsa_eay.c fips_rsa_gen.c > fingerprint.sha1