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

pop3: Fixed selection of APOP when server replies with an invalid timestamp

Browse Source 
Although highlighted by a bug in commit 1cfb436a2f1795, APOP
authentication could be chosen if the server was to reply with an empty
or missing timestamp in the server greeting and APOP was given in the
capability list by the server.
This commit is contained in:
Steve Holme 2013-12-20 12:46:18 +00:00
parent 0452976711
commit 9f260b5d66
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/pop3.c
View File

@ -561,7 +561,8 @@ static CURLcode pop3_perform_authentication(struct connectdata *conn)
}
#ifndef CURL_DISABLE_CRYPTO_AUTH
else if((pop3c->authtypes & POP3_TYPE_APOP) &&
(pop3c->preftype & POP3_TYPE_APOP))
(pop3c->preftype & POP3_TYPE_APOP) &&
(pop3c->apoptimestamp))
/* Perform APOP authentication */
result = pop3_perform_apop(conn);
#endif
@ -663,6 +664,8 @@ static CURLcode pop3_state_servergreet_resp(struct connectdata *conn,
if(line[i] == '<') {
/* Calculate the length of the timestamp */
size_t timestamplen = len - 2 - i;
if(!timestamplen)
break;
/* Allocate some memory for the timestamp */
pop3c->apoptimestamp = (char *)calloc(1, timestamplen + 1);
@ -1198,7 +1201,8 @@ static CURLcode pop3_state_auth_cancel_resp(struct connectdata *conn,
}
#ifndef CURL_DISABLE_CRYPTO_AUTH
else if((pop3c->authtypes & POP3_TYPE_APOP) &&
(pop3c->preftype & POP3_TYPE_APOP))
(pop3c->preftype & POP3_TYPE_APOP) &&
(pop3c->apoptimestamp))
/* Perform APOP authentication */
result = pop3_perform_apop(conn);
#endif