Update HPUX config, work around HPUX library incompatibility. (afd1f9e8) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

CHANGES

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -5,6 +5,12 @@

	Changes between 0.9.2b and 0.9.3		Changes between 0.9.2b and 0.9.3

			*) Accept any -xxx and +xxx compiler options in Configure.
			[Ulf Möller]

			*) Update HPUX configuration.
			[Anonymous]

	*) Add missing sk_<type>_unshift() function to safestack.h		*) Add missing sk_<type>_unshift() function to safestack.h
	[Ralf S. Engelschall]		[Ralf S. Engelschall]

Configure

+13 −10

Original line number	Original line	Diff line number	Diff line
	@@ -30,7 +30,7 @@ my $usage="Usage: Configure [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [rsaref] [no
	# no-asm do not use assembler		# no-asm do not use assembler
	# 386 generate 80386 code		# 386 generate 80386 code
	# no-<cipher> build without specified algorithm (rsa, idea, rc5, ...)		# no-<cipher> build without specified algorithm (rsa, idea, rc5, ...)
	# -D, -L, -l, -f, -K: compiler options are passed through		# -<xxx> +<xxx> compiler options are passed through
	#		#
	# DES_PTR use pointer lookup vs arrays in the DES in crypto/des/des_locl.h		# DES_PTR use pointer lookup vs arrays in the DES in crypto/des/des_locl.h
	# DES_RISC1 use different DES_ENCRYPT macro that helps reduce register		# DES_RISC1 use different DES_ENCRYPT macro that helps reduce register
	@@ -136,14 +136,17 @@ my %table=(
	# This is the n64 mode build.		# This is the n64 mode build.
	"irix-n64-cc", "cc:-64 -O2 -use_readonly_const -DTERMIOS:(unknown)::DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT:::",		"irix-n64-cc", "cc:-64 -O2 -use_readonly_const -DTERMIOS:(unknown)::DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT:::",

	# HPUX config. I've been building on HPUX 9, so the options may be		# HPUX 9.X config.
	# different on version 10.		# Don't use the bundled cc. It is broken. Use HP ANSI C if possible, or gcc.
	"hpux-cc", "cc:-DB_ENDIAN -D_HPUX_SOURCE -Aa -Ae +ESlit +O4 -Wl,-a,archive:(unknown)::DES_PTR DES_UNROLL DES_RISC1:::",		"hpux-cc", "cc:-DB_ENDIAN -DBN_DIV2W -Ae +ESlit +O4 -z:(unknown)::BN_LLONG DES_PTR DES_UNROLL DES_RISC1:::",
	##"hpux-kr-cc", "cc:-DB_ENDIAN -DNOCONST -DNOPROTO -D_HPUX_SOURCE:(unknown)::DES_PTR DES_UNROLL:::",		"hpux-gcc", "gcc:-DB_ENDIAN -DBN_DIV2W -O3:(unknown)::BN_LLONG DES_PTR DES_UNROLL DES_RISC1:::",
	"hpux-gcc", "gcc:-DB_ENDIAN -O3:(unknown)::BN_LLONG DES_PTR DES_UNROLL DES_RISC1:::",		# HPUX 10.X config. Supports threads.
	# HPUX from www.globus.org		"hpux10-cc", "cc:-DB_ENDIAN -DBN_DIV2W -Ae +ESlit +O4 -z:-D_REENTRANT::BN_LLONG DES_PTR DES_UNROLL DES_RISC1:::",
	"hpux11-32bit-cc","cc:+DA2.0 -DB_ENDIAN -D_HPUX_SOURCE -Aa -Ae +ESlit:(unknown)::DES_PTR DES_UNROLL DES_RISC1:::",		"hpux10-gcc", "gcc:-DB_ENDIAN -DBN_DIV2W -O3:-D_REENTRANT::BN_LLONG DES_PTR DES_UNROLL DES_RISC1:::",
	"hpux11-64bit-cc","cc:+DA2.0W -g -D_HPUX_SOURCE -Aa -Ae +ESlit:(unknown)::SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT :::",		# HPUX 11.X from www.globus.org.
			# Only works on PA-RISC 2.0 cpus, and not optimized. Why?
			"hpux11-32bit-cc","cc:+DA2.0 -DB_ENDIAN -D_HPUX_SOURCE -Aa -Ae +ESlit:-D_REENTRANT::DES_PTR DES_UNROLL DES_RISC1:::",
			"hpux11-64bit-cc","cc:+DA2.0W -g -D_HPUX_SOURCE -Aa -Ae +ESlit:-D_REENTRANT::SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT :::",

	# Dec Alpha, OSF/1 - the alpha164-cc is the flags for a 21164A with		# Dec Alpha, OSF/1 - the alpha164-cc is the flags for a 21164A with
	# the new compiler		# the new compiler
	@@ -319,7 +322,7 @@ foreach (@ARGV)
	{		{
	$libs.=$_." ";		$libs.=$_." ";
	}		}
	elsif (/^-[DfK](.*)$/)		elsif (/^-[^-]/ or /^\+/)
	{		{
	$flags.=$_." ";		$flags.=$_." ";
	}		}

config

+5 −2

Original line number	Original line	Diff line number	Diff line
	@@ -82,8 +82,11 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
	HP-UX:*)		HP-UX:*)
	HPUXVER=`echo ${RELEASE}\|sed -e 's/[^.].[0B]//'`		HPUXVER=`echo ${RELEASE}\|sed -e 's/[^.].[0B]//'`
	case "$HPUXVER" in		case "$HPUXVER" in
			11.*)
			echo "${MACHINE}-hp-hpux11"; exit 0
			;;
	10.*)		10.*)
	echo "${MACHINE}-hp-hpux10."; exit 0		echo "${MACHINE}-hp-hpux10"; exit 0
	;;		;;
	*)		*)
	echo "${MACHINE}-hp-hpux"; exit 0		echo "${MACHINE}-hp-hpux"; exit 0
	@@ -310,8 +313,8 @@ case "$GUESSOS" in
	--osf) OUT="alpha-cc" ;;		--osf) OUT="alpha-cc" ;;
	--unixware*) OUT="unixware-2.0" ;;		--unixware*) OUT="unixware-2.0" ;;
	*-sni-sysv4) OUT="SINIX" ;;		*-sni-sysv4) OUT="SINIX" ;;
	-hpux) OUT="hpux-$CC" ;;
	# these are all covered by the catchall below		# these are all covered by the catchall below
			# -hpux) OUT="hpux-$CC" ;;
	# *-aix) OUT="aix-$CC" ;;		# *-aix) OUT="aix-$CC" ;;
	# *-dgux) OUT="dgux" ;;		# *-dgux) OUT="dgux" ;;
	*) OUT=`echo $GUESSOS \| awk -F- '{print $3}'`;;		*) OUT=`echo $GUESSOS \| awk -F- '{print $3}'`;;

