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

Add crossbuild patch to 1.2 FIPS branch.

parent a0055fbe

Configure

+12 −3
Original line number Diff line number Diff line
@@ -566,7 +566,8 @@ my $idx_arflags = $idx++; 
my $prefix="";

my $openssldir="";

my $exe_ext="";

my $install_prefix="";

my $install_prefix="$ENV{'INSTALL_PREFIX'}";

my $cross_compile_prefix="$ENV{'CROSS_COMPILE'}";

my $fipslibdir="/usr/local/ssl/lib/fips-1.0/";

my $nofipscanistercheck=0;

my $fipsdso=0;
@@ -1397,7 +1398,16 @@ while (<IN>) 
	s/^PLATFORM=.*$/PLATFORM=$target/;

	s/^OPTIONS=.*$/OPTIONS=$options/;

	s/^CONFIGURE_ARGS=.*$/CONFIGURE_ARGS=$argvstring/;

	if ($cross_compile_prefix)

		{

		s/^CC=.*$/CROSS_COMPILE= $cross_compile_prefix\nCC= \$\(CROSS_COMPILE\)$cc/;

		s/^AR=\s*/AR= \$\(CROSS_COMPILE\)/;

		s/^RANLIB=\s*/RANLIB= \$\(CROSS_COMPILE\)/;

		}

	else	{

		s/^CC=.*$/CC= $cc/;

		s/^RANLIB=.*/RANLIB= $ranlib/;

		}

	s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $cc eq "gcc";

	s/^CFLAG=.*$/CFLAG= $cflags/;

	s/^DEPFLAG=.*$/DEPFLAG= $depflags/;
@@ -1416,7 +1426,6 @@ while (<IN>) 
	s/^SHA1_ASM_OBJ=.*$/SHA1_ASM_OBJ= $sha1_obj/;

	s/^RMD160_ASM_OBJ=.*$/RMD160_ASM_OBJ= $rmd160_obj/;

	s/^PROCESSOR=.*/PROCESSOR= $processor/;

	s/^RANLIB=.*/RANLIB= $ranlib/;

	s/^ARFLAGS=.*/ARFLAGS= $arflags/;

	s/^PERL=.*/PERL= $perl/;

	s/^KRB5_INCLUDES=.*/KRB5_INCLUDES=$withargs{"krb5-include"}/;

Makefile.org

+8 −6
Original line number Diff line number Diff line
@@ -512,12 +512,14 @@ dclean: 
	@set -e; target=dclean; $(RECURSIVE_BUILD_CMD)



rehash: rehash.time

rehash.time: certs

	@(OPENSSL="`pwd`/util/opensslwrap.sh"; \

rehash.time: certs apps

	@if [ -z "$(CROSS_COMPILE)" ]; then \

		(OPENSSL="`pwd`/util/opensslwrap.sh"; \

		OPENSSL_DEBUG_MEMORY=on; \

		export OPENSSL OPENSSL_DEBUG_MEMORY; \

	  $(PERL) tools/c_rehash certs)

	touch rehash.time

		$(PERL) tools/c_rehash certs) && \

		touch rehash.time; \

	else :; fi



test:   tests

apps/Makefile

+2 −5
Original line number Diff line number Diff line
@@ -153,17 +153,14 @@ $(EXE): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL) 
	shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \

		shlib_target="$(SHLIB_TARGET)"; \

	elif [ -n "$(FIPSCANLIB)" ]; then \

	  FIPSLD_CC=$(CC); CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \

	  FIPSLD_CC="$(CC)"; CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \

	fi; \

	LIBRARIES="$(LIBSSL) $(LIBKRB5) $(LIBCRYPTO)" ; \

	[ "x$(FIPSCANLIB)" = "xlibfips" ] && LIBRARIES="$$LIBRARIES -lfips"; \

	$(MAKE) -f $(TOP)/Makefile.shared -e \

		CC=$${CC} APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \

		CC="$${CC}" APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \

		LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \

		link_app.$${shlib_target}

	-(cd ..; \

	  OPENSSL="`pwd`/util/opensslwrap.sh"; export OPENSSL; \

	  $(PERL) tools/c_rehash certs)



progs.h: progs.pl

	$(PERL) progs.pl $(E_EXE) >progs.h

config

+4 −4
Original line number Diff line number Diff line
@@ -48,10 +48,10 @@ done 


# First get uname entries that we use below



MACHINE=`(uname -m) 2>/dev/null` || MACHINE="unknown"

RELEASE=`(uname -r) 2>/dev/null` || RELEASE="unknown"

SYSTEM=`(uname -s) 2>/dev/null`  || SYSTEM="unknown"

VERSION=`(uname -v) 2>/dev/null` || VERSION="unknown"

[ "$MACHINE" ] || MACHINE=`(uname -m) 2>/dev/null` || MACHINE="unknown"

[ "$RELEASE" ] || RELEASE=`(uname -r) 2>/dev/null` || RELEASE="unknown"

[ "$SYSTEM" ] || SYSTEM=`(uname -s) 2>/dev/null`  || SYSTEM="unknown"

[ "$BUILD" ] || VERSION=`(uname -v) 2>/dev/null` || VERSION="unknown"





# Now test for ISC and SCO, since it is has a braindamaged uname.

fips/fipsld

+10 −2
Original line number Diff line number Diff line
@@ -117,7 +117,11 @@ lib*|*.dll) # must be linking a shared lib... 
		${_WL_PREMAIN} "$@"



	# generate signature...

	if [ -z "${FIPS_SIG}" ]; then

		SIG=`"${THERE}/fips/fips_premain_dso" "${TARGET}"`

	else

		SIG=`"${FIPS_SIG}" -dso "${TARGET}"`

	fi

	/bin/rm -f "${TARGET}"

	if [ -z "${SIG}" ]; then

	   echo "unable to collect signature"; exit 1
@@ -156,7 +160,11 @@ lib*|*.dll) # must be linking a shared lib... 
		${_WL_PREMAIN} "$@"



	# generate signature...

	if [ -z "${FIPS_SIG}" ]; then

		SIG=`"${TARGET}"`

	else

		SIG=`"${FIPS_SIG}" -exe "${TARGET}"`

	fi

	/bin/rm -f "${TARGET}"

	if [ -z "${SIG}" ]; then

	   echo "unable to collect signature"; exit 1