Commit a040ea82 authored by Ben Laurie's avatar Ben Laurie
Browse files

Undo a couple of kludges.

parent 06ab81f9

ssl/s2_lib.c

+5 −5
Original line number Diff line number Diff line
@@ -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,

	},
@@ -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/s3_lib.c

+21 −21
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ SSL_CIPHER ssl3_ciphers[]={ 
	1,

	SSL3_TXT_RSA_NULL_MD5,

	SSL3_CK_RSA_NULL_MD5,

	SSL_kRSA|SSL_aRSA|SSL_eNULL |SSL_MD5|_SSL_NOT_EXP|SSL_SSLV3,

	SSL_kRSA|SSL_aRSA|SSL_eNULL |SSL_MD5|SSL_NOT_EXP|SSL_SSLV3,

	0,

	SSL_ALL_CIPHERS,

	},
@@ -86,7 +86,7 @@ SSL_CIPHER ssl3_ciphers[]={ 
	1,

	SSL3_TXT_RSA_NULL_SHA,

	SSL3_CK_RSA_NULL_SHA,

	SSL_kRSA|SSL_aRSA|SSL_eNULL |SSL_SHA1|_SSL_NOT_EXP|SSL_SSLV3,

	SSL_kRSA|SSL_aRSA|SSL_eNULL |SSL_SHA1|SSL_NOT_EXP|SSL_SSLV3,

	0,

	SSL_ALL_CIPHERS,

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

	SSL3_TXT_ADH_RC4_128_MD5,

	SSL3_CK_ADH_RC4_128_MD5,

	SSL_kEDH |SSL_aNULL|SSL_RC4  |SSL_MD5|_SSL_NOT_EXP|SSL_SSLV3,

	SSL_kEDH |SSL_aNULL|SSL_RC4  |SSL_MD5|SSL_NOT_EXP|SSL_SSLV3,

	0,

	SSL_ALL_CIPHERS,

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

	SSL3_TXT_ADH_DES_64_CBC_SHA,

	SSL3_CK_ADH_DES_64_CBC_SHA,

	SSL_kEDH |SSL_aNULL|SSL_DES  |SSL_SHA1|_SSL_NOT_EXP|SSL_SSLV3,

	SSL_kEDH |SSL_aNULL|SSL_DES  |SSL_SHA1|SSL_NOT_EXP|SSL_SSLV3,

	0,

	SSL_ALL_CIPHERS,

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

	SSL3_TXT_ADH_DES_192_CBC_SHA,

	SSL3_CK_ADH_DES_192_CBC_SHA,

	SSL_kEDH |SSL_aNULL|SSL_3DES |SSL_SHA1|_SSL_NOT_EXP|SSL_SSLV3,

	SSL_kEDH |SSL_aNULL|SSL_3DES |SSL_SHA1|SSL_NOT_EXP|SSL_SSLV3,

	0,

	SSL_ALL_CIPHERS,

	},
@@ -153,7 +153,7 @@ SSL_CIPHER ssl3_ciphers[]={ 
	1,

	SSL3_TXT_RSA_RC4_128_MD5,

	SSL3_CK_RSA_RC4_128_MD5,

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

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

	0,

	SSL_ALL_CIPHERS,

	},
@@ -162,7 +162,7 @@ SSL_CIPHER ssl3_ciphers[]={ 
	1,

	SSL3_TXT_RSA_RC4_128_SHA,

	SSL3_CK_RSA_RC4_128_SHA,

	SSL_kRSA|SSL_aRSA|SSL_RC4  |SSL_SHA1|_SSL_NOT_EXP|SSL_SSLV3|SSL_MEDIUM,

	SSL_kRSA|SSL_aRSA|SSL_RC4  |SSL_SHA1|SSL_NOT_EXP|SSL_SSLV3|SSL_MEDIUM,

	0,

	SSL_ALL_CIPHERS,

	},
@@ -180,7 +180,7 @@ SSL_CIPHER ssl3_ciphers[]={ 
	1,

	SSL3_TXT_RSA_IDEA_128_SHA,

	SSL3_CK_RSA_IDEA_128_SHA,

	SSL_kRSA|SSL_aRSA|SSL_IDEA |SSL_SHA1|_SSL_NOT_EXP|SSL_SSLV3|SSL_MEDIUM,

	SSL_kRSA|SSL_aRSA|SSL_IDEA |SSL_SHA1|SSL_NOT_EXP|SSL_SSLV3|SSL_MEDIUM,

	0,

	SSL_ALL_CIPHERS,

	},
