Commit 2942dde5 authored Nov 11, 2009 by Dr. Stephen Henson

commit missing apps code for reneg fix

parent 0f6e2138

apps/s_cb.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -338,6 +338,9 @@ void MS_CALLBACK apps_ssl_info_callback(const SSL *s, int where, int ret)
		}
		}

		case TLSEXT_TYPE_renegotiate:
		extname = "renegotiate";
		break;

		void MS_CALLBACK msg_cb(int write_p, int version, int content_type, const void buf, size_t len, SSL ssl, void *arg)
		{

apps/s_client.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -343,6 +343,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
		@@ -658,6 +659,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
		@@ -491,6 +491,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
		}

		@@ -1014,6 +1015,8 @@ int MAIN(int argc, char *argv[])
		verify_return_error = 1;
		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;