Merge from flim-1_14-rfc2231

[elisp/flim.git] / hmac-sha1.el

diff --git a/hmac-sha1.el b/hmac-sha1.el
index ab4f109..70b665f 100644 (file)
--- a/hmac-sha1.el
+++ b/hmac-sha1.el
@@ -67,14 +67,19 @@
 (require 'hex-util)                    ; (decode-hex-string STRING)
 (require 'sha1)                                ; expects (sha1 STRING)
 
-;;; For consintency with hmac-md5.el, we define this function here.
-(or (fboundp 'sha1-binary)
-    (defun sha1-binary (string)
-      "Return the SHA1 of STRING in binary form."
-      (decode-hex-string (sha1 string))))
+;; To share *.elc files between Emacs w/ and w/o DL patch,
+;; this check must be done at load-time.
+(cond
+ ((fboundp 'sha1-binary)
+  ;; do nothing.
+  )
+ (t
+  (defun sha1-binary (string)
+    "Return the SHA1 of STRING in binary form."
+    (decode-hex-string (sha1 string)))))
 
 (define-hmac-function hmac-sha1 sha1-binary 64 20) ; => (hmac-sha1 TEXT KEY)
-;; (define-hmac-function hmac-sha1-96 sha1-binary 64 20 96)
+(define-hmac-function hmac-sha1-96 sha1-binary 64 20 96)
 
 (provide 'hmac-sha1)