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

nss: make sure that 'sslver' is always initialized

Browse Source
This commit is contained in:
Kamil Dudka 2013-12-02 16:09:12 +01:00
parent 865666afca
commit e221b55f67
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/nss.c
View File

@ -1191,13 +1191,10 @@ static CURLcode nss_init_sslver(SSLVersionRange *sslver,
switch (data->set.ssl.version) { switch (data->set.ssl.version) {
default: default:
case CURL_SSLVERSION_DEFAULT: case CURL_SSLVERSION_DEFAULT:
sslver->min = SSL_LIBRARY_VERSION_3_0;
if(data->state.ssl_connect_retry) { if(data->state.ssl_connect_retry) {
infof(data, "TLS disabled due to previous handshake failure\n"); infof(data, "TLS disabled due to previous handshake failure\n");
sslver->max = SSL_LIBRARY_VERSION_3_0; sslver->max = SSL_LIBRARY_VERSION_3_0;
} }
else
sslver->max = SSL_LIBRARY_VERSION_TLS_1_0;
return CURLE_OK; return CURLE_OK;
case CURL_SSLVERSION_TLSv1: case CURL_SSLVERSION_TLSv1:
@ -1251,7 +1248,6 @@ CURLcode Curl_nss_connect(struct connectdata *conn, int sockindex)
{ {
PRErrorCode err = 0; PRErrorCode err = 0;
PRFileDesc *model = NULL; PRFileDesc *model = NULL;
SSLVersionRange sslver;
PRBool ssl_no_cache; PRBool ssl_no_cache;
PRBool ssl_cbc_random_iv; PRBool ssl_cbc_random_iv;
struct SessionHandle *data = conn->data; struct SessionHandle *data = conn->data;
@ -1263,6 +1259,11 @@ CURLcode Curl_nss_connect(struct connectdata *conn, int sockindex)
long time_left; long time_left;
PRUint32 timeout; PRUint32 timeout;
SSLVersionRange sslver = {
SSL_LIBRARY_VERSION_3_0, /* min */
SSL_LIBRARY_VERSION_TLS_1_0 /* max */
};
if(connssl->state == ssl_connection_complete) if(connssl->state == ssl_connection_complete)
return CURLE_OK; return CURLE_OK;