Add keccak_NNN family functions

KECCAK-256 is needed by Ethereum, see following discussion for detail: ethereum/EIPs#59
dram · Sep 9, 2018 · 2855692 · 2855692
1 parent 59af8d1
commit 2855692
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 0 deletions.
diff --git a/sources/sha3.sig b/sources/sha3.sig
@@ -3,6 +3,11 @@ signature SHA3 = sig
         : (int * int * Word8Vector.vector * Word8.word * int)
           -> Word8Vector.vector
 
+    val keccak_224 : Word8Vector.vector -> Word8Vector.vector
+    val keccak_256 : Word8Vector.vector -> Word8Vector.vector
+    val keccak_384 : Word8Vector.vector -> Word8Vector.vector
+    val keccak_512 : Word8Vector.vector -> Word8Vector.vector
+
     val shake_128 : (Word8Vector.vector * int) -> Word8Vector.vector
     val shake_256 : (Word8Vector.vector * int) -> Word8Vector.vector
 

diff --git a/sources/sha3.sml b/sources/sha3.sml
@@ -252,6 +252,15 @@ fun keccak (rate : int,
     end
 end
 
+fun keccak_224 (inputBytes : Word8Vector.vector) : Word8Vector.vector =
+    keccak (1152, 448, inputBytes, 0wx01, 224 div 8)
+fun keccak_256 (inputBytes : Word8Vector.vector) : Word8Vector.vector =
+    keccak (1088, 512, inputBytes, 0wx01, 256 div 8)
+fun keccak_384 (inputBytes : Word8Vector.vector) : Word8Vector.vector =
+    keccak (832, 768, inputBytes, 0wx01, 384 div 8)
+fun keccak_512 (inputBytes : Word8Vector.vector) : Word8Vector.vector =
+    keccak (576, 1024, inputBytes, 0wx01, 512 div 8)
+
 fun shake_128 (inputBytes : Word8Vector.vector,
                outputByteLen : int) : Word8Vector.vector =
     keccak (1344, 256, inputBytes, 0wx1f, outputByteLen)

diff --git a/tests/main.sml b/tests/main.sml
@@ -15,6 +15,10 @@ fun main _ =
         val () = (printResult "value1"
                   o bytesToString) value1
 
+        val () = (printResult "value1 KECCAK-256"
+                  o bytesToString
+                  o Sha3.keccak_256) value1
+
         val () = (printResult "value1 SHA3-256"
                   o bytesToString
                   o Sha3.sha3_256) value1
@@ -24,6 +28,10 @@ fun main _ =
         val () = (printResult "value2"
                   o bytesToString) value2
 
+        val () = (printResult "value2 KECCAK-256"
+                  o bytesToString
+                  o Sha3.keccak_256) value2
+
         val () = (printResult "value2 SHA3-256"
                   o bytesToString
                   o Sha3.sha3_256) value2