Commit 7575c7e3 authored by Ben Laurie's avatar Ben Laurie
Browse files

Test suite plus failure if selftest fails.

parent 6a0fc3b6

crypto/des/Makefile.ssl

+7 −6
Original line number Diff line number Diff line
@@ -158,12 +158,13 @@ cfb64enc.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 
cfb64enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

cfb64enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h

cfb64enc.o: cfb64enc.c des_locl.h

cfb_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h

cfb_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h

cfb_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h

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

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

cfb_enc.o: ../../include/openssl/ui_compat.h cfb_enc.c des_locl.h

cfb_enc.o: ../../e_os.h ../../include/openssl/crypto.h

cfb_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h

cfb_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h

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

cfb_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

cfb_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h

cfb_enc.o: cfb_enc.c des_locl.h

des_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h

des_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h

des_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h

crypto/des/set_key.c

+4 −0
Original line number Diff line number Diff line
@@ -65,6 +65,8 @@ 
 */

#include "des_locl.h"



#ifndef OPENSSL_FIPS



OPENSSL_IMPLEMENT_GLOBAL(int,DES_check_key);	/* defaults to false */



static const unsigned char odd_parity[256]={
@@ -405,3 +407,5 @@ void des_fixup_key_parity(des_cblock *key) 
	des_set_odd_parity(key);

	}

*/



#endif /* ndef OPENSSL_FIPS */

crypto/sha/Makefile.ssl

+2 −8
Original line number Diff line number Diff line
@@ -103,14 +103,8 @@ 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: ../../fips/fips_locl.h ../../include/openssl/bio.h

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

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

sha1dgst.o: ../../include/openssl/lhash.h ../../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/opensslconf.h

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

sha_dgst.o: ../../fips/fips_locl.h ../../include/openssl/bio.h

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

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

fips/Makefile.ssl

+15 −2
Original line number Diff line number Diff line
@@ -105,7 +105,14 @@ tests: 
	$(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' AR='${AR}' tests ); \

	done;



fips_test:

top_fips_test_suite:

	(cd $(TOP); $(MAKE) DIRS=fips FDIRS=. TARGET=fips_test_suite sub_target)



fips_test_suite: fips_test_suite.o $(TOP)/libcrypto.a

	$(CC) $(CFLAGS) -o fips_test_suite fips_test_suite.o $(PEX_LIBS) $(TOP)/libcrypto.a $(EX_LIBS)

	TOP=$(TOP) $(TOP)/fips/openssl_fips_fingerprint $(TOP)/libcrypto.a fips_test_suite || { rm fips_test_suite; false; }



fips_test: top top_fips_test_suite

	@for i in dsa sha1 aes des ; \

	do \

		(cd $$i && echo "making fips_test in fips/$$i..." && make fips_test) \
@@ -186,4 +193,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_locl.h

fips_err_wrapper.o: ../include/openssl/opensslconf.h 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/aes/Makefile.ssl

+1 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ clean: 
# DO NOT DELETE THIS LINE -- make depend depends on it.



fips_aes_core.o: ../../include/openssl/aes.h ../../include/openssl/e_os2.h

fips_aes_core.o: ../../include/openssl/fips.h

fips_aes_core.o: ../../include/openssl/opensslconf.h fips_aes_core.c

fips_aes_core.o: fips_aes_locl.h

fips_aes_selftest.o: ../../include/openssl/aes.h ../../include/openssl/bio.h