diff options
| author | Chong Yidong | 2006-09-28 17:16:12 +0000 |
|---|---|---|
| committer | Chong Yidong | 2006-09-28 17:16:12 +0000 |
| commit | e4eb8462ca02a09ef81871ea7cf996ac35bcfaaa (patch) | |
| tree | e3a5695000fde3b3314805483aeb120925934cb1 | |
| parent | 7ad02ea851435731d495e2ae320371e6f522f012 (diff) | |
| download | emacs-e4eb8462ca02a09ef81871ea7cf996ac35bcfaaa.tar.gz emacs-e4eb8462ca02a09ef81871ea7cf996ac35bcfaaa.zip | |
* mail/smtpmail.el (smtpmail-try-auth-methods): Do not break long
lines in base64-encoded authentication response.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/mail/smtpmail.el | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5f06baba448..92010690e3c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2006-09-28 Chong Yidong <cyd@stupidchicken.com> | ||
| 2 | |||
| 3 | * mail/smtpmail.el (smtpmail-try-auth-methods): Do not break long | ||
| 4 | lines in base64-encoded authentication response. | ||
| 5 | |||
| 1 | 2006-09-26 Vinicius Jose Latorre <viniciusjl@ig.com.br> | 6 | 2006-09-26 Vinicius Jose Latorre <viniciusjl@ig.com.br> |
| 2 | 7 | ||
| 3 | * progmode/ebnf2ps.el: Doc fix. Implement arrow spacing and scaling. | 8 | * progmode/ebnf2ps.el: Doc fix. Implement arrow spacing and scaling. |
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el index 3fc0477a0a0..a39950a6b65 100644 --- a/lisp/mail/smtpmail.el +++ b/lisp/mail/smtpmail.el | |||
| @@ -541,7 +541,7 @@ This is relative to `smtpmail-queue-dir'.") | |||
| 541 | (decoded (base64-decode-string challenge)) | 541 | (decoded (base64-decode-string challenge)) |
| 542 | (hash (rfc2104-hash 'md5 64 16 passwd decoded)) | 542 | (hash (rfc2104-hash 'md5 64 16 passwd decoded)) |
| 543 | (response (concat (smtpmail-cred-user cred) " " hash)) | 543 | (response (concat (smtpmail-cred-user cred) " " hash)) |
| 544 | (encoded (base64-encode-string response))) | 544 | (encoded (base64-encode-string response t))) |
| 545 | (smtpmail-send-command process (format "%s" encoded)) | 545 | (smtpmail-send-command process (format "%s" encoded)) |
| 546 | (if (or (null (car (setq ret (smtpmail-read-response process)))) | 546 | (if (or (null (car (setq ret (smtpmail-read-response process)))) |
| 547 | (not (integerp (car ret))) | 547 | (not (integerp (car ret))) |
| @@ -554,12 +554,12 @@ This is relative to `smtpmail-queue-dir'.") | |||
| 554 | (>= (car ret) 400)) | 554 | (>= (car ret) 400)) |
| 555 | (throw 'done nil)) | 555 | (throw 'done nil)) |
| 556 | (smtpmail-send-command | 556 | (smtpmail-send-command |
| 557 | process (base64-encode-string (smtpmail-cred-user cred))) | 557 | process (base64-encode-string (smtpmail-cred-user cred t))) |
| 558 | (if (or (null (car (setq ret (smtpmail-read-response process)))) | 558 | (if (or (null (car (setq ret (smtpmail-read-response process)))) |
| 559 | (not (integerp (car ret))) | 559 | (not (integerp (car ret))) |
| 560 | (>= (car ret) 400)) | 560 | (>= (car ret) 400)) |
| 561 | (throw 'done nil)) | 561 | (throw 'done nil)) |
| 562 | (smtpmail-send-command process (base64-encode-string passwd)) | 562 | (smtpmail-send-command process (base64-encode-string passwd t)) |
| 563 | (if (or (null (car (setq ret (smtpmail-read-response process)))) | 563 | (if (or (null (car (setq ret (smtpmail-read-response process)))) |
| 564 | (not (integerp (car ret))) | 564 | (not (integerp (car ret))) |
| 565 | (>= (car ret) 400)) | 565 | (>= (car ret) 400)) |
| @@ -576,7 +576,7 @@ This is relative to `smtpmail-queue-dir'.") | |||
| 576 | (concat "\0" | 576 | (concat "\0" |
| 577 | (smtpmail-cred-user cred) | 577 | (smtpmail-cred-user cred) |
| 578 | "\0" | 578 | "\0" |
| 579 | passwd)))) | 579 | passwd) t))) |
| 580 | (if (or (null (car (setq ret (smtpmail-read-response process)))) | 580 | (if (or (null (car (setq ret (smtpmail-read-response process)))) |
| 581 | (not (integerp (car ret))) | 581 | (not (integerp (car ret))) |
| 582 | (not (equal (car ret) 235))) | 582 | (not (equal (car ret) 235))) |