Incorporation of RSEs assembled patches (13e91dd3) · Commits · CYBER - Cyber Security / TS 103 523 MSP / ETS / ETS OpenSSL

CHANGES

+16 −1

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

	Changes between 0.9.01b and 0.9.1c		Changes between 0.9.01b and 0.9.1c

			*) Fixed the nasty bug where rsaref.h was not found under compile-time
			because the symlink to include/ was missing.
			[Ralf S. Engelschall]

			*) Incorporated the popular no-RSA/DSA-only patches
			which allow to compile a RSA-free SSLeay.
			[Interrader Ldt., Ralf S. Engelschall]

			*) Fixed nasty rehash problem under `make -f Makefile.ssl links'
			when "ssleay" is still not found.
			[Ralf S. Engelschall]

			*) Added more platforms to Configure: Cray T3E, HPUX 11,
			[Ralf S. Engelschall, Beckmann <beckman@acl.lanl.gov>]

	*) Updated the README file.		*) Updated the README file.
	[Ralf S. Engelschall]		[Ralf S. Engelschall]

	@@ -32,7 +47,7 @@
	util/f.mak util/pl/f util/pl/f.mak crypto/bf/bf_locl.old apps/f		util/f.mak util/pl/f util/pl/f.mak crypto/bf/bf_locl.old apps/f
	[Ralf S. Engelschall]		[Ralf S. Engelschall]

	*) Added various platform portability fixed.		*) Added various platform portability fixes.
	[Marc J. Cox]		[Marc J. Cox]

	*) The Genesis of the OpenTLS rpject:		*) The Genesis of the OpenTLS rpject:

Configure

+17 −1

Original line number	Original line	Diff line number	Diff line
	@@ -73,6 +73,7 @@ $x86_bsdi_asm="asm/bn86bsdi.o asm/co86bsdi.o:asm/dx86bsdi.o asm/yx86bsdi.o:asm/b
	# A few of my development configs		# A few of my development configs
	"purify", "purify gcc:-g -DPURIFY -Wall:-lsocket -lnsl::::",		"purify", "purify gcc:-g -DPURIFY -Wall:-lsocket -lnsl::::",
	"debug", "gcc:-DBN_DEBUG -DREF_CHECK -DCRYPTO_MDEBUG -ggdb -g2 -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror:-lefence::::",		"debug", "gcc:-DBN_DEBUG -DREF_CHECK -DCRYPTO_MDEBUG -ggdb -g2 -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror:-lefence::::",
			"debug-rse","gcc:-DTERMIOS -DL_ENDIAN -DREF_CHECK -DCRYPTO_MDEBUG -g -ggdb3 -Wall:::::",
	"dist", "cc:-O -DNOPROTO::::",		"dist", "cc:-O -DNOPROTO::::",

	# Basic configs that should work on any box		# Basic configs that should work on any box
	@@ -122,6 +123,9 @@ $x86_bsdi_asm="asm/bn86bsdi.o asm/co86bsdi.o:asm/dx86bsdi.o asm/yx86bsdi.o:asm/b
	"hpux-cc", "cc:-DB_ENDIAN -D_HPUX_SOURCE -Aa -Ae +ESlit +O4 -Wl,-a,archive::DES_PTR DES_UNROLL DES_RISC1:asm/pa-risc2.o::",		"hpux-cc", "cc:-DB_ENDIAN -D_HPUX_SOURCE -Aa -Ae +ESlit +O4 -Wl,-a,archive::DES_PTR DES_UNROLL DES_RISC1:asm/pa-risc2.o::",
	"hpux-kr-cc", "cc:-DB_ENDIAN -DNOCONST -DNOPROTO -D_HPUX_SOURCE::DES_PTR DES_UNROLL:asm/pa-risc2.o::",		"hpux-kr-cc", "cc:-DB_ENDIAN -DNOCONST -DNOPROTO -D_HPUX_SOURCE::DES_PTR DES_UNROLL:asm/pa-risc2.o::",
	"hpux-gcc", "gcc:-DB_ENDIAN -O3::BN_LLONG DES_PTR DES_UNROLL DES_RISC1:::",		"hpux-gcc", "gcc:-DB_ENDIAN -O3::BN_LLONG DES_PTR DES_UNROLL DES_RISC1:::",
			# HPUX from www.globus.org
			"hpux11-32bit-cc","cc:+DA2.0 -DB_ENDIAN -D_HPUX_SOURCE -Aa -Ae +ESlit::DES_PTR DES_UNROLL DES_RISC1:::",
			"hpux11-64bit-cc","cc:+DA2.0W -g -D_HPUX_SOURCE -Aa -Ae +ESlit::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
	@@ -138,7 +142,9 @@ $x86_bsdi_asm="asm/bn86bsdi.o asm/co86bsdi.o:asm/dx86bsdi.o asm/yx86bsdi.o:asm/b
	"NetBSD-sparc", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",		"NetBSD-sparc", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
	"NetBSD-m68", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",		"NetBSD-m68", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
	"NetBSD-x86", "gcc:-DTERMIOS -D_ANSI_SOURCE -O3 -fomit-frame-pointer -m486 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:",		"NetBSD-x86", "gcc:-DTERMIOS -D_ANSI_SOURCE -O3 -fomit-frame-pointer -m486 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:",
	"FreeBSD", "gcc:-DTERMIOS -DL_ENDIAN -D_ANSI_SOURCE -fomit-frame-pointer -O3 -m486 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm",		#"FreeBSD", "gcc:-DTERMIOS -DL_ENDIAN -D_ANSI_SOURCE -fomit-frame-pointer -O3 -m486 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm",
			"FreeBSD", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm",
			"FreeBSD-elf", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm",
	#"bsdi-gcc", "gcc:-O3 -ffast-math -DL_ENDIAN -DPERL5 -m486::RSA_LLONG $x86_gc_des $x86_gcc_opts:$x86_bsdi_asm",		#"bsdi-gcc", "gcc:-O3 -ffast-math -DL_ENDIAN -DPERL5 -m486::RSA_LLONG $x86_gc_des $x86_gcc_opts:$x86_bsdi_asm",
	"nextstep", "cc:-O3 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:::",		"nextstep", "cc:-O3 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:::",
	# NCR MP-RAS UNIX ver 02.03.01		# NCR MP-RAS UNIX ver 02.03.01
	@@ -165,6 +171,16 @@ $x86_bsdi_asm="asm/bn86bsdi.o asm/co86bsdi.o:asm/dx86bsdi.o asm/yx86bsdi.o:asm/b
	# (written by Wayne Schroeder <schroede@SDSC.EDU>)		# (written by Wayne Schroeder <schroede@SDSC.EDU>)
	"cray-t90-cc", "cc: -DBIT_FIELD_LIMITS -DTERMIOS::SIXTY_FOUR_BIT_LONG DES_INT:::",		"cray-t90-cc", "cc: -DBIT_FIELD_LIMITS -DTERMIOS::SIXTY_FOUR_BIT_LONG DES_INT:::",

			#
			# Cray T3E (Research Center Juelich, beckman@acl.lanl.gov)
			#
			# The BIT_FIELD_LIMITS define was written for the C90 (it seems). I added
			# another use. Basically, the problem is that the T3E uses some bit fields
			# for some st_addr stuff, and then sizeof and address-of fails
			# I could not use the ams/alpha.o option because the Cray assembler, 'cam'
			# did not like it.
			"cray-t3e", "cc: -DBIT_FIELD_LIMITS -DTERMIOS::SIXTY_FOUR_BIT_LONG DES_INT:::",

	# DGUX, 88100.		# DGUX, 88100.
	"dgux-R3-gcc", "gcc:-O3 -fomit-frame-pointer::RC4_INDEX DES_UNROLL:::",		"dgux-R3-gcc", "gcc:-O3 -fomit-frame-pointer::RC4_INDEX DES_UNROLL:::",
	"dgux-R4-gcc", "gcc:-O3 -fomit-frame-pointer:-lnsl -lsocket:RC4_INDEX:RC4_INDEX DES_UNROLL:::",		"dgux-R4-gcc", "gcc:-O3 -fomit-frame-pointer:-lnsl -lsocket:RC4_INDEX:RC4_INDEX DES_UNROLL:::",

Makefile.ssl

+4 −5

Original line number	Original line	Diff line number	Diff line
	@@ -229,15 +229,14 @@ files: MINFO
	done;		done;

	links:		links:
	/bin/rm -f Makefile;		/bin/rm -f Makefile
	./util/point.sh Makefile.ssl Makefile;		./util/point.sh Makefile.ssl Makefile
	$(TOP)/util/mklink.sh include $(EXHEADER) ;		$(TOP)/util/mklink.sh include $(EXHEADER)
	@for i in $(DIRS) ;\		@for i in $(DIRS) ;\
	do \		do \
	(cd $$i; echo "making links in $$i..."; \		(cd $$i; echo "making links in $$i..."; \
	$(MAKE) SDIRS='${SDIRS}' links ); \		$(MAKE) SDIRS='${SDIRS}' links ); \
	done;		done;
	# @(cd apps; sh ./mklinks)
	@(SSLEAY="`pwd`/apps/ssleay"; export SSLEAY; sh tools/c_rehash certs)		@(SSLEAY="`pwd`/apps/ssleay"; export SSLEAY; sh tools/c_rehash certs)

	dclean:		dclean:

apps/ca.c

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1012,7 +1012,7 @@ bad:
	r->sequence=i;		r->sequence=i;
	}		}

	/* we how have a CRL */		/* we now have a CRL */
	if (verbose) BIO_printf(bio_err,"signing CRL\n");		if (verbose) BIO_printf(bio_err,"signing CRL\n");
	if (md != NULL)		if (md != NULL)
	{		{
	@@ -1024,6 +1024,10 @@ bad:
	}		}
	else		else
	dgst=EVP_md5();		dgst=EVP_md5();
			#ifndef NO_DSA
			if (pkey->type == EVP_PKEY_DSA)
			dgst = EVP_dss1() ;
			#endif
	if (!X509_CRL_sign(crl,pkey,dgst)) goto err;		if (!X509_CRL_sign(crl,pkey,dgst)) goto err;

	PEM_write_bio_X509_CRL(Sout,crl);		PEM_write_bio_X509_CRL(Sout,crl);

apps/progs.h

+0 −6

Original line number	Original line	Diff line number	Diff line
	@@ -65,9 +65,7 @@ typedef struct {
	FUNCTION functions[] = {		FUNCTION functions[] = {
	{FUNC_TYPE_GENERAL,"verify",verify_main},		{FUNC_TYPE_GENERAL,"verify",verify_main},
	{FUNC_TYPE_GENERAL,"asn1parse",asn1parse_main},		{FUNC_TYPE_GENERAL,"asn1parse",asn1parse_main},
	#ifndef NO_RSA
	{FUNC_TYPE_GENERAL,"req",req_main},		{FUNC_TYPE_GENERAL,"req",req_main},
	#endif
	{FUNC_TYPE_GENERAL,"dgst",dgst_main},		{FUNC_TYPE_GENERAL,"dgst",dgst_main},
	#ifndef NO_DH		#ifndef NO_DH
	{FUNC_TYPE_GENERAL,"dh",dh_main},		{FUNC_TYPE_GENERAL,"dh",dh_main},
	@@ -77,9 +75,7 @@ FUNCTION functions[] = {
	{FUNC_TYPE_GENERAL,"gendh",gendh_main},		{FUNC_TYPE_GENERAL,"gendh",gendh_main},
	#endif		#endif
	{FUNC_TYPE_GENERAL,"errstr",errstr_main},		{FUNC_TYPE_GENERAL,"errstr",errstr_main},
	#ifndef NO_RSA
	{FUNC_TYPE_GENERAL,"ca",ca_main},		{FUNC_TYPE_GENERAL,"ca",ca_main},
	#endif
	{FUNC_TYPE_GENERAL,"crl",crl_main},		{FUNC_TYPE_GENERAL,"crl",crl_main},
	#ifndef NO_RSA		#ifndef NO_RSA
	{FUNC_TYPE_GENERAL,"rsa",rsa_main},		{FUNC_TYPE_GENERAL,"rsa",rsa_main},
	@@ -90,9 +86,7 @@ FUNCTION functions[] = {
	#ifndef NO_DSA		#ifndef NO_DSA
	{FUNC_TYPE_GENERAL,"dsaparam",dsaparam_main},		{FUNC_TYPE_GENERAL,"dsaparam",dsaparam_main},
	#endif		#endif
	#ifndef NO_RSA
	{FUNC_TYPE_GENERAL,"x509",x509_main},		{FUNC_TYPE_GENERAL,"x509",x509_main},
	#endif
	#ifndef NO_RSA		#ifndef NO_RSA
	{FUNC_TYPE_GENERAL,"genrsa",genrsa_main},		{FUNC_TYPE_GENERAL,"genrsa",genrsa_main},
	#endif		#endif

Admin message