generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix warnings/inconsistencies caused by the recent changes to the

Browse Source 
ciphersuite selection code in HEAD

Submitted by: Victor Duchovni
This commit is contained in:
Bodo Möller
2007-02-19 14:53:18 +00:00
parent ccae144d62
commit 7e69565fe6
5 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ssl/d1_clnt.c
View File

@@ -144,7 +144,7 @@ IMPLEMENT_dtls1_meth_func(DTLSv1_client_method,
int dtls1_connect(SSL *s) int dtls1_connect(SSL *s)
{ {
BUF_MEM *buf=NULL; BUF_MEM *buf=NULL;
unsigned long Time=(unsigned long)time(NULL),l; unsigned long Time=(unsigned long)time(NULL);
long num1; long num1;
void (*cb)(const SSL *ssl,int type,int val)=NULL; void (*cb)(const SSL *ssl,int type,int val)=NULL;
int ret= -1; int ret= -1;

2
ssl/d1_srvr.c
View File

@@ -145,7 +145,7 @@ IMPLEMENT_dtls1_meth_func(DTLSv1_server_method,
int dtls1_accept(SSL *s) int dtls1_accept(SSL *s)
{ {
BUF_MEM *buf; 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; void (*cb)(const SSL *ssl,int type,int val)=NULL;
long num1; long num1;
unsigned long alg_k; unsigned long alg_k;

4
ssl/s2_lib.c
View File

@@ -279,6 +279,10 @@ OPENSSL_GLOBAL SSL_CIPHER ssl2_ciphers[]={
SSL2_TXT_NULL, SSL2_TXT_NULL,
SSL2_CK_NULL, SSL2_CK_NULL,
0, 0,
0,
0,
0,
SSL_SSLV2,
SSL_STRONG_NONE, SSL_STRONG_NONE,
0, 0,
0, 0,

2
ssl/s3_clnt.c
View File

@@ -1828,7 +1828,7 @@ int ssl3_send_client_key_exchange(SSL *s)
#ifdef KSSL_DEBUG #ifdef KSSL_DEBUG
printf("ssl3_send_client_key_exchange(%lx & %lx)\n", printf("ssl3_send_client_key_exchange(%lx & %lx)\n",
l, SSL_kKRB5); alg_k, SSL_kKRB5);
#endif /* KSSL_DEBUG */ #endif /* KSSL_DEBUG */
authp = NULL; authp = NULL;

8
ssl/s3_lib.c
View File

@@ -699,12 +699,12 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
1, 1,
SSL3_TXT_KRB5_RC4_128_SHA, SSL3_TXT_KRB5_RC4_128_SHA,
SSL3_CK_KRB5_RC4_128_SHA, SSL3_CK_KRB5_RC4_128_SHA,
SSL_kKRB5,SSL_aKRB5, SSL_kKRB5,
SSL_aKRB5,
SSL_RC4, SSL_RC4,
SSL_SHA1, SSL_SHA1,
SSL_SSLV3, SSL_SSLV3,
SSL_NOT_EXP, SSL_NOT_EXP|SSL_MEDIUM,
SSL_MEDIUM,
0, 0,
128, 128,
128, 128,
@@ -799,7 +799,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
SSL_aKRB5, SSL_aKRB5,
SSL_DES, SSL_DES,
SSL_SHA1, SSL_SHA1,
|SSL_SSLV3, SSL_SSLV3,
SSL_EXPORT|SSL_EXP40, SSL_EXPORT|SSL_EXP40,
0, 0,
40, 40,