OpenSSL: OpenSSL-fips2-0_9_7-stable: openssl/fips-1.0/ Makefile ...

Thread: OpenSSL: OpenSSL-fips2-0_9_7-stable: openssl/fips-1.0/ Makefile ...

Search this list only Search all lists
OpenSSL: OpenSSL-fips2-0_9_7-stable: openssl/fips-1.0/ Makefile ...
	2007-01-25 15:29:08
OpenSSL CVS Repository http://cvs.openssl.org/ ____________________________________________________________________________ Server: cvs.openssl.org Name: Dr. Stephen Henson Root: /v/openssl/cvs Email: steveopenssl.org Module: openssl Date: 25-Jan-2007 22:29:08 Branch: OpenSSL-fips2-0_9_7-stable Handle: 2007012521290700 Modified files: (Branch: OpenSSL-fips2-0_9_7-stable) openssl/fips-1.0 Makefile fipsld Log: Fixes to build system to cleanly handle fipsdso Summary: Revision Changes Path 1.1.2.15.2.2+1 -1 openssl/fips-1.0/Makefile 1.1.2.6.2.2 +1 -1 openssl/fips-1.0/fipsld ____________________________________________________________________________ patch -p0 <<' .' Index: openssl/fips-1.0/Makefile ============================================================================ $ cvs diff -u -r1.1.2.15.2.1 -r1.1.2.15.2.2 Makefile --- openssl/fips-1.0/Makefile 24 Jan 2007 13:00:14 -0000 1.1.2.15.2.1 +++ openssl/fips-1.0/Makefile 25 Jan 2007 21:29:07 -0000 1.1.2.15.2.2 -137,7 +137,7 touch lib shared: fips_premain_dso$(EXE_EXT) - if [ -n "$(SHARED_LIBS)" ]; then + if [ -n "$(SHARED_LIBS)" -a "$(FIPSCANLIB)" != "libfips" ]; then (cd ..; $(MAKE) FIPSLD_CC=$(CC) FIPSLD=fips-1.0/fipsld $(SHARED_LIB)); fi . patch -p0 <<' .' Index: openssl/fips-1.0/fipsld ============================================================================ $ cvs diff -u -r1.1.2.6.2.1 -r1.1.2.6.2.2 fipsld --- openssl/fips-1.0/fipsld 25 Jan 2007 18:47:18 -0000 1.1.2.6.2.1 +++ openssl/fips-1.0/fipsld 25 Jan 2007 21:29:07 -0000 1.1.2.6.2.2 -64,7 +64,7 esac case "$" in -*${FIPCANLIB}*|*.dll) # must be linking a shared lib... +*${FIPSCANLIB}*|*.dll) # must be linking a shared lib... # Shared lib creation can be taking place in the source # directory only!!! FINGERTYPE="$/fips-1.0/sha/fips_standalone_sha1" . ______________________________________________________________________ OpenSSL Project http://www.openssl.org CVS Repository Commit List openssl-cvsopenssl.org Automated List Manager majordomoopenssl.org