From f6239efed6db9f0f89132e8bb0c4f349d7dec82e Mon Sep 17 00:00:00 2001 From: yamaoka Date: Thu, 2 Sep 2004 01:25:39 +0000 Subject: [PATCH] Don't provide the sha1-dl feature twice. (sha1-region): Allow the optional argument `binary'. (sha1): Ditto. --- ChangeLog | 6 ++++++ sha1-dl.el | 21 ++++++++++++--------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0f23a46..5b45ce8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-09-02 Katsumi Yamaoka + + * sha1-dl.el: Don't provide the sha1-dl feature twice. + (sha1-region): Allow the optional argument `binary'. + (sha1): Ditto. + 2004-08-11 Katsumi Yamaoka * smtp.el (smtp-parse-progress-message-format): Fix regexp usage. diff --git a/sha1-dl.el b/sha1-dl.el index 4716d4d..5e21dc3 100644 --- a/sha1-dl.el +++ b/sha1-dl.el @@ -1,6 +1,6 @@ ;;; sha1-dl.el --- SHA1 Secure Hash Algorithm using DL module. -;; Copyright (C) 1999, 2001 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2001, 2004 Free Software Foundation, Inc. ;; Author: Shuhei KOBAYASHI ;; Keywords: SHA1, FIPS 180-1 @@ -35,20 +35,23 @@ ;;; sha1-dl-module provides `sha1-string' and `sha1-binary'. (dynamic-call "emacs_sha1_init" sha1-dl-handle) -(defun sha1-region (beg end) - (sha1-string (buffer-substring-no-properties beg end))) +(defun sha1-region (beg end &optional binary) + (if binary + (sha1-binary (buffer-substring-no-properties beg end)) + (sha1-string (buffer-substring-no-properties beg end)))) -(defun sha1 (object &optional beg end) +(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." +hash of a portion of OBJECT. +If BINARY is non-nil, return a string in binary form." (if (stringp object) - (sha1-string object) + (if binary + (sha1-binary object) + (sha1-string object)) (save-excursion (set-buffer object) - (sha1-region (or beg (point-min)) (or end (point-max)))))) - -(provide 'sha1-dl) + (sha1-region (or beg (point-min)) (or end (point-max)) binary)))) ;;; sha1-dl.el ends here -- 1.7.10.4