diff options
| author | Dan Fandrich <dan@coneharvesters.com> | 2015-03-28 11:51:05 +0100 |
|---|---|---|
| committer | Dan Fandrich <dan@coneharvesters.com> | 2015-03-28 11:57:16 +0100 |
| commit | ae3c985060d7d5fd7a72d7dcb0b6b176f3c972b2 (patch) | |
| tree | 97eb88cfd31f8f7cdcaa778478e8e89d48c26d32 | |
| parent | 9a743bc5fcbfac9382b434fed10ad87ca98d5c66 (diff) | |
tool_operate: only set SSL options if SSL is enabled
| -rw-r--r-- | src/tool_operate.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/tool_operate.c b/src/tool_operate.c index 33a9520f9..01a61f9a7 100644 --- a/src/tool_operate.c +++ b/src/tool_operate.c @@ -998,10 +998,6 @@ static CURLcode operate_do(struct GlobalConfig *global, else my_setopt(curl, CURLOPT_RESUME_FROM_LARGE, CURL_OFF_T_C(0)); - my_setopt_str(curl, CURLOPT_SSLCERT, config->cert); - my_setopt_str(curl, CURLOPT_SSLCERTTYPE, config->cert_type); - my_setopt_str(curl, CURLOPT_SSLKEY, config->key); - my_setopt_str(curl, CURLOPT_SSLKEYTYPE, config->key_type); my_setopt_str(curl, CURLOPT_KEYPASSWD, config->key_passwd); if(built_in_protos & (CURLPROTO_SCP|CURLPROTO_SFTP)) { @@ -1029,6 +1025,11 @@ static CURLcode operate_do(struct GlobalConfig *global, my_setopt_str(curl, CURLOPT_PINNEDPUBLICKEY, config->pinnedpubkey); if(curlinfo->features & CURL_VERSION_SSL) { + my_setopt_str(curl, CURLOPT_SSLCERT, config->cert); + my_setopt_str(curl, CURLOPT_SSLCERTTYPE, config->cert_type); + my_setopt_str(curl, CURLOPT_SSLKEY, config->key); + my_setopt_str(curl, CURLOPT_SSLKEYTYPE, config->key_type); + if(config->insecure_ok) { my_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L); my_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0L); @@ -1044,6 +1045,8 @@ static CURLcode operate_do(struct GlobalConfig *global, if(config->falsestart) my_setopt(curl, CURLOPT_SSL_FALSESTART, 1L); + + my_setopt_enum(curl, CURLOPT_SSLVERSION, config->ssl_version); } if(config->path_as_is) my_setopt(curl, CURLOPT_PATH_AS_IS, 1L); @@ -1102,7 +1105,6 @@ static CURLcode operate_do(struct GlobalConfig *global, } #endif - my_setopt_enum(curl, CURLOPT_SSLVERSION, config->ssl_version); my_setopt_enum(curl, CURLOPT_TIMECONDITION, (long)config->timecond); my_setopt(curl, CURLOPT_TIMEVALUE, (long)config->condtime); my_setopt_str(curl, CURLOPT_CUSTOMREQUEST, config->customrequest); |