From ed0a35f222b3bd23d887205e7fef37a55045c0d1 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Thu, 26 May 2011 13:59:11 +0000 Subject: [PATCH] Install fips_standalone_sha1 and make use of it in fipsld script. --- fips/Makefile | 2 +- fips/fipsld | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/fips/Makefile b/fips/Makefile index 61056a8f59..1eebfb45d7 100644 --- a/fips/Makefile +++ b/fips/Makefile @@ -51,7 +51,7 @@ SRC= $(LIBSRC) EXHEADER=fips.h fipssyms.h HEADER=$(EXHEADER) fips_utl.h fips_locl.h -EXE=fipsld +EXE=fipsld fips_standalone_sha1 ALL= $(GENERAL) $(SRC) $(HEADER) diff --git a/fips/fipsld b/fips/fipsld index 8c26c8596d..34b6e01bc0 100755 --- a/fips/fipsld +++ b/fips/fipsld @@ -138,6 +138,8 @@ lib*|*.dll) # must be linking a shared lib... # directory or off the installed binary target destination. if [ -x "${THERE}/fips/fips_standalone_sha1" ]; then FINGERTYPE="${THERE}/fips/fips_standalone_sha1" + elif [ -x "${THERE}/bin/fips_standalone_sha1" ]; then + FINGERTYPE="${THERE}/bin/fips_standalone_sha1" else # Installed tree is expected to contain # lib/fipscanister.o, lib/fipscanister.o.sha1 and # lib/fips_premain.c [not to mention bin/openssl]. -- 2.25.1