@@ -198,7 +198,7 @@ SSL_CIPHER ssl3_ciphers[]={ 
	1,

	SSL3_TXT_RSA_DES_64_CBC_SHA,

	SSL3_CK_RSA_DES_64_CBC_SHA,

	SSL_kRSA|SSL_aRSA|SSL_DES  |SSL_SHA1|_SSL_NOT_EXP|SSL_SSLV3|SSL_LOW,

	SSL_kRSA|SSL_aRSA|SSL_DES  |SSL_SHA1|SSL_NOT_EXP|SSL_SSLV3|SSL_LOW,

	0,

	SSL_ALL_CIPHERS,

	},
@@ -207,7 +207,7 @@ SSL_CIPHER ssl3_ciphers[]={ 
	1,

	SSL3_TXT_RSA_DES_192_CBC3_SHA,

	SSL3_CK_RSA_DES_192_CBC3_SHA,

	SSL_kRSA|SSL_aRSA|SSL_3DES |SSL_SHA1|_SSL_NOT_EXP|SSL_SSLV3|SSL_HIGH,

	SSL_kRSA|SSL_aRSA|SSL_3DES |SSL_SHA1|SSL_NOT_EXP|SSL_SSLV3|SSL_HIGH,

	0,

	SSL_ALL_CIPHERS,

	},
@@ -227,7 +227,7 @@ SSL_CIPHER ssl3_ciphers[]={ 
	0,

	SSL3_TXT_DH_DSS_DES_64_CBC_SHA,

	SSL3_CK_DH_DSS_DES_64_CBC_SHA,

	SSL_kDHd |SSL_aDH|SSL_DES  |SSL_SHA1|_SSL_NOT_EXP|SSL_SSLV3|SSL_LOW,

	SSL_kDHd |SSL_aDH|SSL_DES  |SSL_SHA1|SSL_NOT_EXP|SSL_SSLV3|SSL_LOW,

	0,

	SSL_ALL_CIPHERS,

	},
@@ -236,7 +236,7 @@ SSL_CIPHER ssl3_ciphers[]={ 
	0,

	SSL3_TXT_DH_DSS_DES_192_CBC3_SHA,

	SSL3_CK_DH_DSS_DES_192_CBC3_SHA,

	SSL_kDHd |SSL_aDH|SSL_3DES |SSL_SHA1|_SSL_NOT_EXP|SSL_SSLV3|SSL_HIGH,

	SSL_kDHd |SSL_aDH|SSL_3DES |SSL_SHA1|SSL_NOT_EXP|SSL_SSLV3|SSL_HIGH,

	0,

	SSL_ALL_CIPHERS,

	},
@@ -254,7 +254,7 @@ SSL_CIPHER ssl3_ciphers[]={ 
	0,

	SSL3_TXT_DH_RSA_DES_64_CBC_SHA,

	SSL3_CK_DH_RSA_DES_64_CBC_SHA,

	SSL_kDHr |SSL_aDH|SSL_DES  |SSL_SHA1|_SSL_NOT_EXP|SSL_SSLV3|SSL_LOW,

	SSL_kDHr |SSL_aDH|SSL_DES  |SSL_SHA1|SSL_NOT_EXP|SSL_SSLV3|SSL_LOW,

	0,

	SSL_ALL_CIPHERS,

	},
@@ -263,7 +263,7 @@ SSL_CIPHER ssl3_ciphers[]={ 
	0,

	SSL3_TXT_DH_RSA_DES_192_CBC3_SHA,

	SSL3_CK_DH_RSA_DES_192_CBC3_SHA,

	SSL_kDHr |SSL_aDH|SSL_3DES |SSL_SHA1|_SSL_NOT_EXP|SSL_SSLV3|SSL_HIGH,

	SSL_kDHr |SSL_aDH|SSL_3DES |SSL_SHA1|SSL_NOT_EXP|SSL_SSLV3|SSL_HIGH,

	0,

	SSL_ALL_CIPHERS,

	},
