In FIPS mode ranlib before hashing.
This commit is contained in:
parent
9d4e2f891b
commit
60ace8f3fc
@ -227,6 +227,7 @@ all: Makefile.ssl sub_all openssl.pc
|
|||||||
sigs: $(SIGS)
|
sigs: $(SIGS)
|
||||||
libcrypto.sha1: libcrypto.a
|
libcrypto.sha1: libcrypto.a
|
||||||
if egrep 'define OPENSSL_FIPS' $(TOP)/include/openssl/opensslconf.h > /dev/null; then \
|
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; \
|
fips/sha1/fips_standalone_sha1 libcrypto.a > libcrypto.sha1; \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -814,7 +815,9 @@ install: all install_docs
|
|||||||
if [ -f "$$i" ]; then \
|
if [ -f "$$i" ]; then \
|
||||||
( echo installing $$i; \
|
( echo installing $$i; \
|
||||||
cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
|
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; \
|
chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
|
||||||
mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i ); \
|
mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i ); \
|
||||||
fi; \
|
fi; \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user