aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Holme <steve_holme@hotmail.com>2013-01-24 20:27:43 +0000
committerSteve Holme <steve_holme@hotmail.com>2013-01-24 20:27:43 +0000
commitf8ba1273af2b9760d373ed012b081fda29f6169d (patch)
treeb37d35097297a96bc13e5fc46e6c0efe4c123050
parent8b275718e225c67bf21e078775f005d56f122589 (diff)
smtp.c: Fixed failure detection during TLS upgrade
smtp_state_upgrade_tls() would attempt to incorrectly complete the upgrade to smtps and start the EHLO 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.
-rw-r--r--lib/smtp.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/lib/smtp.c b/lib/smtp.c
index 05c0a780a..36ad58687 100644
--- a/lib/smtp.c
+++ b/lib/smtp.c
@@ -490,10 +490,8 @@ static CURLcode smtp_state_starttls_resp(struct connectdata *conn,
else
result = smtp_authenticate(conn);
}
- else {
- state(conn, SMTP_UPGRADETLS);
+ else
result = smtp_state_upgrade_tls(conn);
- }
return result;
}
@@ -505,9 +503,14 @@ static CURLcode smtp_state_upgrade_tls(struct connectdata *conn)
result = Curl_ssl_connect_nonblocking(conn, FIRSTSOCKET, &smtpc->ssldone);
- if(smtpc->ssldone) {
- smtp_to_smtps(conn);
- result = smtp_state_ehlo(conn);
+ if(!result) {
+ if(smtpc->state != SMTP_UPGRADETLS)
+ state(conn, SMTP_UPGRADETLS);
+
+ if(smtpc->ssldone) {
+ smtp_to_smtps(conn);
+ result = smtp_state_ehlo(conn);
+ }
}
return result;