Set resetOnDoFinal to false (#72)

KotlinCrypto · Feb 5, 2025 · 15e36f3 · 15e36f3
1 parent 56a1dcb
commit 15e36f3
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/library/blake2/src/commonMain/kotlin/org/kotlincrypto/macs/blake2/BLAKE2Mac.kt b/library/blake2/src/commonMain/kotlin/org/kotlincrypto/macs/blake2/BLAKE2Mac.kt
@@ -67,7 +67,7 @@ public sealed class BLAKE2Mac: Mac {
             bitStrength: Int,
             personalization: ByteArray?,
             factory: DigestFactory,
-        ): super(key) {
+        ): super(key, resetOnDoFinal = false) {
             this.bitStrength = bitStrength
             this.personalization = personalization?.copyOf()
             this.digest = factory.newInstance(
@@ -103,6 +103,8 @@ public sealed class BLAKE2Mac: Mac {
 
         override fun doFinalInto(dest: ByteArray, destOffset: Int) {
             digest.digestInto(dest, destOffset)
+            // resetOnDoFinal = false
+            digest.update(keyBlock)
         }
 
         override fun reset() {

diff --git a/library/hmac/hmac/src/commonMain/kotlin/org/kotlincrypto/macs/hmac/Hmac.kt b/library/hmac/hmac/src/commonMain/kotlin/org/kotlincrypto/macs/hmac/Hmac.kt
@@ -72,7 +72,7 @@ public abstract class Hmac: Mac {
         private val oKey: ByteArray
         private val digest: Digest
 
-        constructor(key: ByteArray, digest: Digest): super(key) {
+        constructor(key: ByteArray, digest: Digest): super(key, resetOnDoFinal = false) {
             this.digest = digest
             this.iKey = ByteArray(digest.blockSize())
             this.oKey = ByteArray(digest.blockSize())
@@ -101,6 +101,7 @@ public abstract class Hmac: Mac {
             digest.update(oKey)
             digest.update(inner)
             digest.digestInto(dest, destOffset)
+            digest.update(iKey)
         }
 
         override fun reset() {

diff --git a/library/kmac/src/commonMain/kotlin/org/kotlincrypto/macs/kmac/Kmac.kt b/library/kmac/src/commonMain/kotlin/org/kotlincrypto/macs/kmac/Kmac.kt
@@ -124,7 +124,10 @@ public sealed class Kmac: Mac, ReKeyableXofAlgorithm {
         override fun doFinalInto(dest: ByteArray, destOffset: Int) {
             padFinal()
             source.digestInto(dest, destOffset)
+            bytepad()
         }
+
+        override fun reset() { source.reset(); bytepad() }
     }
 
     private class XofEngine: Engine {
@@ -171,6 +174,8 @@ public sealed class Kmac: Mac, ReKeyableXofAlgorithm {
         // Never called. outputLength is 0, so.
         override fun doFinal(): ByteArray = ZERO_BYTES
 
+        override fun reset() { source.reset(); bytepad() }
+
         private companion object { private val ZERO_BYTES = ByteArray(0) }
     }
 
@@ -183,7 +188,11 @@ public sealed class Kmac: Mac, ReKeyableXofAlgorithm {
         private var initBlock: ByteArray
         private val outputLength: Int
 
-        constructor(key: ByteArray, bitStrength: Int, outputLength: Int): super(key) {
+        constructor(
+            key: ByteArray,
+            bitStrength: Int,
+            outputLength: Int,
+        ): super(key, resetOnDoFinal = false) {
             this.bitStrength = bitStrength
             this.outputLength = outputLength
 
@@ -227,7 +236,7 @@ public sealed class Kmac: Mac, ReKeyableXofAlgorithm {
 
         final override fun update(input: Byte) { source.update(input) }
         final override fun update(input: ByteArray, offset: Int, len: Int) { source.update(input, offset, len) }
-        final override fun reset() { (source as Resettable).reset(); bytepad() }
+
         final override fun reset(newKey: ByteArray) {
             val oldInitBlock = this.initBlock
             initBlock = newInitBlock(newKey, blockSize)

diff --git a/tools/testing/src/commonMain/kotlin/org/kotlincrypto/macs/MacUnitTest.kt b/tools/testing/src/commonMain/kotlin/org/kotlincrypto/macs/MacUnitTest.kt
@@ -80,6 +80,7 @@ abstract class MacUnitTest {
         val actual = mac.doFinal().hex()
         assertEquals(empty, actual)
         assertEquals(expectedResetSmallHash, actual)
+        assertEquals(expectedResetSmallHash, mac.doFinal().hex())
 
         updateSmall(mac)
         mac.reset()
@@ -100,6 +101,7 @@ abstract class MacUnitTest {
         val actual = mac.doFinal().hex()
         assertEquals(empty, actual)
         assertEquals(expectedResetMediumHash, actual)
+        assertEquals(expectedResetMediumHash, mac.doFinal().hex())
 
         updateSmall(mac)
         mac.reset()
@@ -120,6 +122,7 @@ abstract class MacUnitTest {
         val actual = mac.doFinal().hex()
         assertEquals(empty, actual)
         assertEquals(expectedResetLargeHash, actual)
+        assertEquals(expectedResetLargeHash, mac.doFinal().hex())
 
         updateSmall(mac)
         mac.reset()