crypto/asn1/a_gentm.c

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -183,9 +183,10 @@ ASN1_GENERALIZEDTIME ASN1_GENERALIZEDTIME_set(ASN1_GENERALIZEDTIME s,
	return(NULL);		return(NULL);

	#if defined(THREADS) && !defined(WIN32)		#if defined(THREADS) && !defined(WIN32)
	ts=(struct tm *)gmtime_r(&t,&data);		gmtime_r(&t,&data);
			ts=&data;
	#else		#else
	ts=(struct tm *)gmtime(&t);		ts=gmtime(&t);
	#endif		#endif
	p=(char *)s->data;		p=(char *)s->data;
	if ((p == NULL) \|\| (s->length < 16))		if ((p == NULL) \|\| (s->length < 16))

crypto/asn1/a_time.c

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -97,9 +97,10 @@ ASN1_TIME ASN1_TIME_set(ASN1_TIME s, time_t t)
	#endif		#endif

	#if defined(THREADS) && !defined(WIN32)		#if defined(THREADS) && !defined(WIN32)
	ts=(struct tm *)gmtime_r(&t,&data);		gmtime_r(&t,&data);
			ts=&data;
	#else		#else
	ts=(struct tm *)gmtime(&t);		ts=gmtime(&t);
	#endif		#endif
	if((ts->tm_year >= 1950) && (ts->tm_year < 2050))		if((ts->tm_year >= 1950) && (ts->tm_year < 2050))
	return ASN1_UTCTIME_set(s, t);		return ASN1_UTCTIME_set(s, t);