In FIPS mode ranlib before hashing.
authorBen Laurie <ben@openssl.org>
Wed, 3 Mar 2004 15:10:09 +0000 (15:10 +0000)
committerBen Laurie <ben@openssl.org>
Wed, 3 Mar 2004 15:10:09 +0000 (15:10 +0000)
Makefile.org

index 34bb3e97c3496168e6e3e339854c2b50ef863cb9..19b5c243ba42b84b1a633915725efdadef14b681 100644 (file)
@@ -227,6 +227,7 @@ all: Makefile.ssl sub_all openssl.pc
 sigs:  $(SIGS)
 libcrypto.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; \
        fi
 
@@ -814,7 +815,9 @@ install: all install_docs
                if [ -f "$$i" ]; then \
                (       echo installing $$i; \
                        cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
-                       $(RANLIB) $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
+                       if ! egrep 'define OPENSSL_FIPS' $(TOP)/include/openssl/opensslconf.h > /dev/null; then \
+                               $(RANLIB) $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
+                       fi \
                        chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
                        mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i ); \
                fi; \