generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pop3.c: Fixed failure detection during TLS upgrade

Browse Source 
pop3_state_upgrade_tls() would attempt to incorrectly complete the
upgrade to pop3s and start the CAPA command if
Curl_ssl_connect_nonblocking() returned a failure code and if ssldone
was set to TRUE. This would only happen when a non-blocking API hadn't
been provided by the SSL implementation and curlssl_connect() was
called underneath.
This commit is contained in:
Steve Holme 2013-01-24 20:24:39 +00:00
parent 379d63ecc7
commit 8b275718e2
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/pop3.c
View File

@ -568,10 +568,8 @@ static CURLcode pop3_state_starttls_resp(struct connectdata *conn,
else else
result = pop3_state_capa(conn); result = pop3_state_capa(conn);
} }
else { else
state(conn, POP3_UPGRADETLS);
result = pop3_state_upgrade_tls(conn); result = pop3_state_upgrade_tls(conn);
}
return result; return result;
} }
@ -583,9 +581,14 @@ static CURLcode pop3_state_upgrade_tls(struct connectdata *conn)
result = Curl_ssl_connect_nonblocking(conn, FIRSTSOCKET, &pop3c->ssldone); result = Curl_ssl_connect_nonblocking(conn, FIRSTSOCKET, &pop3c->ssldone);
if(pop3c->ssldone) { if(!result) {
pop3_to_pop3s(conn); if(pop3c->state != POP3_UPGRADETLS)
result = pop3_state_capa(conn); state(conn, POP3_UPGRADETLS);
if(pop3c->ssldone) {
pop3_to_pop3s(conn);
result = pop3_state_capa(conn);
}
} }
return result; return result;