First cut of renegotiation extension. (c2b78c31) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

CHANGES

+21 −8

Original line number	Diff line number	Diff line
		@@ -2,14 +2,17 @@
		OpenSSL CHANGES
		_______________

		Changes between 0.9.8k and 0.9.8l [xx XXX xxxx]

		*) Disable renegotiation completely - this fixes a severe security
		problem at the cost of breaking all renegotiation. Renegotiation
		can be re-enabled by setting
		OPENSSL_ENABLE_UNSAFE_LEGACY_SESSION_RENEGOTATION at
		compile-time. This is really not recommended.
		[Ben Laurie]
		Changes between 0.9.8l and 0.9.8m [xx XXX xxxx]

		*) Implement
		https://svn.resiprocate.org/rep/ietf-drafts/ekr/draft-rescorla-tls-renegotiate.txt. Re-enable
		renegotiation but require the extension as needed. Unfortunately,
		SSL3_FLAGS_ALLOW_UNSAFE_LEGACY_RENEGOTIATION turns out to be a
		bad idea. It has been replaced by
		SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION which can be set with
		SSL_CTX_set_options(). This is really not recommended unless you
		know what you are doing.
		[Eric Rescorla <ekr@networkresonance.com> and Ben Laurie]

		*) Fixes to stateless session resumption handling. Use initial_ctx when
		issuing and attempting to decrypt tickets in case it has changed during
		@@ -95,6 +98,16 @@
		) Add 2.5.4. OIDs
		[Ilya O. <vrghost@gmail.com>]

		Changes between 0.9.8k and 0.9.8l [5 Nov 2009]

		*) Disable renegotiation completely - this fixes a severe security
		problem (CVE-2009-3555) at the cost of breaking all
		renegotiation. Renegotiation can be re-enabled by setting
		SSL3_FLAGS_ALLOW_UNSAFE_LEGACY_RENEGOTIATION in s3->flags at
		run-time. This is really not recommended unless you know what
		you're doing.
		[Ben Laurie]

		Changes between 0.9.8j and 0.9.8k [25 Mar 2009]

		*) Don't set val to NULL when freeing up structures, it is freed up by

Configure

+2 −1

Original line number	Diff line number	Diff line
		@@ -161,7 +161,8 @@ my %table=(
		"debug-ben", "gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -O2 -pedantic -Wall -Wshadow -Werror -pipe::(unknown):::::bn86-elf.o co86-elf.o",
		"debug-ben-openbsd","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DOPENSSL_OPENBSD_DEV_CRYPTO -DOPENSSL_NO_ASM -O2 -pedantic -Wall -Wshadow -Werror -pipe::(unknown)::::",
		"debug-ben-openbsd-debug","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DOPENSSL_OPENBSD_DEV_CRYPTO -DOPENSSL_NO_ASM -g3 -O2 -pedantic -Wall -Wshadow -Werror -pipe::(unknown)::::",
		"debug-ben-debug", "gcc:$gcc_devteam_warn -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DDEBUG_SAFESTACK -g3 -O2 -pipe::(unknown)::::::",
		"debug-ben-debug", "gcc:$gcc_devteam_warn -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DDEBUG_SAFESTACK -ggdb3 -O2 -pipe::(unknown)::::::",
		"debug-ben-debug-noopt", "gcc:$gcc_devteam_warn -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DDEBUG_SAFESTACK -ggdb3 -pipe::(unknown)::::::",
		"debug-ben-strict", "gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DCONST_STRICT -O2 -Wall -Wshadow -Werror -Wpointer-arith -Wcast-qual -Wwrite-strings -pipe::(unknown)::::::",
		"debug-rse","cc:-DTERMIOS -DL_ENDIAN -pipe -O -g -ggdb3 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}",
		"debug-bodo", "gcc:-DL_ENDIAN -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBIO_PAIR_DEBUG -DPEDANTIC -g -march=i486 -pedantic -Wshadow -Wall -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe::-D_REENTRANT:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}",

apps/s_cb.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -638,6 +638,9 @@ void MS_CALLBACK tlsext_cb(SSL *s, int client_server, int type,
		extname = "server ticket";
		break;

		case TLSEXT_TYPE_renegotiate:
		extname = "renegotiate";
		break;

		default:
		extname = "unknown";

apps/s_client.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -249,6 +249,7 @@ static void sc_usage(void)
		BIO_printf(bio_err," -status - request certificate status from server\n");
		BIO_printf(bio_err," -no_ticket - disable use of RFC4507bis session tickets\n");
		#endif
		BIO_printf(bio_err," -legacy_renegotiation - enable use of legacy renegotiation (dangerous)\n");
		}

		#ifndef OPENSSL_NO_TLSEXT
		@@ -536,6 +537,8 @@ int MAIN(int argc, char **argv)
		#endif
		else if (strcmp(*argv,"-serverpref") == 0)
		off\|=SSL_OP_CIPHER_SERVER_PREFERENCE;
		else if (strcmp(*argv,"-legacy_renegotiation") == 0)
		off\|=SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION;
		else if (strcmp(*argv,"-cipher") == 0)
		{
		if (--argc < 1) goto bad;

apps/s_server.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -404,6 +404,7 @@ static void sv_usage(void)
		BIO_printf(bio_err," not specified (default is %s)\n",TEST_CERT2);
		BIO_printf(bio_err," -tlsextdebug - hex dump of all TLS extensions received\n");
		BIO_printf(bio_err," -no_ticket - disable use of RFC4507bis session tickets\n");
		BIO_printf(bio_err," -legacy_renegotiation - enable use of legacy renegotiation (dangerous)\n");
		#endif
		}

		@@ -923,6 +924,8 @@ int MAIN(int argc, char *argv[])
		}
		else if (strcmp(*argv,"-serverpref") == 0)
		{ off\|=SSL_OP_CIPHER_SERVER_PREFERENCE; }
		else if (strcmp(*argv,"-legacy_renegotiation") == 0)
		off\|=SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION;
		else if (strcmp(*argv,"-cipher") == 0)
		{
		if (--argc < 1) goto bad;