Implement primitive `sha1' and remove sha1.el

8 files changed, 124 insertions, 483 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e9e7faa93d4..bf7977ced08 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2011-05-24  Leo Liu  <sdl.web@gmail.com>
+
+        * vc/vc-bzr.el (vc-bzr-sha1-program): Rename from sha1-program.
+        (vc-bzr-sha1): Adapt.
+
+        * sha1.el: Remove. Function `sha1' is now builtin.
+
+        * bindings.el: Provide sha1 feature.
+
 2011-05-24  Kenichi Handa  <handa@m17n.org>
 
         * mail/sendmail.el: Require `rfc2047'.
diff --git a/lisp/bindings.el b/lisp/bindings.el
index 8c48bdc5d59..63c83ada9ba 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -646,9 +646,10 @@ is okay.  See `mode-line-format'.")
 
 (make-variable-buffer-local 'indent-tabs-mode)
 
-;; We have base64 and md5 functions built in now.
+;; We have base64, md5 and sha1 functions built in now.
 (provide 'base64)
 (provide 'md5)
+(provide 'sha1)
 (provide 'overlay '(display syntax-table field))
 (provide 'text-properties '(display syntax-table field point-entered))
 
diff --git a/lisp/sha1.el b/lisp/sha1.el
deleted file mode 100644
index 3f2e8f2a69b..00000000000
--- a/lisp/sha1.el
+++ /dev/null
@@ -1,441 +0,0 @@
-;;; sha1.el --- SHA1 Secure Hash Algorithm in Emacs-Lisp
-
-;; Copyright (C) 1999, 2001-2011 Free Software Foundation, Inc.
-
-;; Author: Shuhei KOBAYASHI <shuhei@aqua.ocn.ne.jp>
-;; Keywords: SHA1, FIPS 180-1
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; This program is implemented from the definition of SHA-1 in FIPS PUB
-;; 180-1 (Federal Information Processing Standards Publication 180-1),
-;; "Announcing the Standard for SECURE HASH STANDARD".
-;; <URL:http://www.itl.nist.gov/div897/pubs/fip180-1.htm>
-;; (EXCEPTION; two optimizations taken from GnuPG/cipher/sha1.c)
-;;
-;; Test cases from FIPS PUB 180-1.
-;;
-;; (sha1 "abc")
-;; => a9993e364706816aba3e25717850c26c9cd0d89d
-;;
-;; (sha1 "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq")
-;; => 84983e441c3bd26ebaae4aa1f95129e5e54670f1
-;;
-;; (sha1 (make-string 1000000 ?a))
-;; => 34aa973cd4c4daa4f61eeb2bdbad27316534016f
-;;
-;; BUGS:
-;;  * It is assumed that length of input string is less than 2^29 bytes.
-;;  * It is caller's responsibility to make string (or region) unibyte.
-;;
-;; TODO:
-;;  * Rewrite from scratch!
-;;    This version is much faster than Keiichi Suzuki's another sha1.el,
-;;    but it is too dirty.
-
-;;; Code:
-
-(require 'hex-util)
-
-;;;
-;;; external SHA1 function.
-;;;
-
-(defgroup sha1 nil
-  "Elisp interface for SHA1 hash computation."
-  :version "22.1"
-  :group 'extensions)
-
-(defcustom sha1-maximum-internal-length 500
-  "Maximum length of message to use Lisp version of SHA1 function.
-If message is longer than this, `sha1-program' is used instead.
-
-If this variable is set to 0, use external program only.
-If this variable is set to nil, use internal function only."
-  :type 'integer
-  :group 'sha1)
-
-(defcustom sha1-program '("sha1sum")
-  "Name of program to compute SHA1.
-It must be a string \(program name\) or list of strings \(name and its args\)."
-  :type '(repeat string)
-  :group 'sha1)
-
-(defcustom sha1-use-external (condition-case ()
-                                 (executable-find (car sha1-program))
-                               (error))
-  "Use external SHA1 program.
-If this variable is set to nil, use internal function only."
-  :type 'boolean
-  :group 'sha1)
-
-(defun sha1-string-external (string &optional binary)
-  (let ((default-directory "/") ;; in case otherwise non-existent
-        (process-connection-type nil) ;; pipe
-        prog args digest)
-    (if (consp sha1-program)
-        (setq prog (car sha1-program)
-              args (cdr sha1-program))
-      (setq prog sha1-program
-            args nil))
-    (with-temp-buffer
-      (unless (featurep 'xemacs) (set-buffer-multibyte nil))
-      (insert string)
-      (apply (function call-process-region)
-             (point-min) (point-max)
-             prog t t nil args)
-      ;; SHA1 is 40 bytes long in hexadecimal form.
-      (setq digest (buffer-substring (point-min)(+ (point-min) 40))))
-    (if binary
-        (decode-hex-string digest)
-      digest)))
-
-(defun sha1-region-external (beg end &optional binary)
-  (sha1-string-external (buffer-substring-no-properties beg end) binary))
-
-;;;
-;;; internal SHA1 function.
-;;;
-
-(eval-when-compile
-  ;; optional second arg of string-to-number is new in v20.
-  (defconst sha1-K0-high 23170)         ; (string-to-number "5A82" 16)
-  (defconst sha1-K0-low  31129)         ; (string-to-number "7999" 16)
-  (defconst sha1-K1-high 28377)         ; (string-to-number "6ED9" 16)
-  (defconst sha1-K1-low  60321)         ; (string-to-number "EBA1" 16)
-  (defconst sha1-K2-high 36635)         ; (string-to-number "8F1B" 16)
-  (defconst sha1-K2-low  48348)         ; (string-to-number "BCDC" 16)
-  (defconst sha1-K3-high 51810)         ; (string-to-number "CA62" 16)
-  (defconst sha1-K3-low  49622)         ; (string-to-number "C1D6" 16)
-
-  ;; original definition of sha1-F0.
-  ;; (defmacro sha1-F0 (B C D)
-  ;;   (` (logior (logand (, B) (, C))
-  ;;         (logand (lognot (, B)) (, D)))))
-  ;; a little optimization from GnuPG/cipher/sha1.c.
-  (defmacro sha1-F0 (B C D)
-    `(logxor ,D (logand ,B (logxor ,C ,D))))
-  (defmacro sha1-F1 (B C D)
-    `(logxor ,B ,C ,D))
-  ;; original definition of sha1-F2.
-  ;; (defmacro sha1-F2 (B C D)
-  ;;   (` (logior (logand (, B) (, C))
-  ;;         (logand (, B) (, D))
-  ;;         (logand (, C) (, D)))))
-  ;; a little optimization from GnuPG/cipher/sha1.c.
-  (defmacro sha1-F2 (B C D)
-    `(logior (logand ,B ,C)
-               (logand ,D (logior ,B ,C))))
-  (defmacro sha1-F3 (B C D)
-    `(logxor ,B ,C ,D))
-
-  (defmacro sha1-S1  (W-high W-low)
-    `(let ((W-high ,W-high)
-           (W-low  ,W-low))
-         (setq S1W-high (+ (% (* W-high 2) 65536)
-                           (/ W-low ,(/ 65536 2))))
-         (setq S1W-low (+ (/ W-high ,(/ 65536 2))
-                          (% (* W-low 2) 65536)))))
-  (defmacro sha1-S5  (A-high A-low)
-    `(progn
-       (setq S5A-high (+ (% (* ,A-high 32) 65536)
-                         (/ ,A-low ,(/ 65536 32))))
-       (setq S5A-low  (+ (/ ,A-high ,(/ 65536 32))
-                         (% (* ,A-low 32) 65536)))))
-  (defmacro sha1-S30 (B-high B-low)
-    `(progn
-       (setq S30B-high (+ (/ ,B-high 4)
-                          (* (% ,B-low 4) ,(/ 65536 4))))
-       (setq S30B-low  (+ (/ ,B-low 4)
-                          (* (% ,B-high 4) ,(/ 65536 4))))))
-
-  (defmacro sha1-OP (round)
-    `(progn
-       (sha1-S5 sha1-A-high sha1-A-low)
-       (sha1-S30 sha1-B-high sha1-B-low)
-       (setq sha1-A-low (+ (,(intern (format "sha1-F%d" round))
-                            sha1-B-low sha1-C-low sha1-D-low)
-                           sha1-E-low
-                           ,(symbol-value
-                             (intern (format "sha1-K%d-low" round)))
-                           (aref block-low idx)
-                           (progn
-                             (setq sha1-E-low sha1-D-low)
-                             (setq sha1-D-low sha1-C-low)
-                             (setq sha1-C-low S30B-low)
-                             (setq sha1-B-low sha1-A-low)
-                             S5A-low)))
-       (setq carry (/ sha1-A-low 65536))
-       (setq sha1-A-low (% sha1-A-low 65536))
-       (setq sha1-A-high (% (+ (,(intern (format "sha1-F%d" round))
-                                sha1-B-high sha1-C-high sha1-D-high)
-                               sha1-E-high
-                               ,(symbol-value
-                                 (intern (format "sha1-K%d-high" round)))
-                               (aref block-high idx)
-                               (progn
-                                 (setq sha1-E-high sha1-D-high)
-                                 (setq sha1-D-high sha1-C-high)
-                                 (setq sha1-C-high S30B-high)
-                                 (setq sha1-B-high sha1-A-high)
-                                 S5A-high)
-                               carry)
-                            65536))))
-
-  (defmacro sha1-add-to-H (H X)
-    `(progn
-       (setq ,(intern (format "sha1-%s-low" H))
-             (+ ,(intern (format "sha1-%s-low" H))
-                ,(intern (format "sha1-%s-low" X))))
-       (setq carry (/ ,(intern (format "sha1-%s-low" H)) 65536))
-       (setq ,(intern (format "sha1-%s-low" H))
-             (% ,(intern (format "sha1-%s-low" H)) 65536))
-       (setq ,(intern (format "sha1-%s-high" H))
-             (% (+ ,(intern (format "sha1-%s-high" H))
-                   ,(intern (format "sha1-%s-high" X))
-                   carry)
-                65536))))
-  )
-
-;;; buffers (H0 H1 H2 H3 H4).
-(defvar sha1-H0-high)
-(defvar sha1-H0-low)
-(defvar sha1-H1-high)
-(defvar sha1-H1-low)
-(defvar sha1-H2-high)
-(defvar sha1-H2-low)
-(defvar sha1-H3-high)
-(defvar sha1-H3-low)
-(defvar sha1-H4-high)
-(defvar sha1-H4-low)
-
-(defun sha1-block (block-high block-low)
-  (let (;; step (c) --- initialize buffers (A B C D E).
-        (sha1-A-high sha1-H0-high) (sha1-A-low sha1-H0-low)
-        (sha1-B-high sha1-H1-high) (sha1-B-low sha1-H1-low)
-        (sha1-C-high sha1-H2-high) (sha1-C-low sha1-H2-low)
-        (sha1-D-high sha1-H3-high) (sha1-D-low sha1-H3-low)
-        (sha1-E-high sha1-H4-high) (sha1-E-low sha1-H4-low)
-        (idx 16))
-    ;; step (b).
-    (let (;; temporary variables used in sha1-S1 macro.
-          S1W-high S1W-low)
-      (while (< idx 80)
-        (sha1-S1 (logxor (aref block-high (- idx 3))
-                         (aref block-high (- idx 8))
-                         (aref block-high (- idx 14))
-                         (aref block-high (- idx 16)))
-                 (logxor (aref block-low  (- idx 3))
-                         (aref block-low  (- idx 8))
-                         (aref block-low  (- idx 14))
-                         (aref block-low  (- idx 16))))
-        (aset block-high idx S1W-high)
-        (aset block-low  idx S1W-low)
-        (setq idx (1+ idx))))
-    ;; step (d).
-    (setq idx 0)
-    (let (;; temporary variables used in sha1-OP macro.
-          S5A-high S5A-low S30B-high S30B-low carry)
-      (while (< idx 20) (sha1-OP 0) (setq idx (1+ idx)))
-      (while (< idx 40) (sha1-OP 1) (setq idx (1+ idx)))
-      (while (< idx 60) (sha1-OP 2) (setq idx (1+ idx)))
-      (while (< idx 80) (sha1-OP 3) (setq idx (1+ idx))))
-    ;; step (e).
-    (let (;; temporary variables used in sha1-add-to-H macro.
-          carry)
-      (sha1-add-to-H H0 A)
-      (sha1-add-to-H H1 B)
-      (sha1-add-to-H H2 C)
-      (sha1-add-to-H H3 D)
-      (sha1-add-to-H H4 E))))
-
-(defun sha1-binary (string)
-  "Return the SHA1 of STRING in binary form."
-  (let (;; prepare buffers for a block. byte-length of block is 64.
-        ;; input block is split into two vectors.
-        ;;
-        ;; input block: 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F ...
-        ;; block-high:  +-0-+       +-1-+       +-2-+       +-3-+
-        ;; block-low:         +-0-+       +-1-+       +-2-+       +-3-+
-        ;;
-        ;; length of each vector is 80, and elements of each vector are
-        ;; 16bit integers.  elements 0x10-0x4F of each vector are
-        ;; assigned later in `sha1-block'.
-        (block-high (eval-when-compile (make-vector 80 nil)))
-        (block-low  (eval-when-compile (make-vector 80 nil))))
-    (unwind-protect
-        (let* (;; byte-length of input string.
-               (len (length string))
-               (lim (* (/ len 64) 64))
-               (rem (% len 4))
-               (idx 0)(pos 0))
-          ;; initialize buffers (H0 H1 H2 H3 H4).
-          (setq sha1-H0-high 26437      ; (string-to-number "6745" 16)
-                sha1-H0-low  8961       ; (string-to-number "2301" 16)
-                sha1-H1-high 61389      ; (string-to-number "EFCD" 16)
-                sha1-H1-low  43913      ; (string-to-number "AB89" 16)
-                sha1-H2-high 39098      ; (string-to-number "98BA" 16)
-                sha1-H2-low  56574      ; (string-to-number "DCFE" 16)
-                sha1-H3-high 4146       ; (string-to-number "1032" 16)
-                sha1-H3-low  21622      ; (string-to-number "5476" 16)
-                sha1-H4-high 50130      ; (string-to-number "C3D2" 16)
-                sha1-H4-low  57840)     ; (string-to-number "E1F0" 16)
-          ;; loop for each 64 bytes block.
-          (while (< pos lim)
-            ;; step (a).
-            (setq idx 0)
-            (while (< idx 16)
-              (aset block-high idx (+ (* (aref string pos) 256)
-                                      (aref string (1+ pos))))
-              (setq pos (+ pos 2))
-              (aset block-low  idx (+ (* (aref string pos) 256)
-                                      (aref string (1+ pos))))
-              (setq pos (+ pos 2))
-              (setq idx (1+ idx)))
-            (sha1-block block-high block-low))
-          ;; last block.
-          (if (prog1
-                  (< (- len lim) 56)
-                (setq lim (- len rem))
-                (setq idx 0)
-                (while (< pos lim)
-                  (aset block-high idx (+ (* (aref string pos) 256)
-                                          (aref string (1+ pos))))
-                  (setq pos (+ pos 2))
-                  (aset block-low  idx (+ (* (aref string pos) 256)
-                                          (aref string (1+ pos))))
-                  (setq pos (+ pos 2))
-                  (setq idx (1+ idx)))
-                ;; this is the last (at most) 32bit word.
-                (cond
-                 ((= rem 3)
-                  (aset block-high idx (+ (* (aref string pos) 256)
-                                          (aref string (1+ pos))))
-                  (setq pos (+ pos 2))
-                  (aset block-low  idx (+ (* (aref string pos) 256)
-                                          128)))
-                 ((= rem 2)
-                  (aset block-high idx (+ (* (aref string pos) 256)
-                                          (aref string (1+ pos))))
-                  (aset block-low  idx 32768))
-                 ((= rem 1)
-                  (aset block-high idx (+ (* (aref string pos) 256)
-                                          128))
-                  (aset block-low  idx 0))
-                 (t ;; (= rem 0)
-                  (aset block-high idx 32768)
-                  (aset block-low  idx 0)))
-                (setq idx (1+ idx))
-                (while (< idx 16)
-                  (aset block-high idx 0)
-                  (aset block-low  idx 0)
-                  (setq idx (1+ idx))))
-              ;; last block has enough room to write the length of string.
-              (progn
-                ;; write bit length of string to last 4 bytes of the block.
-                (aset block-low  15 (* (% len 8192) 8))
-                (setq len (/ len 8192))
-                (aset block-high 15 (% len 65536))
-                ;; XXX: It is not practical to compute SHA1 of
-                ;;      such a huge message on emacs.
-                ;; (setq len (/ len 65536))     ; for 64bit emacs.
-                ;; (aset block-low  14 (% len 65536))
-                ;; (aset block-high 14 (/ len 65536))
-                (sha1-block block-high block-low))
-            ;; need one more block.
-            (sha1-block block-high block-low)
-            (fillarray block-high 0)
-            (fillarray block-low  0)
-            ;; write bit length of string to last 4 bytes of the block.
-            (aset block-low  15 (* (% len 8192) 8))
-            (setq len (/ len 8192))
-            (aset block-high 15 (% len 65536))
-            ;; XXX: It is not practical to compute SHA1 of
-            ;;      such a huge message on emacs.
-            ;; (setq len (/ len 65536))         ; for 64bit emacs.
-            ;; (aset block-low  14 (% len 65536))
-            ;; (aset block-high 14 (/ len 65536))
-            (sha1-block block-high block-low))
-          ;; make output string (in binary form).
-          (let ((result (make-string 20 0)))
-            (aset result  0 (/ sha1-H0-high 256))
-            (aset result  1 (% sha1-H0-high 256))
-            (aset result  2 (/ sha1-H0-low  256))
-            (aset result  3 (% sha1-H0-low  256))
-            (aset result  4 (/ sha1-H1-high 256))
-            (aset result  5 (% sha1-H1-high 256))
-            (aset result  6 (/ sha1-H1-low  256))
-            (aset result  7 (% sha1-H1-low  256))
-            (aset result  8 (/ sha1-H2-high 256))
-            (aset result  9 (% sha1-H2-high 256))
-            (aset result 10 (/ sha1-H2-low  256))
-            (aset result 11 (% sha1-H2-low  256))
-            (aset result 12 (/ sha1-H3-high 256))
-            (aset result 13 (% sha1-H3-high 256))
-            (aset result 14 (/ sha1-H3-low  256))
-            (aset result 15 (% sha1-H3-low  256))
-            (aset result 16 (/ sha1-H4-high 256))
-            (aset result 17 (% sha1-H4-high 256))
-            (aset result 18 (/ sha1-H4-low  256))
-            (aset result 19 (% sha1-H4-low  256))
-            result))
-      ;; do not leave a copy of input string.
-      (fillarray block-high nil)
-      (fillarray block-low  nil))))
-
-(defun sha1-string-internal (string &optional binary)
-  (if binary
-      (sha1-binary string)
-    (encode-hex-string (sha1-binary string))))
-
-(defun sha1-region-internal (beg end &optional binary)
-  (sha1-string-internal (buffer-substring-no-properties beg end) binary))
-
-;;;
-;;; application interface.
-;;;
-
-(defun sha1-region (beg end &optional binary)
-  (if (and sha1-use-external
-           sha1-maximum-internal-length
-           (> (abs (- end beg)) sha1-maximum-internal-length))
-      (sha1-region-external beg end binary)
-    (sha1-region-internal beg end binary)))
-
-(defun sha1-string (string &optional binary)
-  (if (and sha1-use-external
-           sha1-maximum-internal-length
-           (> (length string) sha1-maximum-internal-length))
-      (sha1-string-external string binary)
-    (sha1-string-internal string binary)))
-
-;;;###autoload
-(defun sha1 (object &optional beg end binary)
-  "Return the SHA1 (Secure Hash Algorithm) of an object.
-OBJECT is either a string or a buffer.
-Optional arguments BEG and END denote buffer positions for computing the
-hash of a portion of OBJECT.
-If BINARY is non-nil, return a string in binary form."
-  (if (stringp object)
-      (sha1-string object binary)
-    (with-current-buffer object
-      (sha1-region (or beg (point-min)) (or end (point-max)) binary))))
-
-(provide 'sha1)
-
-;;; sha1.el ends here
diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el
index 21cb86a9840..fa59b7ef19c 100644
--- a/lisp/vc/vc-bzr.el
+++ b/lisp/vc/vc-bzr.el
@@ -65,6 +65,14 @@
   :group 'vc-bzr
   :type 'string)
 
+(defcustom vc-bzr-sha1-program '("sha1sum")
+  "Name of program to compute SHA1.
+It must be a string \(program name\) or list of strings \(name and its args\)."
+  :type '(repeat string)
+  :group 'vc-bzr)
+
+(define-obsolete-variable-alias 'sha1-program 'vc-bzr-sha1-program "24.1")
+
 (defcustom vc-bzr-diff-switches nil
   "String or list of strings specifying switches for bzr diff under VC.
 If nil, use the value of `vc-diff-switches'.  If t, use no switches."
@@ -156,12 +164,10 @@ in the repository root directory of FILE."
         (push (cons (match-string 1) (match-string 2)) settings)))
     settings))
 
-(require 'sha1)                         ;For sha1-program
-
 (defun vc-bzr-sha1 (file)
   (with-temp-buffer
     (set-buffer-multibyte nil)
-    (let ((prog sha1-program)
+    (let ((prog vc-bzr-sha1-program)
           (args nil)
           process-file-side-effects)
       (when (consp prog)
diff --git a/src/ChangeLog b/src/ChangeLog
index c5594b8555d..b3b561a9370 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2011-05-24  Leo Liu  <sdl.web@gmail.com>
+
+        * deps.mk (fns.o):
+        * makefile.w32-in ($(BLD)/fns.$(O)): Include sha1.h.
+
+        * fns.c (crypto_hash_function, Fsha1): New function.
+        (Fmd5): Use crypto_hash_function.
+        (syms_of_fns): Add Ssha1.
+
 2011-05-22  Paul Eggert  <eggert@cs.ucla.edu>
 
         * gnutls.c: Remove unused macros.
diff --git a/src/deps.mk b/src/deps.mk
index 8d0e0e69589..6c677f0e6c6 100644
--- a/src/deps.mk
+++ b/src/deps.mk
@@ -284,7 +284,8 @@ eval.o: eval.c commands.h keyboard.h blockinput.h atimer.h systime.h frame.h \
 floatfns.o: floatfns.c syssignal.h lisp.h globals.h $(config_h)
 fns.o: fns.c commands.h lisp.h $(config_h) frame.h buffer.h character.h \
    keyboard.h keymap.h window.h $(INTERVALS_H) coding.h ../lib/md5.h \
-   blockinput.h atimer.h systime.h xterm.h ../lib/unistd.h globals.h
+   ../lib/sha1.h blockinput.h atimer.h systime.h xterm.h ../lib/unistd.h \
+   globals.h
 print.o: print.c process.h frame.h window.h buffer.h keyboard.h character.h \
    lisp.h globals.h $(config_h) termchar.h $(INTERVALS_H) msdos.h termhooks.h \
    blockinput.h atimer.h systime.h font.h charset.h coding.h ccl.h \
diff --git a/src/fns.c b/src/fns.c
index 16dc0fe0de2..9d73e48b928 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -4514,42 +4514,17 @@ including negative integers.  */)
 
 
 /************************************************************************
-                                 MD5
+                             MD5 and SHA1
  ************************************************************************/
 
 #include "md5.h"
+#include "sha1.h"
 
-DEFUN ("md5", Fmd5, Smd5, 1, 5, 0,
-       doc: /* Return MD5 message digest of OBJECT, a buffer or string.
-
-A message digest is a cryptographic checksum of a document, and the
-algorithm to calculate it is defined in RFC 1321.
-
-The two optional arguments START and END are character positions
-specifying for which part of OBJECT the message digest should be
-computed.  If nil or omitted, the digest is computed for the whole
-OBJECT.
+/* TYPE: 0 for md5, 1 for sha1. */
 
-The MD5 message digest is computed from the result of encoding the
-text in a coding system, not directly from the internal Emacs form of
-the text.  The optional fourth argument CODING-SYSTEM specifies which
-coding system to encode the text with.  It should be the same coding
-system that you used or will use when actually writing the text into a
-file.
-
-If CODING-SYSTEM is nil or omitted, the default depends on OBJECT.  If
-OBJECT is a buffer, the default for CODING-SYSTEM is whatever coding
-system would be chosen by default for writing this text into a file.
-
-If OBJECT is a string, the most preferred coding system (see the
-command `prefer-coding-system') is used.
-
-If NOERROR is non-nil, silently assume the `raw-text' coding if the
-guesswork fails.  Normally, an error is signaled in such case.  */)
-  (Lisp_Object object, Lisp_Object start, Lisp_Object end, Lisp_Object coding_system, Lisp_Object noerror)
+Lisp_Object
+crypto_hash_function (int type, Lisp_Object object, Lisp_Object start, Lisp_Object end, Lisp_Object coding_system, Lisp_Object noerror, Lisp_Object binary)
 {
-  unsigned char digest[16];
-  char value[33];
   int i;
   EMACS_INT size;
   EMACS_INT size_byte = 0;
@@ -4558,6 +4533,7 @@ guesswork fails.  Normally, an error is signaled in such case.  */)
   register EMACS_INT b, e;
   register struct buffer *bp;
   EMACS_INT temp;
+  Lisp_Object res=Qnil;
 
   if (STRINGP (object))
     {
@@ -4728,15 +4704,93 @@ guesswork fails.  Normally, an error is signaled in such case.  */)
         object = code_convert_string (object, coding_system, Qnil, 1, 0, 0);
     }
 
-  md5_buffer (SSDATA (object) + start_byte,
-              SBYTES (object) - (size_byte - end_byte),
-              digest);
+  switch (type)
+    {
+    case 0:                     /* MD5 */
+      {
+        unsigned char digest[16];
+        md5_buffer (SSDATA (object) + start_byte,
+                    SBYTES (object) - (size_byte - end_byte),
+                    digest);
 
-  for (i = 0; i < 16; i++)
-    sprintf (&value[2 * i], "%02x", digest[i]);
-  value[32] = '\0';
+        if (NILP(binary))
+          {
+            unsigned char value[33];
+            for (i = 0; i < 16; i++)
+              sprintf (&value[2 * i], "%02x", digest[i]);
+            value[32] = '\0';
+            res = make_string (value, 32);
+          }
+        else
+          res = make_string (digest, 16);
+        break;
+      }
 
-  return make_string (value, 32);
+    case 1:                     /* SHA1 */
+      {
+        unsigned char digest[20];
+        sha1_buffer (SDATA (object) + start_byte,
+                     SBYTES (object) - (size_byte - end_byte),
+                     digest);
+        if (NILP(binary))
+          {
+            unsigned char value[41];
+            for (i = 0; i < 20; i++)
+              sprintf (&value[2 * i], "%02x", digest[i]);
+            value[40] = '\0';
+            res = make_string (value, 40);
+          }
+        else
+          res = make_string (digest, 20);
+        break;
+      }
+    }
+
+  return res;
+}
+
+DEFUN ("md5", Fmd5, Smd5, 1, 5, 0,
+       doc: /* Return MD5 message digest of OBJECT, a buffer or string.
+
+A message digest is a cryptographic checksum of a document, and the
+algorithm to calculate it is defined in RFC 1321.
+
+The two optional arguments START and END are character positions
+specifying for which part of OBJECT the message digest should be
+computed.  If nil or omitted, the digest is computed for the whole
+OBJECT.
+
+The MD5 message digest is computed from the result of encoding the
+text in a coding system, not directly from the internal Emacs form of
+the text.  The optional fourth argument CODING-SYSTEM specifies which
+coding system to encode the text with.  It should be the same coding
+system that you used or will use when actually writing the text into a
+file.
+
+If CODING-SYSTEM is nil or omitted, the default depends on OBJECT.  If
+OBJECT is a buffer, the default for CODING-SYSTEM is whatever coding
+system would be chosen by default for writing this text into a file.
+
+If OBJECT is a string, the most preferred coding system (see the
+command `prefer-coding-system') is used.
+
+If NOERROR is non-nil, silently assume the `raw-text' coding if the
+guesswork fails.  Normally, an error is signaled in such case.  */)
+  (Lisp_Object object, Lisp_Object start, Lisp_Object end, Lisp_Object coding_system, Lisp_Object noerror)
+{
+  return crypto_hash_function (0, object, start, end, coding_system, noerror, Qnil);
+}
+
+DEFUN ("sha1", Fsha1, Ssha1, 1, 4, 0,
+       doc: /* Return the SHA-1 (Secure Hash Algorithm) of an OBJECT.
+
+OBJECT is either a string or a buffer.  Optional arguments START and
+END are character positions specifying which portion of OBJECT for
+computing the hash.  If BINARY is non-nil, return a string in binary
+form.  */)
+     (Lisp_Object object, Lisp_Object start, Lisp_Object end, Lisp_Object binary)
+{
+  return crypto_hash_function (1, object, start, end, Qnil, Qnil, binary);
 }
 
 
@@ -4911,6 +4965,7 @@ this variable.  */);
   defsubr (&Sbase64_encode_string);
   defsubr (&Sbase64_decode_string);
   defsubr (&Smd5);
+  defsubr (&Ssha1);
   defsubr (&Slocale_info);
 }
 
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index 71c4fa4c0ac..060b565b308 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -866,6 +866,7 @@ $(BLD)/fns.$(O) : \
         $(EMACS_ROOT)/nt/inc/unistd.h \
         $(EMACS_ROOT)/nt/inc/sys/time.h \
         $(EMACS_ROOT)/lib/md5.h \
+        $(EMACS_ROOT)/lib/sha1.h \
         $(LISP_H) \
         $(SRC)/atimer.h \
         $(SRC)/blockinput.h \