Changes committed gnus/lisp (ChangeLog gnus-util.el rfc2104.el tls.el)
"Miles Bader" <[email protected]> Sun, 27 Jul 2008 02:26:58 +0200
| Newsgroups | gmane.emacs.gnus.commits |
|---|---|
| Message-ID | <[email protected]> |
Modified: ChangeLog gnus-util.el rfc2104.el tls.el Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 1344, 1352, 1354-1355) - Update from CVS - Merge from gnus--devo--0 2008-07-21 Dan Nicolaescu <[email protected]> * lisp/gnus-util.el (ns-focus-frame): Remove declaration. (gnus-select-frame-set-input-focus): Undo previous change. Treat ns like x. 2008-07-21 Thien-Thi Nguyen <[email protected]> * lisp/rfc2104.el (rfc2104-zero): Delete defconst. (rfc2104-hex-alist): Likewise. (rfc2104-hex-to-int): Delete func. (rfc2104-hexstring-to-bitstring): Likewise. (rfc2104-nybbles): New defconst. (rfc2104-hash): Rewrite for speed. 2008-07-18 Katsumi Yamaoka <[email protected]> * lisp/tls.el (open-tls-stream): Make it work with the 2nd argument BUFFER that is a string but does not exist as a buffer object, as mentioned in the doc-string. Revision: [email protected]/gnus--devo--0--patch-526 Index: ChangeLog diff -u gnus/lisp/ChangeLog:7.1891 gnus/lisp/ChangeLog:7.1892 --- ChangeLog:7.1891 Fri Jul 25 01:56:56 2008 +++ ChangeLog Sun Jul 27 02:26:58 2008 @@ -7,6 +7,27 @@ * gnus-art.el (gnus-summary-save-in-pipe): Consider gnus-save-all-headers. +2008-07-21 Dan Nicolaescu <[email protected]> + + * gnus-util.el (ns-focus-frame): Remove declaration. + (gnus-select-frame-set-input-focus): Undo previous change. Treat ns + like x. + +2008-07-21 Thien-Thi Nguyen <[email protected]> + + * rfc2104.el (rfc2104-zero): Delete defconst. + (rfc2104-hex-alist): Likewise. + (rfc2104-hex-to-int): Delete func. + (rfc2104-hexstring-to-bitstring): Likewise. + (rfc2104-nybbles): New defconst. + (rfc2104-hash): Rewrite for speed. + +2008-07-18 Katsumi Yamaoka <[email protected]> + + * tls.el (open-tls-stream): Make it work with the 2nd argument + BUFFER that is a string but does not exist as a buffer object, as + mentioned in the doc-string. + 2008-07-18 Katsumi Yamaoka <[email protected]> * lpath.el: Fbind ns-focus-frame for Emacs 21, 22, XEmacs 21.4, and @@ -38,8 +59,8 @@ (gnus-summary-pipe-to-muttprint): Update gnus-summary-muttprint-program instead of gnus-last-shell-command. - * gnus-sum.el (gnus-summary-pipe-output-default-command): New user - option. + * gnus-sum.el (gnus-summary-pipe-output-default-command): + New user option. (gnus-summary-muttprint-program): Mention the value will be changed. (gnus-summary-save-article): Force showing of all headers. (gnus-summary-pipe-output): Work with the 2nd argument HEADERS. @@ -121,9 +142,9 @@ (nnmairix-determine-original-group-from-registry) (nnmairix-determine-original-group-from-path) (nnmairix-get-group-from-file-path, nnmairix-map-range) - (nnmairix-check-mairix-version, nnmairix-group-toggle-parameter): New - helper functions. - (nnmairix-group-mode-hook, nnmairix-summary-mode-hook): Inserted new + (nnmairix-check-mairix-version, nnmairix-group-toggle-parameter): + New helper functions. + (nnmairix-group-mode-hook, nnmairix-summary-mode-hook): Insert new keystrokes for new commands. (nnmairix-delete-and-create-on-change): Doc string cleanup. (nnmairix-request-group): Check allow-fast group parameter. Index: gnus-util.el diff -u gnus/lisp/gnus-util.el:7.83 gnus/lisp/gnus-util.el:7.84 --- gnus-util.el:7.83 Fri Jul 18 01:43:41 2008 +++ gnus-util.el Sun Jul 27 02:26:58 2008 @@ -1593,7 +1593,6 @@ (declare-function x-focus-frame "xfns.c" (frame)) (declare-function w32-focus-frame "../term/w32-win" (frame)) -(declare-function ns-focus-frame "nsfns.m" (frame)) (defun gnus-select-frame-set-input-focus (frame) "Select FRAME, raise it, and set input focus, if possible." @@ -1610,12 +1609,10 @@ (t (raise-frame frame) (select-frame frame) - (cond ((memq window-system '(x mac)) + (cond ((memq window-system '(x ns mac)) (x-focus-frame frame)) ((eq window-system 'w32) - (w32-focus-frame frame)) - ((eq window-system 'ns) - (ns-focus-frame frame))) + (w32-focus-frame frame))) (when focus-follows-mouse (set-mouse-position frame (1- (frame-width frame)) 0))))) Index: rfc2104.el diff -u gnus/lisp/rfc2104.el:7.12 gnus/lisp/rfc2104.el:7.13 --- rfc2104.el:7.12 Mon May 19 10:47:42 2008 +++ rfc2104.el Sun Jul 27 02:26:58 2008 @@ -23,7 +23,7 @@ ;;; Commentary: -;; This is a quick'n'dirty, low performance, implementation of RFC2104. +;; This is a high performance implementation of RFC2104. ;; ;; Example: ;; @@ -31,8 +31,8 @@ ;; (rfc2104-hash 'md5 64 16 "Jefe" "what do ya want for nothing?") ;; "750c783e6ab0b503eaa86e310a5db738" ;; -;; (require 'sha-1) -;; (rfc2104-hash 'sha1-encode 64 20 "Jefe" "what do ya want for nothing?") +;; (require 'sha1) +;; (rfc2104-hash 'sha1 64 20 "Jefe" "what do ya want for nothing?") ;; "effcdf6ae5eb2fa2d27416d5f184df9c259a7c79" ;; ;; 64 is block length of hash function (64 for MD5 and SHA), 16 is @@ -52,6 +52,7 @@ ;; 2000-08-15 `rfc2104-hexstring-to-bitstring' ;; 2000-05-12 added sha-1 example, added test case reference ;; 2003-11-13 change rfc2104-hexstring-to-bitstring to ...-byte-list +;; 2008-04-25 rewrite rfc2104-hash for speed ;;; Code: @@ -63,55 +64,52 @@ ;; Magic character for outer HMAC round. 0x5C == 92 == '\' (defconst rfc2104-opad ?\x5C) -;; Not so magic character for padding the key. 0x00 -(defconst rfc2104-zero ?\x00) - -;; Alist for converting hex to decimal. -(defconst rfc2104-hex-alist - '((?0 . 0) (?a . 10) (?A . 10) - (?1 . 1) (?b . 11) (?B . 11) - (?2 . 2) (?c . 12) (?C . 12) - (?3 . 3) (?d . 13) (?D . 13) - (?4 . 4) (?e . 14) (?E . 14) - (?5 . 5) (?f . 15) (?F . 15) - (?6 . 6) - (?7 . 7) - (?8 . 8) - (?9 . 9))) - -(defun rfc2104-hex-to-int (str) - (if str - (if (listp str) - (+ (* 16 (rfc2104-hex-to-int (cdr str))) - (cdr (assoc (car str) rfc2104-hex-alist))) - (rfc2104-hex-to-int (reverse (append str nil)))) - 0)) - -(defun rfc2104-hexstring-to-bitstring (str) - (let (out) - (while (< 0 (length str)) - (push (rfc2104-hex-to-int (substring str -2)) out) - (setq str (substring str 0 -2))) - (apply (if (fboundp 'unibyte-string) 'unibyte-string 'string) out))) +(defconst rfc2104-nybbles + (let ((v (make-vector + ;; Find upper bound to save some space. + (1+ (max ?0 ?9 ?a ?f ?A ?F)) + ;; Use non-numeric default to catch bogus hex strings. + nil)) + (ls '((?0 . 0) (?a . 10) (?A . 10) + (?1 . 1) (?b . 11) (?B . 11) + (?2 . 2) (?c . 12) (?C . 12) + (?3 . 3) (?d . 13) (?D . 13) + (?4 . 4) (?e . 14) (?E . 14) + (?5 . 5) (?f . 15) (?F . 15) + (?6 . 6) + (?7 . 7) + (?8 . 8) + (?9 . 9)))) + (while ls + (aset v (caar ls) (cdar ls)) + (setq ls (cdr ls))) + v)) (defun rfc2104-hash (hash block-length hash-length key text) (let* (;; if key is longer than B, reset it to HASH(key) (key (if (> (length key) block-length) (funcall hash key) key)) - (k_ipad (append key nil)) - (k_opad (append key nil))) - ;; zero pad k_ipad/k_opad - (while (< (length k_ipad) block-length) - (setq k_ipad (append k_ipad (list rfc2104-zero)))) - (while (< (length k_opad) block-length) - (setq k_opad (append k_opad (list rfc2104-zero)))) - ;; XOR key with ipad/opad into k_ipad/k_opad - (setq k_ipad (mapcar (lambda (c) (logxor c rfc2104-ipad)) k_ipad)) - (setq k_opad (mapcar (lambda (c) (logxor c rfc2104-opad)) k_opad)) - ;; perform outer hash - (funcall hash (concat k_opad (rfc2104-hexstring-to-bitstring - ;; perform inner hash - (funcall hash (concat k_ipad text))))))) + (len (length key)) + (ipad (make-string block-length rfc2104-ipad)) + (opad (make-string (+ block-length hash-length) rfc2104-opad)) + c partial) + ;; Prefix *pad with key, appropriately XORed. + (do ((i 0 (1+ i))) + ((= len i)) + (setq c (aref key i)) + (aset ipad i (logxor rfc2104-ipad c)) + (aset opad i (logxor rfc2104-opad c))) + ;; Perform inner hash. + (setq partial (string-make-unibyte (funcall hash (concat ipad text)))) + ;; Pack latter part of opad. + (do ((r 0 (+ 2 r)) + (w block-length (1+ w))) + ((= (* 2 hash-length) r)) + (aset opad w + (+ (* 16 (aref rfc2104-nybbles (aref partial r))) + ( aref rfc2104-nybbles (aref partial (1+ r)))))) + ;; Perform outer hash. + (string-make-unibyte (funcall hash opad)))) (provide 'rfc2104) Index: tls.el diff -u gnus/lisp/tls.el:7.28 gnus/lisp/tls.el:7.29 --- tls.el:7.28 Wed Jun 11 16:19:44 2008 +++ tls.el Sun Jul 27 02:26:58 2008 @@ -216,7 +216,11 @@ (use-temp-buffer (null buffer)) process cmd done) (if use-temp-buffer - (setq buffer (generate-new-buffer " TLS"))) + (setq buffer (generate-new-buffer " TLS")) + ;; BUFFER is a string but does not exist as a buffer object. + (unless (and (get-buffer buffer) + (buffer-name (get-buffer buffer))) + (generate-new-buffer buffer))) (with-current-buffer buffer (message "Opening TLS connection to `%s'..." host) (while (and (not done) (setq cmd (pop cmds)))