moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

ftp: don't do ssl_shutdown instead of ssl_close 

The shutdown function is for downgrading a connection from TLS to plain,
and this is not requested here.

Have ssl_close reset the TLS connection state.

This partially reverts commit f002c850d9

Reported-by: Rasmus Melchior Jacobsen
Reported-by: Denis Goleshchikhin
Fixes #5797
This commit is contained in:
Daniel Stenberg 2020-08-10 10:56:20 +02:00
parent 421cf55ab2
commit aecce3551c
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/ftp.c
View File

@ -3251,9 +3251,9 @@ static CURLcode ftp_done(struct connectdata *conn, CURLcode status,
} }
if(conn->ssl[SECONDARYSOCKET].use) { if(conn->ssl[SECONDARYSOCKET].use) {
/* The secondary socket used SSL so we must close down that part first /* The secondary socket is using SSL so we must close down that part
before we close the socket for real */ first before we close the socket for real */
result = Curl_ssl_shutdown(conn, SECONDARYSOCKET); Curl_ssl_close(conn, SECONDARYSOCKET);
/* Note that we keep "use" set to TRUE since that (next) connection is /* Note that we keep "use" set to TRUE since that (next) connection is
still requested to use SSL */ still requested to use SSL */

1
lib/vtls/vtls.c
View File

@ -621,6 +621,7 @@ void Curl_ssl_close(struct connectdata *conn, int sockindex)
{ {
DEBUGASSERT((sockindex <= 1) && (sockindex >= -1)); DEBUGASSERT((sockindex <= 1) && (sockindex >= -1));
Curl_ssl->close_one(conn, sockindex); Curl_ssl->close_one(conn, sockindex);
conn->ssl[sockindex].state = ssl_connection_none;
} }
CURLcode Curl_ssl_shutdown(struct connectdata *conn, int sockindex) CURLcode Curl_ssl_shutdown(struct connectdata *conn, int sockindex)