Loading lib/url.c +72 −71 Original line number Diff line number Diff line Loading @@ -3057,8 +3057,6 @@ static bool ssl_config_matches(struct ssl_config_data* data, struct ssl_config_data* needle) { bool result = FALSE; if((data->version == needle->version) && (data->verifypeer == needle->verifypeer) && (data->verifyhost == needle->verifyhost) && Loading @@ -3067,11 +3065,9 @@ ssl_config_matches(struct ssl_config_data* data, safe_strequal(data->random_file, needle->random_file) && safe_strequal(data->egdsocket, needle->egdsocket) && safe_strequal(data->cipher_list, needle->cipher_list)) { result = TRUE; } return TRUE; return result; return FALSE; } static bool Loading @@ -3083,27 +3079,32 @@ init_ssl_config(struct SessionHandle* data, struct connectdata* conn) if(data->set.ssl.CAfile) { conn->ssl_config.CAfile = strdup(data->set.ssl.CAfile); if(!conn->ssl_config.CAfile) return FALSE; if(!conn->ssl_config.CAfile) return FALSE; } if(data->set.ssl.CApath) { conn->ssl_config.CApath = strdup(data->set.ssl.CApath); if(!conn->ssl_config.CApath) return FALSE; if(!conn->ssl_config.CApath) return FALSE; } if(data->set.ssl.cipher_list) { conn->ssl_config.cipher_list = strdup(data->set.ssl.cipher_list); if(!conn->ssl_config.cipher_list) return FALSE; if(!conn->ssl_config.cipher_list) return FALSE; } if(data->set.ssl.egdsocket) { conn->ssl_config.egdsocket = strdup(data->set.ssl.egdsocket); if(!conn->ssl_config.egdsocket) return FALSE; if(!conn->ssl_config.egdsocket) return FALSE; } if(data->set.ssl.random_file) { conn->ssl_config.random_file = strdup(data->set.ssl.random_file); if(!conn->ssl_config.random_file) return FALSE; if(!conn->ssl_config.random_file) return FALSE; } return TRUE; Loading Loading
lib/url.c +72 −71 Original line number Diff line number Diff line Loading @@ -3057,8 +3057,6 @@ static bool ssl_config_matches(struct ssl_config_data* data, struct ssl_config_data* needle) { bool result = FALSE; if((data->version == needle->version) && (data->verifypeer == needle->verifypeer) && (data->verifyhost == needle->verifyhost) && Loading @@ -3067,11 +3065,9 @@ ssl_config_matches(struct ssl_config_data* data, safe_strequal(data->random_file, needle->random_file) && safe_strequal(data->egdsocket, needle->egdsocket) && safe_strequal(data->cipher_list, needle->cipher_list)) { result = TRUE; } return TRUE; return result; return FALSE; } static bool Loading @@ -3083,27 +3079,32 @@ init_ssl_config(struct SessionHandle* data, struct connectdata* conn) if(data->set.ssl.CAfile) { conn->ssl_config.CAfile = strdup(data->set.ssl.CAfile); if(!conn->ssl_config.CAfile) return FALSE; if(!conn->ssl_config.CAfile) return FALSE; } if(data->set.ssl.CApath) { conn->ssl_config.CApath = strdup(data->set.ssl.CApath); if(!conn->ssl_config.CApath) return FALSE; if(!conn->ssl_config.CApath) return FALSE; } if(data->set.ssl.cipher_list) { conn->ssl_config.cipher_list = strdup(data->set.ssl.cipher_list); if(!conn->ssl_config.cipher_list) return FALSE; if(!conn->ssl_config.cipher_list) return FALSE; } if(data->set.ssl.egdsocket) { conn->ssl_config.egdsocket = strdup(data->set.ssl.egdsocket); if(!conn->ssl_config.egdsocket) return FALSE; if(!conn->ssl_config.egdsocket) return FALSE; } if(data->set.ssl.random_file) { conn->ssl_config.random_file = strdup(data->set.ssl.random_file); if(!conn->ssl_config.random_file) return FALSE; if(!conn->ssl_config.random_file) return FALSE; } return TRUE; Loading