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

Fingerprinting needs to work even if OpenSSL isn't installed yet.

parent 95a64aa4

fips/aes/Makefile.ssl

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ top_fips_aesavs: 


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

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

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

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



fips_test: top top_fips_aesavs

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

fips/des/Makefile.ssl

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


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

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

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

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



fips_test: top_fips_desmovs

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

fips/dsa/Makefile.ssl

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ top_fips_dssvs: 


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

	$(CC) $(CFLAGS) -o fips_dssvs fips_dssvs.o $(TOP)/libcrypto.a

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

	TOP=$(TOP) $(TOP)/fips/openssl_fips_fingerprint $(TOP)/libcrypto.a fips_dssvs



Q=../testvectors/dsa/req

A=../testvectors/dsa/rsp

fips/openssl_fips_fingerprint

+7 −0
Original line number Diff line number Diff line
@@ -6,6 +6,13 @@ 
lib=$1

exe=$2



# deal with the case where we're run from within the build and OpenSSL is

# not yet installed

if [ "X$TOP" != "X" ]

then

    PATH=$PATH:$TOP/apps

fi



elib=`echo $lib| sed 's/\//\\\\\//g'`

echo "Checking library fingerprint for $lib"

openssl sha1 $lib | sed "s/$elib/libcrypto.a/" | diff -u ${lib%.a}.sha1 - || { echo "$libs fingerprint mismatch"; exit 1; }

fips/sha1/Makefile.ssl

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ top_fips_sha1test: 


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

	$(CC) $(CFLAGS) -o fips_sha1test fips_sha1test.o $(TOP)/libcrypto.a

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

	TOP=$(TOP) $(TOP)/fips/openssl_fips_fingerprint $(TOP)/libcrypto.a fips_sha1test



fips_test: top_fips_sha1test

	-rm -rf ../testvectors/sha1/rsp