Commit b8b47f67 authored by Ben Laurie's avatar Ben Laurie
Browse files

Add fingerprint chain and checking.

parent b5da126b

Makefile.org

+0 −1
Original line number Diff line number Diff line
@@ -226,7 +226,6 @@ all: Makefile.ssl sub_all openssl.pc sigs 


sigs:

	fips/sha1/fips_standalone_sha1 libcrypto.a > libcrypto.sha1

	if [ "$(SHLIBEXT)" != "" ]; then fips/sha1/fips_standalone_sha1 libcrypto$(SHLIBEXT) >> libcrypto.sha1; fi



sub_all:

	@for i in $(DIRS); \

fips/Makefile.ssl

+18 −4
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ SRC= $(LIBSRC) 


EXHEADER=fips.h

HEADER=$(EXHEADER) fips_err.c

EXE=openssl_fips_fingerprint



ALL=    $(GENERAL) $(SRC) $(HEADER)
@@ -104,6 +105,12 @@ tests: 
	$(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' AR='${AR}' tests ); \

	done;



fips_test:

	@for i in dsa sha1 aes des ; \

	do \

		(cd $$i && echo "making fips_test in fips/$$i..." && make fips_test) \

	done;



install:

	@for i in $(EXHEADER) ;\

	do \
@@ -115,6 +122,13 @@ install: 
		(cd $$i && echo "making install in fips/$$i..." && \

		$(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALL_PREFIX='${INSTALL_PREFIX}'  INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' install ); \

	done;

	@for i in $(EXE) ; \

	do \

		echo "installing $$i"; \

		cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \

		chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \

		mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i ); \

	done



lint:

	@for i in $(FDIRS) ;\

fips/aes/Makefile.ssl

+5 −1
Original line number Diff line number Diff line
@@ -67,10 +67,14 @@ tags: 


tests:



top_fips_aesavs:

	(cd ../..; $(MAKE) DIRS=fips FDIRS=$(DIR) TARGET=fips_aesavs sub_target)



fips_aesavs: fips_aesavs.o ../../libcrypto.a

	$(CC) $(CFLAGS) -o fips_aesavs fips_aesavs.o ../../libcrypto.a

	$(TOP)/fips/openssl_fips_fingerprint ../../libcrypto.a fips_aesavs



fips_test: top fips_aesavs

fips_test: top top_fips_aesavs

	find ../testvectors/aes/req -name '*.req' > testlist

	-rm -rf ../testvectors/aes/rsp

	mkdir ../testvectors/aes/rsp

fips/aes/fips_aesavs.c

+5 −1
Original line number Diff line number Diff line
@@ -889,7 +889,11 @@ int main(int argc, char **argv) 
    int f_opt = 0, d_opt = 1;



#ifdef FIPS

    FIPS_mode_set(1);

    if(!FIPS_mode_set(1,argv[0]))

	{

	ERR_print_errors(BIO_new_fp(stderr,BIO_NOCLOSE));

	exit(1);

	}

#endif

    ERR_load_crypto_strings();

    if (argc > 1)

fips/des/Makefile.ssl

+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ top_fips_desmovs: 


fips_desmovs: fips_desmovs.o ../../libcrypto.a

	$(CC) $(CFLAGS) -o fips_desmovs fips_desmovs.o ../../libcrypto.a

	$(TOP)/fips/openssl_fips_fingerprint ../../libcrypto.a fips_desmovs



fips_test: top_fips_desmovs

	find ../testvectors/des/req -name '*.req' > testlist