diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ftp.c | 14 | ||||
| -rw-r--r-- | lib/strerror.c | 4 | ||||
| -rw-r--r-- | lib/url.c | 4 | ||||
| -rw-r--r-- | lib/urldata.h | 2 |
4 files changed, 12 insertions, 12 deletions
@@ -2465,9 +2465,9 @@ static CURLcode ftp_statemach_act(struct connectdata *conn) /* remain in this same state */ } else { - if(data->set.ftp_ssl > CURLFTPSSL_TRY) - /* we failed and CURLFTPSSL_CONTROL or CURLFTPSSL_ALL is set */ - result = CURLE_FTP_SSL_FAILED; + if(data->set.ftp_ssl > CURLUSESSL_TRY) + /* we failed and CURLUSESSL_CONTROL or CURLUSESSL_ALL is set */ + result = CURLE_USE_SSL_FAILED; else /* ignore the failure and continue */ result = ftp_state_user(conn); @@ -2497,7 +2497,7 @@ static CURLcode ftp_statemach_act(struct connectdata *conn) */ if(!conn->ssl[SECONDARYSOCKET].use) { NBFTPSENDF(conn, "PROT %c", - data->set.ftp_ssl == CURLFTPSSL_CONTROL ? 'C' : 'P'); + data->set.ftp_ssl == CURLUSESSL_CONTROL ? 'C' : 'P'); state(conn, FTP_PROT); } else { @@ -2512,12 +2512,12 @@ static CURLcode ftp_statemach_act(struct connectdata *conn) if(ftpcode/100 == 2) /* We have enabled SSL for the data connection! */ conn->ssl[SECONDARYSOCKET].use = - (bool)(data->set.ftp_ssl != CURLFTPSSL_CONTROL); + (bool)(data->set.ftp_ssl != CURLUSESSL_CONTROL); /* FTP servers typically responds with 500 if they decide to reject our 'P' request */ - else if(data->set.ftp_ssl> CURLFTPSSL_CONTROL) + else if(data->set.ftp_ssl > CURLUSESSL_CONTROL) /* we failed and bails out */ - return CURLE_FTP_SSL_FAILED; + return CURLE_USE_SSL_FAILED; if(data->set.ftp_ccc) { /* CCC - Clear Command Channel diff --git a/lib/strerror.c b/lib/strerror.c index 9193fd0ca..658a8cba1 100644 --- a/lib/strerror.c +++ b/lib/strerror.c @@ -216,8 +216,8 @@ curl_easy_strerror(CURLcode error) case CURLE_FILESIZE_EXCEEDED: return "Maximum file size exceeded"; - case CURLE_FTP_SSL_FAILED: - return "Requested FTP SSL level failed"; + case CURLE_USE_SSL_FAILED: + return "Requested SSL level failed"; case CURLE_SSL_SHUTDOWN_FAILED: return "Failed to shut down the SSL connection"; @@ -1734,7 +1734,7 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option, /* * Make transfers attempt to use SSL/TLS. */ - data->set.ftp_ssl = (curl_ftpssl)va_arg(param, long); + data->set.ftp_ssl = (curl_usessl)va_arg(param, long); break; case CURLOPT_FTPSSLAUTH: @@ -2948,7 +2948,7 @@ static CURLcode setup_connection_internals(struct SessionHandle *data, #ifdef USE_SSL conn->protocol |= PROT_FTPS|PROT_SSL; /* send data securely unless specifically requested otherwise */ - conn->ssl[SECONDARYSOCKET].use = data->set.ftp_ssl != CURLFTPSSL_CONTROL; + conn->ssl[SECONDARYSOCKET].use = data->set.ftp_ssl != CURLUSESSL_CONTROL; port = PORT_FTPS; #else failf(data, LIBCURL_NAME diff --git a/lib/urldata.h b/lib/urldata.h index e760e0c39..381849a38 100644 --- a/lib/urldata.h +++ b/lib/urldata.h @@ -1404,7 +1404,7 @@ struct UserDefined { bool ftp_use_epsv; /* if EPSV is to be attempted or not */ bool ftp_use_eprt; /* if EPRT is to be attempted or not */ - curl_ftpssl ftp_ssl; /* if AUTH TLS is to be attempted etc */ + curl_usessl ftp_ssl; /* if AUTH TLS is to be attempted etc */ curl_ftpauth ftpsslauth; /* what AUTH XXX to be attempted */ curl_ftpccc ftp_ccc; /* FTP CCC options */ bool no_signal; /* do not use any signal/alarm handler */ |