Rename libcrypto.sha1 to libcrypto.a.sha1

diff --git a/Makefile.org b/Makefile.org
index d21007e15dbd160f1f7ea71bf660bcde4702a592..221ff86ad2aa24874436dfc59a110ea1c07a635e 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -205,7 +205,7 @@ ONEDIRS=out tmp
 EDIRS=  times doc bugs util include certs ms shlib mt demos perl sf dep VMS
 WDIRS=  windows
 LIBS=   libcrypto.a libssl.a
-SIGS=  libcrypto.sha1
+SIGS=  libcrypto.a.sha1
 SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
 SHARED_SSL=libssl$(SHLIB_EXT)
 SHARED_LIBS=
@@ -226,10 +226,10 @@ HEADER=         e_os.h
 all: Makefile sub_all openssl.pc
 
 sigs:  $(SIGS)
-libcrypto.sha1: libcrypto.a
+libcrypto.a.sha1: libcrypto.a
        if egrep 'define OPENSSL_FIPS' $(TOP)/include/openssl/opensslconf.h > /dev/null; then \
                $(RANLIB) libcrypto.a; \
-               fips/sha1/fips_standalone_sha1 libcrypto.a > libcrypto.sha1; \
+               fips/sha1/fips_standalone_sha1 libcrypto.a > libcrypto.a.sha1; \
        fi
 
 sub_all:

diff --git a/fips/fips_check_sha1 b/fips/fips_check_sha1
index 51b40ec6d84104739151dc5824b9ccf2accf8b4e..bc3f24a32425a88164bf04bb07299cedbcca945d 100755 (executable)
--- a/fips/fips_check_sha1
+++ b/fips/fips_check_sha1
@@ -5,4 +5,4 @@ shift
 
 egrep 'define OPENSSL_FIPS' $TOP/include/openssl/opensslconf.h > /dev/null || exit 0
 
-$TOP/fips/sha1/fips_standalone_sha1 $@ | diff $FP - || { echo; echo "*** Your source code does not match the FIPS certified source ***"; echo; exit 1; }
+$TOP/fips/sha1/fips_standalone_sha1 $@ | diff $FP - || { echo; echo "*** Your source code does not match the FIPS validated source ***"; echo; exit 1; }

diff --git a/fips/openssl_fips_fingerprint b/fips/openssl_fips_fingerprint
index 932f3cdc4259633f6af1e9ded351440e3ca72691..c9fca91fc3f96d753fb943828b4127d298b3654b 100755 (executable)
--- a/fips/openssl_fips_fingerprint
+++ b/fips/openssl_fips_fingerprint
@@ -18,7 +18,7 @@ else
 fi
 
 echo "Checking library fingerprint for $lib"
-openssl sha1 -hmac etaonrishdlcupfm $lib | sed "s/(.*\//(/" | diff ${lib%.a}.sha1 - || { echo "$libs fingerprint mismatch"; exit 1; }
+openssl sha1 -hmac etaonrishdlcupfm $lib | sed "s/(.*\//(/" | diff $lib.sha1 - || { echo "$libs fingerprint mismatch"; exit 1; }
 
 echo "Making fingerprint for $exe"
 openssl sha1 -hmac etaonrishdlcupfm -binary $exe > $exe.sha1