Install fips_standalone_sha1 and make use of it in fipsld script.
authorDr. Stephen Henson <steve@openssl.org>
Thu, 26 May 2011 13:59:11 +0000 (13:59 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Thu, 26 May 2011 13:59:11 +0000 (13:59 +0000)
fips/Makefile
fips/fipsld

index 61056a8..1eebfb4 100644 (file)
@@ -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)
 
index 8c26c85..34b6e01 100755 (executable)
@@ -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].