master 1844bcf 2/3: Use lexical-binding in hmac-md5.el and add tests

[Stefan Kangas]

branch: master
commit 1844bcf556b21de79a97000223dd95ba86fd1817
Author: Stefan Kangas <address@hidden>
Commit: Stefan Kangas <address@hidden>

    Use lexical-binding in hmac-md5.el and add tests
    
    * lisp/net/hmac-md5.el: Use lexical-binding.
    * test/lisp/net/hmac-md5-tests.el: New file.
---
 lisp/net/hmac-md5.el            | 40 ++-------------------
 test/lisp/net/hmac-md5-tests.el | 80 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 83 insertions(+), 37 deletions(-)

diff --git a/lisp/net/hmac-md5.el b/lisp/net/hmac-md5.el
index 92efb6b..974ee0d 100644
--- a/lisp/net/hmac-md5.el
+++ b/lisp/net/hmac-md5.el
@@ -1,4 +1,4 @@
-;;; hmac-md5.el --- Compute HMAC-MD5.
+;;; hmac-md5.el --- Compute HMAC-MD5.  -*- lexical-binding:t -*-
 
 ;; Copyright (C) 1999, 2001, 2007-2020 Free Software Foundation, Inc.
 
@@ -22,42 +22,8 @@
 
 ;;; Commentary:
 
-;; Test cases from RFC 2202, "Test Cases for HMAC-MD5 and HMAC-SHA-1".
-;;
-;; (encode-hex-string (hmac-md5 "Hi There" (make-string 16 ?\x0b)))
-;;  => "9294727a3638bb1c13f48ef8158bfc9d"
-;;
-;; (encode-hex-string (hmac-md5 "what do ya want for nothing?" "Jefe"))
-;;  => "750c783e6ab0b503eaa86e310a5db738"
-;;
-;; (encode-hex-string (hmac-md5 (make-string 50 ?\xdd) (make-string 16 ?\xaa)))
-;;  => "56be34521d144c88dbb8c733f0e8b3f6"
-;;
-;; (encode-hex-string
-;;  (hmac-md5
-;;   (make-string 50 ?\xcd)
-;;   (decode-hex-string "0102030405060708090a0b0c0d0e0f10111213141516171819")))
-;;  => "697eaf0aca3a3aea3a75164746ffaa79"
-;;
-;; (encode-hex-string
-;;  (hmac-md5 "Test With Truncation" (make-string 16 ?\x0c)))
-;;  => "56461ef2342edc00f9bab995690efd4c"
-;;
-;; (encode-hex-string
-;;  (hmac-md5-96 "Test With Truncation" (make-string 16 ?\x0c)))
-;;  => "56461ef2342edc00f9bab995"
-;;
-;; (encode-hex-string
-;;  (hmac-md5
-;;   "Test Using Larger Than Block-Size Key - Hash Key First"
-;;   (make-string 80 ?\xaa)))
-;;  => "6b1ab7fe4bd7bf8f0b62e6ce61b9d0cd"
-;;
-;; (encode-hex-string
-;;  (hmac-md5
-;;   "Test Using Larger Than Block-Size Key and Larger Than One Block-Size 
Data"
-;;   (make-string 80 ?\xaa)))
-;;  => "6f630fad67cda0ee1fb1f562db3aa53e"
+;; Test cases from RFC 2202, "Test Cases for HMAC-MD5 and HMAC-SHA-1",
+;; moved to lisp/test/net/hmac-md5-tests.el
 
 ;;; Code:
 
diff --git a/test/lisp/net/hmac-md5-tests.el b/test/lisp/net/hmac-md5-tests.el
new file mode 100644
index 0000000..30d221e
--- /dev/null
+++ b/test/lisp/net/hmac-md5-tests.el
@@ -0,0 +1,80 @@
+;;; hmac-md5-tests.el --- Tests for hmac-md5.el  -*- lexical-binding:t -*-
+
+;; Copyright (C) 2020 Free Software Foundation, Inc.
+
+;; 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 <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;; Code:
+
+(require 'ert)
+(require 'hmac-md5)
+
+;; Test cases from RFC 2202, "Test Cases for HMAC-MD5 and HMAC-SHA-1",
+;; moved here from hmac-md5.el
+
+(ert-deftest hmac-md5-test-encode-string ()
+  ;; RFC 2202 -- test_case 1
+  (should (equal (encode-hex-string
+                  (hmac-md5 "Hi There" (make-string 16 ?\x0b)))
+                 "9294727a3638bb1c13f48ef8158bfc9d"))
+
+  ;; RFC 2202 -- test_case 2
+  (should (equal (encode-hex-string
+                  (hmac-md5 "what do ya want for nothing?" "Jefe"))
+                 "750c783e6ab0b503eaa86e310a5db738"))
+
+  ;; RFC 2202 -- test_case 3
+  (should (equal (encode-hex-string
+                  (hmac-md5 (decode-hex-string (make-string 100 ?d))
+                            (decode-hex-string (make-string 32 ?a))))
+                 "56be34521d144c88dbb8c733f0e8b3f6"))
+
+  ;; RFC 2202 -- test_case 4
+  (should (equal (encode-hex-string
+                  (hmac-md5 (decode-hex-string
+                             (mapconcat (lambda (c) (concat (list c) "d"))
+                                        (make-string 50 ?c) ""))
+                            (decode-hex-string 
"0102030405060708090a0b0c0d0e0f10111213141516171819")))
+                 "697eaf0aca3a3aea3a75164746ffaa79"))
+
+  ;; RFC 2202 -- test_case 5 (a)
+  (should (equal (encode-hex-string
+                  (hmac-md5 "Test With Truncation" (make-string 16 ?\x0c)))
+                 "56461ef2342edc00f9bab995690efd4c"))
+
+  ;; RFC 2202 -- test_case 5 (b)
+  (should (equal (encode-hex-string
+                  (hmac-md5-96 "Test With Truncation" (make-string 16 ?\x0c)))
+                 "56461ef2342edc00f9bab995"))
+
+  ;; RFC 2202 -- test_case 6
+  (should (equal (encode-hex-string
+                  (hmac-md5
+                   "Test Using Larger Than Block-Size Key - Hash Key First"
+                   (decode-hex-string (make-string 160 ?a))))
+                 "6b1ab7fe4bd7bf8f0b62e6ce61b9d0cd"))
+
+  ;; RFC 2202 -- test_case 7
+  (should (equal (encode-hex-string
+                  (hmac-md5
+                   "Test Using Larger Than Block-Size Key and Larger Than One 
Block-Size Data"
+                   (decode-hex-string (make-string 160 ?a))))
+                 "6f630fad67cda0ee1fb1f562db3aa53e")))
+
+(provide 'hmac-md5-tests)
+;;; hmac-md5-tests.el ends here