(almost) recent changes from 0.9.6-stable. (9c8fd367) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

CHANGES

+4 −0

Original line number	Diff line number	Diff line
		@@ -4,6 +4,10 @@

		Changes between 0.9.6g and 0.9.6h [xx XXX xxxx]

		*) Change the default configuration reader to deal with last line not
		being properly terminated.
		[Richard Levitte]

		*) Change X509_NAME_cmp() so it applies the special rules on handling
		DN values that are of type PrintableString, as well as RDNs of type
		emailAddress where the value has the type ia5String.

Configure

+26 −8

Original line number	Diff line number	Diff line
		@@ -132,7 +132,7 @@ my %table=(
		"debug-bodo", "gcc:-DL_ENDIAN -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -DPEDANTIC -DBIO_PAIR_DEBUG -g -m486 -pedantic -Wshadow -Wall::-D_REENTRANT::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}",
		"debug-ulf", "gcc:-DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -DPEDANTIC -g -O2 -m486 -Wall -Werror -Wshadow -pipe::-D_REENTRANT::${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}",
		"debug-steve", "gcc:-DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG_ALL -DPEDANTIC -g -O2 -m486 -pedantic -Wall -Werror -Wshadow -pipe::-D_REENTRANT::${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}",
		"debug-levitte-linux-elf","gcc:-DUSE_ALLOCATING_PRINT -DRL_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DNO_ASM -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -ggdb -g3 -m486 -pedantic -ansi -Wall -Wshadow -Wid-clash-31 -pipe::-D_REENTRANT:-ldl:::::::::::dlfcn",
		"debug-levitte-linux-elf","gcc:-DUSE_ALLOCATING_PRINT -DRL_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DNO_ASM -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -ggdb -g3 -m486 -pedantic -ansi -Wall -Wshadow -Wid-clash-31 -pipe::-D_REENTRANT:-ldl:::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
		"dist", "cc:-O::(unknown):::::",

		# Basic configs that should work on any (32 and less bit) box
		@@ -405,7 +405,7 @@ my %table=(
		"aix-cc", "cc:-O -DAIX -DB_ENDIAN -qmaxmem=16384::(unknown)::BN_LLONG RC4_CHAR:::",
		"aix-gcc", "gcc:-O3 -DAIX -DB_ENDIAN::(unknown)::BN_LLONG RC4_CHAR:::",
		"aix43-cc", "cc:-O -DAIX -DB_ENDIAN -qmaxmem=16384::(unknown)::BN_LLONG RC4_CHAR::::::::::dlfcn:",
		"aix43-gcc", "gcc:-O3 -DAIX -DB_ENDIAN::(unknown)::BN_LLONG RC4_CHAR::::::::::dlfcn:",
		"aix43-gcc", "gcc:-O1 -DAIX -DB_ENDIAN::(unknown)::BN_LLONG RC4_CHAR::::::::::dlfcn:",

		#
		# Cray T90 and similar (SDSC)
		@@ -487,7 +487,7 @@ my %table=(

		# Cygwin
		"Cygwin-pre1.3", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O2 -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32",
		"Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O2 -m486 -Wall::::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32:cygwin-shared:::.dll",
		"Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O2 -march=486 -Wall::::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32:cygwin-shared:::.dll",

		# Ultrix from Bernhard Simon <simon@zid.tuwien.ac.at>
		"ultrix-cc","cc:-std1 -O -Olimit 1000 -DL_ENDIAN::(unknown)::::::",
		@@ -505,12 +505,18 @@ my %table=(
		"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 -fno-common::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::::::::::darwin-shared:-fPIC::.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",

		##### A/UX
		"aux3-gcc","gcc:-O2 -DTERMIO::(unknown):-lbsd:RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::",

		##### 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::::",

		##### VxWorks for various targets
		"vxworks-ppc405","ccppc:-g -msoft-float -mlongcall -DVXWORKS -DCPU=PPC405 -I\$(WIND_BASE)/target/h:::-r:::::",

		##### Compaq Non-Stop Kernel (Tandem)
		"tandem-c89","c89:-Ww -D__TANDEM -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -D_TANDEM_SOURCE -DB_ENDIAN::(unknown)::THIRTY_TWO_BIT:::",

		);

		my @WinTargets=qw(VC-NT VC-WIN32 VC-WIN16 VC-W31-16 VC-W31-32 VC-MSDOS BC-32
		@@ -587,6 +593,7 @@ my $libs;
		my $target;
		my $options;
		my $symlink;
		my $make_depend=0;

		my @argvcopy=@ARGV;
		my $argvstring="";
		@@ -1210,11 +1217,13 @@ if($IsWindows) {
		EOF
		close(OUT);
		} else {
		(system "make -f Makefile.ssl PERL=\'$perl\' links") == 0 or exit $?
		if $symlink;
		### (system 'make depend') == 0 or exit $? if $depflags ne "";
		# Run "make depend" manually if you want to be able to delete
		# the source code files of ciphers you left out.
		my $make_command = "make -f Makefile.ssl PERL=\'$perl\'";
		my $make_targets = "";
		$make_targets .= " links" if $symlink;
		$make_targets .= " depend" if $depflags ne "" && $make_depend;
		$make_targets .= " gentests" if $symlink;
		(system $make_command.$make_targets) == 0 or exit $?
		if $make_targets ne "";
		if ( $perl =~ m@^/@) {
		&dofile("tools/c_rehash",$perl,'^#!/', '#!%s','^my \$dir;$', 'my $dir = "' . $openssldir . '";');
		&dofile("apps/der_chop",$perl,'^#!/', '#!%s');
		@@ -1225,6 +1234,15 @@ EOF
		&dofile("apps/der_chop",'/usr/local/bin/perl','^#!/', '#!%s');
		&dofile("apps/CA.pl",'/usr/local/bin/perl','^#!/', '#!%s');
		}
		if ($depflags ne "" && !$make_depend) {
		print <<EOF;

		Since you've disabled at least one algorithm, you need to do the following
		before building:

		make depend
		EOF
		}
		}

		print <<EOF;

FAQ

+14 −0

Original line number	Diff line number	Diff line
		@@ -9,6 +9,7 @@ OpenSSL - Frequently Asked Questions
		* Where can I get a compiled version of OpenSSL?
		* Why aren't tools like 'autoconf' and 'libtool' used?
		* What is an 'engine' version?
		* How do I check the authenticity of the OpenSSL distribution?

		[LEGAL] Legal questions

		@@ -133,6 +134,19 @@ hardware. This was realized in a special release '0.9.6-engine'. With
		version 0.9.7 (not yet released) the changes were merged into the main
		development line, so that the special release is no longer necessary.

		* How do I check the authenticity of the OpenSSL distribution?

		We provide MD5 digests and ASC signatures of each tarball.
		Use MD5 to check that a tarball from a mirror site is identical:

		md5sum TARBALL \| awk '{print $1;}' \| cmp - TARBALL.md5

		You can check authenticity using pgp or gpg. You need the OpenSSL team
		member public key used to sign it (download it from a key server). Then
		just do:

		pgp TARBALL.asc

		[LEGAL] =======================================================================

		* Do I need patent licenses to use OpenSSL?

MacOS/GetHTTPS.src/MacSocket.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -1287,7 +1287,7 @@ EXITPOINT:

		// Send some bytes

		int MacSocket_send(const int inSocketNum,void *inBuff,int inBuffLength)
		int MacSocket_send(const int inSocketNum,const void *inBuff,int inBuffLength)
		{
		OSErr errCode = noErr;
		int bytesSent = 0;

MacOS/GetHTTPS.src/MacSocket.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -62,7 +62,7 @@ int MacSocket_recv(const int inSocketNum,void *outBuff,int outBuffLength,const B

		// Call this to send data on a socket

		int MacSocket_send(const int inSocketNum,void *inBuff,int inBuffLength);
		int MacSocket_send(const int inSocketNum,const void *inBuff,int inBuffLength);


		// If zero bytes were read in a call to MacSocket_recv(), it may be that the remote end has done a half-close