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

smtp: Added support for the STLS capability (Part One) 

Introduced detection of the STARTTLS capability, in order to add support
for TLS upgrades without unconditionally sending the STARTTLS command.
parent 2f66ca11

lib/smtp.c

+6 −1
Original line number Diff line number Diff line
@@ -228,8 +228,12 @@ static int smtp_endofresp(struct pingpong *pp, int *resp) 
    line += 4;

    len -= 4;



    /* Does the server support the STARTTLS capability? */

    if(len >= 8 && !memcmp(line, "STARTTLS", 8))

      smtpc->tls_supported = TRUE;



    /* Does the server support the SIZE capability? */

    if(len >= 4 && !memcmp(line, "SIZE", 4))

    else if(len >= 4 && !memcmp(line, "SIZE", 4))

      smtpc->size_supported = TRUE;



    /* Do we have the authentication mechanism list? */
@@ -237,6 +241,7 @@ static int smtp_endofresp(struct pingpong *pp, int *resp) 
      line += 5;

      len -= 5;



      /* Loop through the data line */

      for(;;) {

        while(len &&

              (*line == ' ' || *line == '\t' ||

lib/smtp.h

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ struct smtp_conn { 
  smtpstate state;         /* Always use smtp.c:state() to change state! */

  struct curl_slist *rcpt; /* Recipient list */

  bool ssldone;            /* Is connect() over SSL done? */

  bool tls_supported;      /* StartTLS capability supported by server */

  bool size_supported;     /* If server supports SIZE extension according to

                              RFC 1870 */

};