diff options
author | Daniel Stenberg <daniel@haxx.se> | 2005-04-07 15:27:13 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2005-04-07 15:27:13 +0000 |
commit | 6e619393824922118317689ef59a73c556b7ef98 (patch) | |
tree | 87adafabc035fe32f74e78cba20220986a8fe039 /lib/ftp.c | |
parent | 015a6181725a654fb6d1eb8ff55e116ea15dc89a (diff) |
GnuTLS support added. There's now a "generic" SSL layer that we use all over
internally, with code provided by sslgen.c. All SSL-layer-specific code is
then written in ssluse.c (for OpenSSL) and gtls.c (for GnuTLS).
As far as possible, internals should not need to know what SSL layer that is
in use. Building with GnuTLS currently makes two test cases fail.
TODO.gnutls contains a few known outstanding issues for the GnuTLS support.
GnuTLS support is enabled with configure --with-gnutls
Diffstat (limited to 'lib/ftp.c')
-rw-r--r-- | lib/ftp.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -87,7 +87,7 @@ #include "strtoofft.h" #include "strequal.h" -#include "ssluse.h" +#include "sslgen.h" #include "connect.h" #include "strerror.h" #include "memory.h" @@ -2013,7 +2013,7 @@ static CURLcode ftp_state_stor_resp(struct connectdata *conn, do the TLS stuff */ infof(data, "Doing the SSL/TLS handshake on the data stream\n"); /* BLOCKING */ - result = Curl_SSLConnect(conn, SECONDARYSOCKET); + result = Curl_ssl_connect(conn, SECONDARYSOCKET); if(result) return result; } @@ -2121,7 +2121,7 @@ static CURLcode ftp_state_get_resp(struct connectdata *conn, /* since we only have a plaintext TCP connection here, we must now do the TLS stuff */ infof(data, "Doing the SSL/TLS handshake on the data stream\n"); - result = Curl_SSLConnect(conn, SECONDARYSOCKET); + result = Curl_ssl_connect(conn, SECONDARYSOCKET); if(result) return result; } @@ -2373,8 +2373,8 @@ static CURLcode ftp_statemach_act(struct connectdata *conn) */ if((ftpcode == 234) || (ftpcode == 334)) { - /* Curl_SSLConnect is BLOCKING */ - result = Curl_SSLConnect(conn, FIRSTSOCKET); + /* Curl_ssl_connect is BLOCKING */ + result = Curl_ssl_connect(conn, FIRSTSOCKET); if(CURLE_OK == result) { conn->protocol |= PROT_FTPS; conn->ssl[SECONDARYSOCKET].use = FALSE; /* clear-text data */ @@ -2748,7 +2748,7 @@ CURLcode Curl_ftp_connect(struct connectdata *conn, /* BLOCKING */ /* FTPS is simply ftp with SSL for the control channel */ /* now, perform the SSL initialization for this socket */ - result = Curl_SSLConnect(conn, FIRSTSOCKET); + result = Curl_ssl_connect(conn, FIRSTSOCKET); if(result) return result; } |