From 7e69565fe680b8bf244a076f0b069f8937b6c7b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bodo=20M=C3=B6ller?= <bodo@openssl.org>
Date: Mon, 19 Feb 2007 14:53:18 +0000
Subject: [PATCH] fix warnings/inconsistencies caused by the recent changes to
 the ciphersuite selection code in HEAD

Submitted by: Victor Duchovni
---
 ssl/d1_clnt.c | 2 +-
 ssl/d1_srvr.c | 2 +-
 ssl/s2_lib.c  | 4 ++++
 ssl/s3_clnt.c | 2 +-
 ssl/s3_lib.c  | 8 ++++----
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ssl/d1_clnt.c b/ssl/d1_clnt.c
index 0f3dd708a6..486bd32b03 100644
--- a/ssl/d1_clnt.c
+++ b/ssl/d1_clnt.c
@@ -144,7 +144,7 @@ IMPLEMENT_dtls1_meth_func(DTLSv1_client_method,
 int dtls1_connect(SSL *s)
 	{
 	BUF_MEM *buf=NULL;
-	unsigned long Time=(unsigned long)time(NULL),l;
+	unsigned long Time=(unsigned long)time(NULL);
 	long num1;
 	void (*cb)(const SSL *ssl,int type,int val)=NULL;
 	int ret= -1;
diff --git a/ssl/d1_srvr.c b/ssl/d1_srvr.c
index 450524a5e9..0fc40078f4 100644
--- a/ssl/d1_srvr.c
+++ b/ssl/d1_srvr.c
@@ -145,7 +145,7 @@ IMPLEMENT_dtls1_meth_func(DTLSv1_server_method,
 int dtls1_accept(SSL *s)
 	{
 	BUF_MEM *buf;
-	unsigned long l,Time=(unsigned long)time(NULL);
+	unsigned long Time=(unsigned long)time(NULL);
 	void (*cb)(const SSL *ssl,int type,int val)=NULL;
 	long num1;
 	unsigned long alg_k;
diff --git a/ssl/s2_lib.c b/ssl/s2_lib.c
index 30ca8606e4..25148d3397 100644
--- a/ssl/s2_lib.c
+++ b/ssl/s2_lib.c
@@ -279,6 +279,10 @@ OPENSSL_GLOBAL SSL_CIPHER ssl2_ciphers[]={
 	SSL2_TXT_NULL,
 	SSL2_CK_NULL,
 	0,
+	0,
+	0,
+	0,
+	SSL_SSLV2,
 	SSL_STRONG_NONE,
 	0,
 	0,
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index 2a19ec496e..980dd79288 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -1828,7 +1828,7 @@ int ssl3_send_client_key_exchange(SSL *s)
 
 #ifdef KSSL_DEBUG
 			printf("ssl3_send_client_key_exchange(%lx & %lx)\n",
-				l, SSL_kKRB5);
+				alg_k, SSL_kKRB5);
 #endif	/* KSSL_DEBUG */
 
 			authp = NULL;
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index d4114f3de8..d438cbb10d 100644
--- 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,
-- 
GitLab