Commit f8ba1273 authored by Steve Holme's avatar Steve Holme
Browse files

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.
parent 8b275718

lib/smtp.c

+9 −6
Original line number Diff line number Diff line
@@ -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,10 +503,15 @@ static CURLcode smtp_state_upgrade_tls(struct connectdata *conn) 


  result = Curl_ssl_connect_nonblocking(conn, FIRSTSOCKET, &smtpc->ssldone);



  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;

}