Attachment #69860 for bug #108046

Lines 4-9 Link Here

(-)CHANGES (+13 lines)
4		4
5	Changes between 0.9.7g and 0.9.7h [XX xxx XXXX]	5	Changes between 0.9.7g and 0.9.7h [XX xxx XXXX]
6		6
		7	*) Remove the functionality of SSL_OP_MSIE_SSLV2_RSA_PADDING
		8	(part of SSL_OP_ALL). This option used to disable the
		9	countermeasure against man-in-the-middle protocol-version
		10	rollback in the SSL 2.0 server implementation, which is a bad
		11	idea.
		12
		13	[Bodo Moeller; problem pointed out by Yutaka Oiwa (Research Center
		14	for Information Security, National Institute of Advanced Industrial
		15	Science and Technology [AIST], Japan)]
		16
7	*) Minimal support for X9.31 signatures and PSS padding modes. This is	17	*) Minimal support for X9.31 signatures and PSS padding modes. This is
8	mainly for FIPS compliance and not fully integrated at this stage.	18	mainly for FIPS compliance and not fully integrated at this stage.
9	[Steve Henson]	19	[Steve Henson]
Lines 53-58 Link Here
53		63
54	Changes between 0.9.7f and 0.9.7g [11 Apr 2005]	64	Changes between 0.9.7f and 0.9.7g [11 Apr 2005]
55		65
		66	[NB: OpenSSL 0.9.7h and later 0.9.7 patch levels were released after
		67	OpenSSL 0.9.8.]
		68
56	*) Fixes for newer kerberos headers. NB: the casts are needed because	69	*) Fixes for newer kerberos headers. NB: the casts are needed because
57	the 'length' field is signed on one version and unsigned on another	70	the 'length' field is signed on one version and unsigned on another
58	with no (?) obvious way to tell the difference, without these VC++	71	with no (?) obvious way to tell the difference, without these VC++

Lines 86-92 Link Here

(-)doc/ssl/SSL_CTX_set_options.pod (-1 / +1 lines)
86		86
87	=item SSL_OP_MSIE_SSLV2_RSA_PADDING	87	=item SSL_OP_MSIE_SSLV2_RSA_PADDING
88		88
89	...	89	As of OpenSSL 0.9.7h and 0.9.8a, this option has no effect.
90		90
91	=item SSL_OP_SSLEAY_080_CLIENT_DH_BUG	91	=item SSL_OP_SSLEAY_080_CLIENT_DH_BUG
92		92




	int n=0,j;
	int type=0;
	int v[2];
#ifndef OPENSSL_NO_RSA
	int use_sslv2_strong=0;
#endif

	if (s->state ==	SSL23_ST_SR_CLNT_HELLO_A)
		{

			}

		s->state=SSL2_ST_GET_CLIENT_HELLO_A;
		if (s->options & SSL_OP_NO_TLSv1 && s->options & SSL_OP_NO_SSLv3)
			use_sslv2_strong ||
			(s->options & SSL_OP_NO_TLSv1 && s->options & SSL_OP_NO_SSLv3))
			s->s2->ssl2_rollback=0;
		else
			/* reject SSL 2.0 session if client supports SSL 3.0 or TLS 1.0

Lines 467-473 Link Here

(-)ssl/ssl.h (-1 / +1 lines)
467	#define SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG 0x00000008L	467	#define SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG 0x00000008L
468	#define SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG 0x00000010L	468	#define SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG 0x00000010L
469	#define SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER 0x00000020L	469	#define SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER 0x00000020L
470	#define SSL_OP_MSIE_SSLV2_RSA_PADDING 0x00000040L	470	#define SSL_OP_MSIE_SSLV2_RSA_PADDING 0x00000040L /* no effect since 0.9.7h and 0.9.8b */
471	#define SSL_OP_SSLEAY_080_CLIENT_DH_BUG 0x00000080L	471	#define SSL_OP_SSLEAY_080_CLIENT_DH_BUG 0x00000080L
472	#define SSL_OP_TLS_D5_BUG 0x00000100L	472	#define SSL_OP_TLS_D5_BUG 0x00000100L
473	#define SSL_OP_TLS_BLOCK_PADDING_BUG 0x00000200L	473	#define SSL_OP_TLS_BLOCK_PADDING_BUG 0x00000200L

Return to bug 108046

Lines 268-276 Link Here

(-)ssl/s23_srvr.c (-6 / +1 lines)
268	int n=0,j;	268	int n=0,j;
269	int type=0;	269	int type=0;
270	int v[2];	270	int v[2];
271	#ifndef OPENSSL_NO_RSA
272	int use_sslv2_strong=0;
273	#endif
274		271
275	if (s->state == SSL23_ST_SR_CLNT_HELLO_A)	272	if (s->state == SSL23_ST_SR_CLNT_HELLO_A)
276	{	273	{
Lines 528-536 Link Here
528	}	525	}
529		526
530	s->state=SSL2_ST_GET_CLIENT_HELLO_A;	527	s->state=SSL2_ST_GET_CLIENT_HELLO_A;
531	if ((s->options & SSL_OP_MSIE_SSLV2_RSA_PADDING) \|\|	528	if (s->options & SSL_OP_NO_TLSv1 && s->options & SSL_OP_NO_SSLv3)
532	use_sslv2_strong \|\|
533	(s->options & SSL_OP_NO_TLSv1 && s->options & SSL_OP_NO_SSLv3))
534	s->s2->ssl2_rollback=0;	529	s->s2->ssl2_rollback=0;
535	else	530	else
536	/* reject SSL 2.0 session if client supports SSL 3.0 or TLS 1.0	531	/* reject SSL 2.0 session if client supports SSL 3.0 or TLS 1.0