Commit c9e91259 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

FIPSLD_NPT environment variable to disable pass-thru when building 

standalone utilities.
parent 53ddf0cc

fips-1.0/fipsld

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

test/Makefile

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