Commit 06ab81f9 authored by Ben Laurie's avatar Ben Laurie
Browse files

Add support for new TLS export ciphersuites.

parent abf87f79

CHANGES

+6 −0
Original line number Diff line number Diff line
@@ -5,6 +5,12 @@ 


 Changes between 0.9.1c and 0.9.2



  *) Add support for new TLS ciphersuites, TLS_RSA_EXPORT56_WITH_RC4_56_MD5,

     TLS_RSA_EXPORT56_WITH_RC2_CBC_56_MD5 and

     TLS_RSA_EXPORT56_WITH_DES_CBC_SHA, as specified in "56-bit Export Cipher

     Suites For TLS", draft-ietf-tls-56-bit-ciphersuites-00.txt.

     [Ben Laurie]



  *) Add preliminary config info for new extension code.

     [Steve Henson]

ssl/s23_srvr.c

+1 −1
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ SSL *s; 
						for (j=0; j<sk_num(sk); j++)

							{

							c=(SSL_CIPHER *)sk_value(sk,j);

							if (!(c->algorithms & SSL_EXP))

							if (!SSL_C_IS_EXPORT(c))

								{

								if ((c->id>>24L) == 2L)

									ne2=1;

ssl/s2_clnt.c

+1 −1
Original line number Diff line number Diff line
@@ -568,7 +568,7 @@ SSL *s; 


		if (sess->cipher->algorithm2 & SSL2_CF_8_BYTE_ENC)

			enc=8;

		else if (sess->cipher->algorithms & SSL_EXP)

		else if (SSL_C_IS_EXPORT(sess->cipher))

			enc=5;

		else

			enc=i;

ssl/s2_lib.c

+8 −8
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ SSL_CIPHER ssl2_ciphers[]={ 
	1,

	SSL2_TXT_NULL_WITH_MD5,

	SSL2_CK_NULL_WITH_MD5,

	SSL_kRSA|SSL_aRSA|SSL_eNULL|SSL_MD5|SSL_EXP|SSL_SSLV2,

	SSL_kRSA|SSL_aRSA|SSL_eNULL|SSL_MD5|SSL_EXP40|SSL_SSLV2,

	0,

	SSL_ALL_CIPHERS,

	},
@@ -88,7 +88,7 @@ SSL_CIPHER ssl2_ciphers[]={ 
	1,

	SSL2_TXT_RC4_128_EXPORT40_WITH_MD5,

	SSL2_CK_RC4_128_EXPORT40_WITH_MD5,

	SSL_kRSA|SSL_aRSA|SSL_RC4|SSL_MD5|SSL_EXP|SSL_SSLV2,

	SSL_kRSA|SSL_aRSA|SSL_RC4|SSL_MD5|SSL_EXP40|SSL_SSLV2,

	SSL2_CF_5_BYTE_ENC,

	SSL_ALL_CIPHERS,

	},
@@ -97,7 +97,7 @@ SSL_CIPHER ssl2_ciphers[]={ 
	1,

	SSL2_TXT_RC4_128_WITH_MD5,

	SSL2_CK_RC4_128_WITH_MD5,

	SSL_kRSA|SSL_aRSA|SSL_RC4|SSL_MD5|SSL_NOT_EXP|SSL_SSLV2|SSL_MEDIUM,

	SSL_kRSA|SSL_aRSA|SSL_RC4|SSL_MD5|_SSL_NOT_EXP|SSL_SSLV2|SSL_MEDIUM,

	0,

	SSL_ALL_CIPHERS,

	},
@@ -106,7 +106,7 @@ SSL_CIPHER ssl2_ciphers[]={ 
	1,

	SSL2_TXT_RC2_128_CBC_EXPORT40_WITH_MD5,

	SSL2_CK_RC2_128_CBC_EXPORT40_WITH_MD5,

	SSL_kRSA|SSL_aRSA|SSL_RC2|SSL_MD5|SSL_EXP|SSL_SSLV2,

	SSL_kRSA|SSL_aRSA|SSL_RC2|SSL_MD5|SSL_EXP40|SSL_SSLV2,

	SSL2_CF_5_BYTE_ENC,

	SSL_ALL_CIPHERS,

	},
@@ -115,7 +115,7 @@ SSL_CIPHER ssl2_ciphers[]={ 
	1,

	SSL2_TXT_RC2_128_CBC_WITH_MD5,

	SSL2_CK_RC2_128_CBC_WITH_MD5,

	SSL_kRSA|SSL_aRSA|SSL_RC2|SSL_MD5|SSL_NOT_EXP|SSL_SSLV2|SSL_MEDIUM,

	SSL_kRSA|SSL_aRSA|SSL_RC2|SSL_MD5|_SSL_NOT_EXP|SSL_SSLV2|SSL_MEDIUM,

	0,

	SSL_ALL_CIPHERS,

	},
@@ -124,7 +124,7 @@ SSL_CIPHER ssl2_ciphers[]={ 
	1,

	SSL2_TXT_IDEA_128_CBC_WITH_MD5,

	SSL2_CK_IDEA_128_CBC_WITH_MD5,

	SSL_kRSA|SSL_aRSA|SSL_IDEA|SSL_MD5|SSL_NOT_EXP|SSL_SSLV2|SSL_MEDIUM,

	SSL_kRSA|SSL_aRSA|SSL_IDEA|SSL_MD5|_SSL_NOT_EXP|SSL_SSLV2|SSL_MEDIUM,

	0,

	SSL_ALL_CIPHERS,

	},
@@ -133,7 +133,7 @@ SSL_CIPHER ssl2_ciphers[]={ 
	1,

	SSL2_TXT_DES_64_CBC_WITH_MD5,

	SSL2_CK_DES_64_CBC_WITH_MD5,

	SSL_kRSA|SSL_aRSA|SSL_DES|SSL_MD5|SSL_NOT_EXP|SSL_SSLV2|SSL_LOW,

	SSL_kRSA|SSL_aRSA|SSL_DES|SSL_MD5|_SSL_NOT_EXP|SSL_SSLV2|SSL_LOW,

	0,

	SSL_ALL_CIPHERS,

	},
@@ -142,7 +142,7 @@ SSL_CIPHER ssl2_ciphers[]={ 
	1,

	SSL2_TXT_DES_192_EDE3_CBC_WITH_MD5,

	SSL2_CK_DES_192_EDE3_CBC_WITH_MD5,

	SSL_kRSA|SSL_aRSA|SSL_3DES|SSL_MD5|SSL_NOT_EXP|SSL_SSLV2|SSL_HIGH,

	SSL_kRSA|SSL_aRSA|SSL_3DES|SSL_MD5|_SSL_NOT_EXP|SSL_SSLV2|SSL_HIGH,

	0,

	SSL_ALL_CIPHERS,

	},

ssl/s2_srvr.c

+1 −1
Original line number Diff line number Diff line
@@ -401,7 +401,7 @@ SSL *s; 
		&(p[s->s2->tmp.clear]),&(p[s->s2->tmp.clear]),

		(s->s2->ssl2_rollback)?RSA_SSLV23_PADDING:RSA_PKCS1_PADDING);



	export=(s->session->cipher->algorithms & SSL_EXP)?1:0;

	export=SSL_C_IS_EXPORT(s->session->cipher);

	

	if (!ssl_cipher_get_evp(s->session,&c,&md,NULL))

		{