From c9e912599f15b3507f1e97793bb960567c345568 Mon Sep 17 00:00:00 2001
From: "Dr. Stephen Henson" <steve@openssl.org>
Date: Sun, 11 Feb 2007 00:51:58 +0000
Subject: [PATCH] FIPSLD_NPT environment variable to disable pass-thru when
 building standalone utilities.

---
 fips-1.0/fipsld | 4 ++++
 test/Makefile   | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/fips-1.0/fipsld b/fips-1.0/fipsld
index 92c864ede4..ec10e20c0f 100755
--- a/fips-1.0/fipsld
+++ b/fips-1.0/fipsld
@@ -27,6 +27,9 @@ CC=${FIPSLD_CC:-${CC}}
 # simple checks.  Pass-thru to compiler directly if not linking
 # to libcrypto, allowing auto-tooled applications to utilize fipsld
 # (e.g.  CC=/usr/local/ssl/bin/fipsld FIPSLD_CC=gcc ./configure && make )
+# If FIPSLD_NPT is set never call the pass-thru: the standalone fips commands
+# need this because they don't link to libcrypto
+[ "x$FIPSLD_NPT" != "x" ] || {
 case "$*" in
 	*libcrypto.a*)
 	;;
@@ -36,6 +39,7 @@ case "$*" in
 		exec ${CC} $*
 	;;
 esac
+}
 
 # Turn on debugging output?
 (   while [ "x$1" != "x" -a "x$1" != "x-DDEBUG_FINGERPRINT_PREMAIN" ]; do shift; done;
diff --git a/test/Makefile b/test/Makefile
index 1eeba890eb..34724f9993 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -352,7 +352,8 @@ STANDALONE_BUILD_CMD=SHARED_LIBS="$(SHARED_LIBS)"; \
 	fi
 
 FIPS_BUILD_CMD=if egrep 'define OPENSSL_FIPS' $(TOP)/include/openssl/opensslconf.h > /dev/null; then \
-	  FIPSLD_CC=$(CC); CC=$(TOP)/fips-1.0/fipsld; export CC FIPSLD_CC; \
+	  FIPSLD_CC=$(CC); CC=$(TOP)/fips-1.0/fipsld; FIPSLD_NPT="y"\
+	  export CC FIPSLD_CC FIPSLD_STANDALONE ; \
 	fi; $(STANDALONE_BUILD_CMD)
 
 FIPS_CRYPTO_BUILD_CMD=if egrep 'define OPENSSL_FIPS' $(TOP)/include/openssl/opensslconf.h > /dev/null; then \
-- 
2.25.1