wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FIPSLD_NPT environment variable to disable pass-thru when building

Browse source 
standalone utilities.
This commit is contained in:
Dr. Stephen Henson 2007-02-11 00:51:58 +00:00
parent 53ddf0cc10
commit c9e912599f
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fips-1.0/fipsld
View file

@ -27,6 +27,9 @@ CC=${FIPSLD_CC:-${CC}}
# simple checks. Pass-thru to compiler directly if not linking # simple checks. Pass-thru to compiler directly if not linking
# to libcrypto, allowing auto-tooled applications to utilize fipsld # to libcrypto, allowing auto-tooled applications to utilize fipsld
# (e.g. CC=/usr/local/ssl/bin/fipsld FIPSLD_CC=gcc ./configure && make ) # (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 case "$*" in
*libcrypto.a*) *libcrypto.a*)
;; ;;
@ -36,6 +39,7 @@ case "$*" in
exec ${CC} $* exec ${CC} $*
;; ;;
esac esac
}
# Turn on debugging output? # Turn on debugging output?
( while [ "x$1" != "x" -a "x$1" != "x-DDEBUG_FINGERPRINT_PREMAIN" ]; do shift; done; ( while [ "x$1" != "x" -a "x$1" != "x-DDEBUG_FINGERPRINT_PREMAIN" ]; do shift; done;

3
test/Makefile
View file

@ -352,7 +352,8 @@ STANDALONE_BUILD_CMD=SHARED_LIBS="$(SHARED_LIBS)"; \
fi fi
FIPS_BUILD_CMD=if egrep 'define OPENSSL_FIPS' $(TOP)/include/openssl/opensslconf.h > /dev/null; then \ 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) fi; $(STANDALONE_BUILD_CMD)
FIPS_CRYPTO_BUILD_CMD=if egrep 'define OPENSSL_FIPS' $(TOP)/include/openssl/opensslconf.h > /dev/null; then \ FIPS_CRYPTO_BUILD_CMD=if egrep 'define OPENSSL_FIPS' $(TOP)/include/openssl/opensslconf.h > /dev/null; then \