Sync up with FLIM 1.14.4.

[elisp/lemi.git] / mail / hmac-md5.el

diff --git a/mail/hmac-md5.el b/mail/hmac-md5.el
index a26189e..097a959 100644 (file)
--- a/mail/hmac-md5.el
+++ b/mail/hmac-md5.el
@@ -65,14 +65,28 @@
 
 (eval-when-compile (require 'hmac-def))
 (require 'hex-util)                    ; (decode-hex-string STRING)
-(require 'md5)                         ; We have a built-in `md5'.
+(require 'md5)                         ; expects (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)))
+;; To share *.elc files between Emacs w/ and w/o DL patch,
+;; this check must be done at load-time.
+(cond
+ ((fboundp 'md5-binary)
+  ;; do nothing.
+  )
+ ((condition-case nil
+       ;; `md5' of v21 takes 4th arg CODING (and 5th arg NOERROR).
+       (md5 "" nil nil 'binary)                ; => "d41d8cd98f00b204e9800998ecf8427e"
+     (wrong-number-of-arguments nil))
+  (defun md5-binary (string)
+    "Return the MD5 of STRING in binary form."
+   (decode-hex-string (md5 string nil nil 'binary))))
+ (t
+  (defun md5-binary (string)
+    "Return the MD5 of STRING in binary form."
+   (decode-hex-string (md5 string)))))
 
 (define-hmac-function hmac-md5 md5-binary 64 16) ; => (hmac-md5 TEXT KEY)
-;; (define-hmac-function hmac-md5-96 md5-binary 64 16 96)
+(define-hmac-function hmac-md5-96 md5-binary 64 16 96)
 
 (provide 'hmac-md5)