diff options
Diffstat (limited to 'lib/smtp.c')
| -rw-r--r-- | lib/smtp.c | 38 |
1 files changed, 15 insertions, 23 deletions
diff --git a/lib/smtp.c b/lib/smtp.c index db6a72256..9512a2a7f 100644 --- a/lib/smtp.c +++ b/lib/smtp.c @@ -996,10 +996,6 @@ static CURLcode smtp_state_auth_digest_resp(struct connectdata *conn, char *rplyb64 = NULL; size_t len = 0; - char nonce[64]; - char realm[128]; - char algorithm[64]; - (void)instate; /* no use for this yet */ if(smtpcode != 334) { @@ -1010,29 +1006,25 @@ static CURLcode smtp_state_auth_digest_resp(struct connectdata *conn, /* Get the challenge message */ smtp_get_message(data->state.buffer, &chlg64); - /* Decode the challange message */ - result = Curl_sasl_decode_digest_md5_message(chlg64, nonce, sizeof(nonce), - realm, sizeof(realm), - algorithm, sizeof(algorithm)); - if(result || strcmp(algorithm, "md5-sess") != 0) { - /* Send the cancellation */ - result = Curl_pp_sendf(&conn->proto.smtpc.pp, "%s", "*"); + /* Create the response message */ + result = Curl_sasl_create_digest_md5_message(data, chlg64, + conn->user, conn->passwd, + "smtp", &rplyb64, &len); + if(result) { + if(result == CURLE_BAD_CONTENT_ENCODING) { + /* Send the cancellation */ + result = Curl_pp_sendf(&conn->proto.smtpc.pp, "%s", "*"); - if(!result) - state(conn, SMTP_AUTH_CANCEL); + if(!result) + state(conn, SMTP_AUTH_CANCEL); + } } else { - /* Create the response message */ - result = Curl_sasl_create_digest_md5_message(data, nonce, realm, - conn->user, conn->passwd, - "smtp", &rplyb64, &len); - if(!result && rplyb64) { - /* Send the response */ - result = Curl_pp_sendf(&conn->proto.smtpc.pp, "%s", rplyb64); + /* Send the response */ + result = Curl_pp_sendf(&conn->proto.smtpc.pp, "%s", rplyb64); - if(!result) - state(conn, SMTP_AUTH_DIGESTMD5_RESP); - } + if(!result) + state(conn, SMTP_AUTH_DIGESTMD5_RESP); } Curl_safefree(rplyb64); |