From 41d5059accbc2c95d6cfd6b19a4577cb2e516cad Mon Sep 17 00:00:00 2001
From: "Pierre R. Mai" <pmai@pmsf.de>
Date: Wed, 14 Sep 2016 17:37:59 +0200
Subject: [PATCH] Added testing with SHA3 test vectors from Keccak Code
 Package.

---
 README                | 10 ++++++++++
 keccak-reference.lisp | 22 +++++++++++++++++++++-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/README b/README
index 53ec22e..4f51147 100755
--- a/README
+++ b/README
@@ -133,6 +133,16 @@ The testcases from the Keccak test data can be run with the following
 form:
 
 (keccak:test-keccak-msgkat 
+ "/Path/To/MsgKatDirectory"
+ (lambda (total-bits bit-rate output-bits message)
+   (declare (ignore total-bits bit-rate))
+   (sha3:sha3-digest-vector message :output-bit-length output-bits :raw-keccak-p t)))
+
+The adapted SHA-3 testcases from the Keccak Code Package test vectors
+available under https://github.com/gvanas/KeccakCodePackage/tree/master/TestVectors
+can be run with the following form:
+
+(keccak:test-sha3-msgkat 
  "/Path/To/MsgKatDirectory"
  (lambda (total-bits bit-rate output-bits message)
    (declare (ignore total-bits bit-rate))
diff --git a/keccak-reference.lisp b/keccak-reference.lisp
index 27eac0d..3ab5d8c 100755
--- a/keccak-reference.lisp
+++ b/keccak-reference.lisp
@@ -36,7 +36,8 @@
            #:test-with-testsuite
            #:read-testsuite-from-file
            #:test-with-testsuite-from-file
-           #:test-keccak-msgkat))
+           #:test-keccak-msgkat
+           #:test-sha3-msgkat))
 
 (cl:in-package #:keccak-reference)
 
@@ -380,3 +381,22 @@
        (setq result nil))
         finally
      (return result)))
+
+(defun test-sha3-msgkat (directory &optional function)
+  (loop with result = t
+        for (filename total-bits bit-rate output-bits) in
+        '(("ShortMsgKAT_SHA3-224.txt" 1600 1152 224)
+          ("ShortMsgKAT_SHA3-256.txt" 1600 1088 256)
+          ("ShortMsgKAT_SHA3-384.txt" 1600  832 384)
+          ("ShortMsgKAT_SHA3-512.txt" 1600  576 512))
+        do
+     (unless
+         (test-with-testsuite-from-file
+          (merge-pathnames filename directory)
+          (if (null function)
+              (lambda (message) (keccak total-bits bit-rate output-bits message))
+              (lambda (message)
+                (funcall function total-bits bit-rate output-bits message))))
+       (setq result nil))
+        finally
+     (return result)))