@@ -283,7 +283,7 @@ SSL_CIPHER ssl3_ciphers[]={ 
	1,

	SSL3_TXT_EDH_DSS_DES_64_CBC_SHA,

	SSL3_CK_EDH_DSS_DES_64_CBC_SHA,

	SSL_kEDH|SSL_aDSS|SSL_DES  |SSL_SHA1|_SSL_NOT_EXP|SSL_SSLV3|SSL_LOW,

	SSL_kEDH|SSL_aDSS|SSL_DES  |SSL_SHA1|SSL_NOT_EXP|SSL_SSLV3|SSL_LOW,

	0,

	SSL_ALL_CIPHERS,

	},
@@ -292,7 +292,7 @@ SSL_CIPHER ssl3_ciphers[]={ 
	1,

	SSL3_TXT_EDH_DSS_DES_192_CBC3_SHA,

	SSL3_CK_EDH_DSS_DES_192_CBC3_SHA,

	SSL_kEDH|SSL_aDSS|SSL_3DES |SSL_SHA1|_SSL_NOT_EXP|SSL_SSLV3|SSL_HIGH,

	SSL_kEDH|SSL_aDSS|SSL_3DES |SSL_SHA1|SSL_NOT_EXP|SSL_SSLV3|SSL_HIGH,

	0,

	SSL_ALL_CIPHERS,

	},
@@ -310,7 +310,7 @@ SSL_CIPHER ssl3_ciphers[]={ 
	1,

	SSL3_TXT_EDH_RSA_DES_64_CBC_SHA,

	SSL3_CK_EDH_RSA_DES_64_CBC_SHA,

	SSL_kEDH|SSL_aRSA|SSL_DES  |SSL_SHA1|_SSL_NOT_EXP|SSL_SSLV3|SSL_LOW,

	SSL_kEDH|SSL_aRSA|SSL_DES  |SSL_SHA1|SSL_NOT_EXP|SSL_SSLV3|SSL_LOW,

	0,

	SSL_ALL_CIPHERS,

	},
@@ -319,7 +319,7 @@ SSL_CIPHER ssl3_ciphers[]={ 
	1,

	SSL3_TXT_EDH_RSA_DES_192_CBC3_SHA,

	SSL3_CK_EDH_RSA_DES_192_CBC3_SHA,

	SSL_kEDH|SSL_aRSA|SSL_3DES |SSL_SHA1|_SSL_NOT_EXP|SSL_SSLV3|SSL_HIGH,

	SSL_kEDH|SSL_aRSA|SSL_3DES |SSL_SHA1|SSL_NOT_EXP|SSL_SSLV3|SSL_HIGH,

	0,

	SSL_ALL_CIPHERS,

	},
@@ -330,7 +330,7 @@ SSL_CIPHER ssl3_ciphers[]={ 
	0,

	SSL3_TXT_FZA_DMS_NULL_SHA,

	SSL3_CK_FZA_DMS_NULL_SHA,

	SSL_kFZA|SSL_aFZA |SSL_eNULL |SSL_SHA1|_SSL_NOT_EXP|SSL_SSLV3,

	SSL_kFZA|SSL_aFZA |SSL_eNULL |SSL_SHA1|SSL_NOT_EXP|SSL_SSLV3,

	0,

	SSL_ALL_CIPHERS,

	},
@@ -340,7 +340,7 @@ SSL_CIPHER ssl3_ciphers[]={ 
	0,

	SSL3_TXT_FZA_DMS_FZA_SHA,

	SSL3_CK_FZA_DMS_FZA_SHA,

	SSL_kFZA|SSL_aFZA |SSL_eFZA |SSL_SHA1|_SSL_NOT_EXP|SSL_SSLV3,

	SSL_kFZA|SSL_aFZA |SSL_eFZA |SSL_SHA1|SSL_NOT_EXP|SSL_SSLV3,

	0,

	SSL_ALL_CIPHERS,

	},
@@ -350,7 +350,7 @@ SSL_CIPHER ssl3_ciphers[]={ 
	0,

	SSL3_TXT_FZA_DMS_RC4_SHA,

	SSL3_CK_FZA_DMS_RC4_SHA,

	SSL_kFZA|SSL_aFZA |SSL_RC4  |SSL_SHA1|_SSL_NOT_EXP|SSL_SSLV3,

	SSL_kFZA|SSL_aFZA |SSL_RC4  |SSL_SHA1|SSL_NOT_EXP|SSL_SSLV3,

	0,

	SSL_ALL_CIPHERS,

	},

