From: shuhei Date: Sun, 25 Feb 2001 14:26:53 +0000 (+0000) Subject: Update Copyright header. X-Git-Tag: semi21-shuhei-2001-02-26~4 X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b26bf2acb86048ec962f65ff163e538f6d6d7a64;p=elisp%2Flemi.git Update Copyright header. (md5-binary): Use built-in `md5' unconditionally. --- diff --git a/mail/hmac-md5.el b/mail/hmac-md5.el index 9c936d0..a36736c 100644 --- a/mail/hmac-md5.el +++ b/mail/hmac-md5.el @@ -1,10 +1,8 @@ ;;; hmac-md5.el --- Compute HMAC-MD5. -;; Copyright (C) 1999 Shuhei KOBAYASHI +;; Copyright (C) 1999, 2001 Free Software Foundation, Inc. ;; Author: Shuhei KOBAYASHI -;; Kenichi OKADA -;; Maintainer: Kenichi OKADA ;; Keywords: HMAC, RFC 2104, HMAC-MD5, MD5, KEYED-MD5, CRAM-MD5 ;; This file is part of FLIM (Faithful Library about Internet Message). @@ -66,26 +64,11 @@ (eval-when-compile (require 'hmac-def)) (require 'hex-util) ; (decode-hex-string STRING) -(require 'md5) ; expects (md5 STRING) +(require 'md5) ; We have a built-in `md5'. -;; We cannot define this function in md5.el because recent XEmacs provides -;; built-in md5 function and provides feature 'md5 at startup. -(if (and (featurep 'xemacs) - (fboundp 'md5) - (subrp (symbol-function 'md5)) - (condition-case nil - ;; `md5' of XEmacs 21 takes 4th arg CODING (and 5th arg NOERROR). - (md5 "" nil nil 'binary) ; => "fb5d2156096fa1f254352f3cc3fada7e" - (error nil))) - ;; XEmacs 21. - (defun md5-binary (string &optional start end) - "Return the MD5 of STRING in binary form." - (decode-hex-string (md5 string start end 'binary))) - ;; not XEmacs 21 and not DL. - (if (not (fboundp 'md5-binary)) - (defun md5-binary (string) - "Return the MD5 of STRING in binary form." - (decode-hex-string (md5 string))))) +(defun md5-binary (string &optional start end) + "Return the MD5 of STRING in binary form." + (decode-hex-string (md5 string start end 'binary))) (define-hmac-function hmac-md5 md5-binary 64 16) ; => (hmac-md5 TEXT KEY) ;; (define-hmac-function hmac-md5-96 md5-binary 64 16 96)