fix warnings/inconsistencies caused by the recent changes to the

ciphersuite selection code in HEAD Submitted by: Victor Duchovni
2007-02-19 14:53:18 +00:00
parent ccae144d62
commit 7e69565fe6
5 changed files with 11 additions and 7 deletions
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -699,12 +699,12 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
 	1,
 	SSL3_TXT_KRB5_RC4_128_SHA,
 	SSL3_CK_KRB5_RC4_128_SHA,
-	SSL_kKRB5,SSL_aKRB5,
+	SSL_kKRB5,
+	SSL_aKRB5,
 	SSL_RC4,
 	SSL_SHA1,
 	SSL_SSLV3,
-	SSL_NOT_EXP,
-	SSL_MEDIUM,
+	SSL_NOT_EXP|SSL_MEDIUM,
 	0,
 	128,
 	128,
@@ -799,7 +799,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
 	SSL_aKRB5,
 	SSL_DES,
 	SSL_SHA1,
-	|SSL_SSLV3,
+	SSL_SSLV3,
 	SSL_EXPORT|SSL_EXP40,
 	0,
 	40,