Install fips_standalone_sha1 and make use of it in fipsld script.

diff --git a/fips/Makefile b/fips/Makefile
index 61056a8f59a5b6a5b04af3a95f9f7be3e63307e2..1eebfb45d746aa0831a3a2d2d3da58ec6faecce2 100644 (file)
--- 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 8c26c8596dec1f1e85b5c100f17fbadfdc083ecf..34b6e01bc0ca8e97a471ff299cc7f89ae502c49c 100755 (executable)
--- 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].