ssl/ssl.h

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ extern "C" { 
#define SSL_TXT_SHA		"SHA"

#define SSL_TXT_EXP40		"EXP"

#define SSL_TXT_EXPORT		"EXPORT"

#define SSL_TXT_EXP56		"EXP56"

#define SSL_TXT_EXP56		"EXPORT56"

#define SSL_TXT_SSLV2		"SSLv2"

#define SSL_TXT_SSLV3		"SSLv3"

#define SSL_TXT_TLSV1		"TLSv1"

ssl/ssl_ciph.c

+3 −3
Original line number Diff line number Diff line
@@ -144,9 +144,9 @@ static SSL_CIPHER cipher_aliases[]={ 
	{0,SSL_TXT_ADH,	0,SSL_ADH,   0,SSL_AUTH_MASK|SSL_MKEY_MASK},

	{0,SSL_TXT_FZA,	0,SSL_FZA,   0,SSL_AUTH_MASK|SSL_MKEY_MASK|SSL_ENC_MASK},



	{0,SSL_TXT_EXP40, 0,SSL_EXP40, 0,_SSL_EXP_MASK},

	{0,SSL_TXT_EXPORT,0,SSL_EXP40, 0,_SSL_EXP_MASK},

	{0,SSL_TXT_EXP56, 0,SSL_EXP56, 0,_SSL_EXP_MASK},

	{0,SSL_TXT_EXP40, 0,SSL_EXP40, 0,SSL_EXP_MASK},

	{0,SSL_TXT_EXPORT,0,SSL_EXP40, 0,SSL_EXP_MASK},

	{0,SSL_TXT_EXP56, 0,SSL_EXP56, 0,SSL_EXP_MASK},

	{0,SSL_TXT_SSLV2, 0,SSL_SSLV2, 0,SSL_SSL_MASK},

	{0,SSL_TXT_SSLV3, 0,SSL_SSLV3, 0,SSL_SSL_MASK},

	{0,SSL_TXT_TLSV1, 0,SSL_TLSV1, 0,SSL_SSL_MASK},

ssl/ssl_locl.h

+5 −5
Original line number Diff line number Diff line
@@ -191,13 +191,13 @@ 
#define SSL_SHA1		0x00040000L

#define SSL_SHA			(SSL_SHA1)



#define _SSL_EXP_MASK		0x00300000L

#define SSL_EXP_MASK		0x00300000L

#define SSL_EXP40		0x00100000L

#define _SSL_NOT_EXP		0x00200000L

#define SSL_NOT_EXP		0x00200000L

#define SSL_EXP56		0x00300000L

#define SSL_IS_EXPORT(a)	((a)&SSL_EXP40)

#define SSL_IS_EXPORT56(a)	(((a)&_SSL_EXP_MASK) == SSL_EXP56)

#define SSL_IS_EXPORT40(a)	(((a)&_SSL_EXP_MASK) == SSL_EXP40)

#define SSL_IS_EXPORT56(a)	(((a)&SSL_EXP_MASK) == SSL_EXP56)

#define SSL_IS_EXPORT40(a)	(((a)&SSL_EXP_MASK) == SSL_EXP40)

#define SSL_C_IS_EXPORT(c)	SSL_IS_EXPORT((c)->algorithms)

#define SSL_C_IS_EXPORT56(c)	SSL_IS_EXPORT56((c)->algorithms)

#define SSL_C_IS_EXPORT40(c)	SSL_IS_EXPORT40((c)->algorithms)
@@ -219,7 +219,7 @@ 
/* we have used 0fffffff - 4 bits left to go */

#define SSL_ALL			0xffffffffL

#define SSL_ALL_CIPHERS		(SSL_MKEY_MASK|SSL_AUTH_MASK|SSL_ENC_MASK|\

				SSL_MAC_MASK|_SSL_EXP_MASK)

				SSL_MAC_MASK|SSL_EXP_MASK)



/* Mostly for SSLv3 */

#define SSL_PKEY_RSA_ENC	0