Commit 60ace8f3 authored by Ben Laurie's avatar Ben Laurie
Browse files

In FIPS mode ranlib before hashing.

parent 9d4e2f89

Makefile.org

+4 −1
Original line number Diff line number Diff line
@@ -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; \

			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; \