Merge in recent changes from 0.9.6-stable (b57e6560) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

Configure

+12 −4

Original line number	Diff line number	Diff line
		@@ -182,7 +182,7 @@ my %table=(
		"linux-sparcv8","gcc:-mv8 -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o::::",
		# it's a real mess with -mcpu=ultrasparc option under Linux, but
		# -Wa,-Av8plus should do the trick no matter what.
		"linux-sparcv9","gcc:-mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:linux-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
		"linux-sparcv9","gcc:-mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
		# !!!Folowing can't be even tested yet!!!
		# We have to wait till 64-bit glibc for SPARC is operational!!!
		#"linux64-sparcv9","sparc64-linux-gcc:-m64 -mcpu=v9 -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::asm/md5-sparcv9.o:",
		@@ -345,7 +345,7 @@ my %table=(
		# The intel boxes :-), It would be worth seeing if bsdi-gcc can use the
		# bn86-elf.o file file since it is hand tweaked assembler.
		"linux-elf", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT:-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
		"debug-linux-elf","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -m486 -Wall::-D_REENTRANT:-lefence -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
		"debug-linux-elf","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -m486 -Wall::-D_REENTRANT:-lefence -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
		"debug-linux-elf-noefence","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -m486 -Wall::-D_REENTRANT:-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn",
		"linux-aout", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}",
		"linux-mipsel", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::(unknown)::BN_LLONG:::",
		@@ -498,7 +498,7 @@ my %table=(

		##### MacOS X (a.k.a. Rhapsody or Darwin) setup
		"rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown)::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::",
		"darwin-ppc-cc","cc:-O3 -D_DARWIN -DB_ENDIAN::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::::::::::darwin-shared:-fPIC:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
		"darwin-ppc-cc","cc:-O3 -D_DARWIN -DB_ENDIAN::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::::::::::darwin-shared:-fPIC::.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",

		##### Sony NEWS-OS 4.x
		"newsos4-gcc","gcc:-O -DB_ENDIAN -DNEWS4::(unknown):-lmld -liberty:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::",
		@@ -1003,13 +1003,21 @@ while (<IN>)
		if ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*$/)
		{
		my $sotmp = $1;
		s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp/
		s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp/;
		}
		elsif ($shared_extension ne "" && $shared_extension =~ /^\.[^\.]*\.dylib$/)
		{
		s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.dylib/;
		}
		elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]\.[^\.]$/)
		{
		my $sotmp = $1;
		s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/;
		}
		elsif ($shared_extension ne "" && $shared_extension =~ /^\.[^\.]\.[^\.]\.dylib$/)
		{
		s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.\$(SHLIB_MAJOR).dylib .dylib/;
		}
		s/^SHARED_LDFLAGS=.*/SHARED_LDFLAGS=$shared_ldflag/;
		print OUT $_."\n";
		}

Makefile.org

+6 −4

Original line number	Diff line number	Diff line
		@@ -682,8 +682,9 @@ install_docs:
		if [ "$$fn" = "config" ]; then sec=5; else sec=1; fi; \
		echo "installing man$$sec/`basename $$i .pod`.$$sec"; \
		(cd `dirname $$i`; \
		$(PERL) ../../util/pod2man.pl --section=$$sec --center=OpenSSL \
		--release=$(VERSION) `basename $$i`) \
		sh -c "`cd ../../util; ./pod2mantest ignore` \
		--section=$$sec --center=OpenSSL \
		--release=$(VERSION) `basename $$i`") \
		> $(INSTALL_PREFIX)$(MANDIR)/man$$sec/`basename $$i .pod`.$$sec; \
		done
		@for i in doc/crypto/.pod doc/ssl/.pod; do \
		@@ -691,8 +692,9 @@ install_docs:
		if [ "$$fn" = "des_modes" ]; then sec=7; else sec=3; fi; \
		echo "installing man$$sec/`basename $$i .pod`.$$sec"; \
		(cd `dirname $$i`; \
		$(PERL) ../../util/pod2man.pl --section=$$sec --center=OpenSSL \
		--release=$(VERSION) `basename $$i`) \
		sh -c "`cd ../../util; ./pod2mantest ignore` \
		--section=$$sec --center=OpenSSL \
		--release=$(VERSION) `basename $$i`") \
		> $(INSTALL_PREFIX)$(MANDIR)/man$$sec/`basename $$i .pod`.$$sec; \
		done

TABLE

+8 −7

Original line number	Diff line number	Diff line
		Output of `Configure TABLE':

		*** BC-16
		$cc = bcc
		@@ -1099,8 +1100,8 @@ $rc5_obj =
		$dso_scheme =
		$shared_target= darwin-shared
		$shared_cflag = -fPIC
		$shared_ldflag = .$(SHLIB_MAJOR).$(SHLIB_MINOR).dylib
		$shared_extension =
		$shared_ldflag =
		$shared_extension = .$(SHLIB_MAJOR).$(SHLIB_MINOR).dylib
		$ranlib =

		*** debug
		@@ -1260,8 +1261,8 @@ $rc5_obj = asm/r586-elf.o
		$dso_scheme = dlfcn
		$shared_target= linux-shared
		$shared_cflag = -fPIC
		$shared_ldflag = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
		$shared_extension =
		$shared_ldflag =
		$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
		$ranlib =

		*** debug-linux-elf-noefence
		@@ -2479,8 +2480,8 @@ $rc5_obj =
		$dso_scheme = dlfcn
		$shared_target= linux-shared
		$shared_cflag = -fPIC
		$shared_ldflag = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
		$shared_extension =
		$shared_ldflag =
		$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
		$ranlib =

		*** ncr-scde
		@@ -2784,7 +2785,7 @@ $ranlib =

		*** sco5-gcc-shared
		$cc = gcc
		$cflags = -O3 -DFILIO_H -fomit-frame-pointer
		$cflags = -O3 -fomit-frame-pointer
		$unistd =
		$thread_cflag =
		$lflags = -lsocket -lresolv -lnsl

apps/x509.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -237,7 +237,7 @@ int MAIN(int argc, char **argv)
		else if (strcmp(*argv,"-CAkeyform") == 0)
		{
		if (--argc < 1) goto bad;
		CAformat=str2fmt(*(++argv));
		CAkeyformat=str2fmt(*(++argv));
		}
		else if (strcmp(*argv,"-days") == 0)
		{

crypto/asn1/a_enum.c

+11 −1

Original line number	Diff line number	Diff line
		@@ -205,7 +205,17 @@ ASN1_ENUMERATED BN_to_ASN1_ENUMERATED(BIGNUM bn, ASN1_ENUMERATED *ai)
		else ret->type=V_ASN1_ENUMERATED;
		j=BN_num_bits(bn);
		len=((j == 0)?0:((j/8)+1));
		ret->data=(unsigned char *)OPENSSL_malloc(len+4);
		if (ret->length < len+4)
		{
		char new_data=(char )OPENSSL_realloc(ret->data, len+4);
		if (!new_data)
		{
		ASN1err(ASN1_F_BN_TO_ASN1_INTEGER,ERR_R_MALLOC_FAILURE);
		goto err;
		}
		ret->data=new_data;
		}

		ret->length=BN_bn2bin(bn,ret->data);
		return(ret);
		err: