Update kotlincrypto.core to latest SNAPSHOT (#93)

Author: 05nelsonm

gradle.properties

@@ -30,10 +30,10 @@ POM_DEVELOPER_ID=KotlinCrypto
 POM_DEVELOPER_NAME=Kotlin Crypto
 POM_DEVELOPER_URL=https://github.com/KotlinCrypto/
 
-VERSION_NAME=1.0.0-alpha01-SNAPSHOT
+VERSION_NAME=0.6.0-SNAPSHOT
 # 0.1.0-alpha01 = 00 01 00 11
 # 0.1.0-beta01  = 00 01 00 21
 # 0.1.0-rc01    = 00 01 00 31
 # 0.1.0         = 00 01 00 99
 # 1.1.0         = 01 01 00 99
-VERSION_CODE=01000011
+VERSION_CODE=00060011

gradle/libs.versions.toml

@@ -13,7 +13,7 @@ gradle-kotlin = "1.9.24"
 gradle-publish-maven = "0.29.0"
 
 kotlincrypto-bitops = "0.1.0-SNAPSHOT"
-kotlincrypto-core = "1.0.0-alpha01-SNAPSHOT"
+kotlincrypto-core = "0.6.0-SNAPSHOT"
 kotlincrypto-sponges = "0.3.4"
 
 [libraries]

library/md/src/commonMain/kotlin/org/kotlincrypto/hash/md/MD5.kt

@@ -31,12 +31,12 @@ public class MD5: Digest {
 
     public constructor(): super(
         algorithm = "MD5",
-        blockSize = 64,
+        blockSize = BLOCK_SIZE_64,
         digestLength = 16,
     ) {
         this.x = IntArray(16)
         this.state = H.copyOf()
-        this.count = Counter.Bit32(incrementBy = blockSize())
+        this.count = Counter.Bit32(incrementBy = BLOCK_SIZE_64)
     }
 
     private constructor(other: MD5): super(other) {
@@ -131,6 +131,8 @@ public class MD5: Digest {
     }
 
     private companion object {
+        private const val BLOCK_SIZE_64 = 64
+
         private val H = intArrayOf(1732584193, -271733879, -1732584194, 271733878)
 
         private val S = intArrayOf(

library/sha1/src/commonMain/kotlin/org/kotlincrypto/hash/sha1/SHA1.kt

@@ -30,12 +30,12 @@ public class SHA1: Digest {
 
     public constructor(): super(
         algorithm = "SHA-1",
-        blockSize = 64,
+        blockSize = BLOCK_SIZE_64,
         digestLength = 20,
     ) {
         this.x = IntArray(80)
         this.state = H.copyOf()
-        this.count = Counter.Bit32(incrementBy = blockSize())
+        this.count = Counter.Bit32(incrementBy = BLOCK_SIZE_64)
     }
 
     private constructor(other: SHA1): super(other) {
@@ -49,7 +49,7 @@ public class SHA1: Digest {
     protected override fun compressProtected(input: ByteArray, offset: Int) {
         val x = x
 
-        input.bePackIntoUnsafe(x, destOffset = 0, sourceIndexStart = offset, sourceIndexEnd = offset + blockSize())
+        input.bePackIntoUnsafe(x, destOffset = 0, sourceIndexStart = offset, sourceIndexEnd = offset + BLOCK_SIZE_64)
 
         for (i in 16..<80) {
             x[i] = (x[i - 3] xor x[i - 8] xor x[i - 14] xor x[i - 16]).rotateLeft(1)
@@ -141,6 +141,8 @@ public class SHA1: Digest {
     }
 
     private companion object {
+        private const val BLOCK_SIZE_64 = 64
+
         private val H = intArrayOf(1732584193, -271733879, -1732584194, 271733878, -1009589776)
     }
 }

library/sha2/src/commonMain/kotlin/org/kotlincrypto/hash/sha2/Bit32Digest.kt

@@ -34,13 +34,13 @@ public sealed class Bit32Digest: Digest {
     @Throws(IllegalArgumentException::class)
     protected constructor(d: Int, h: IntArray): super(
         algorithm = "SHA-$d",
-        blockSize = 64,
+        blockSize = BLOCK_SIZE_64,
         digestLength = d / 8,
     ) {
         this.h = h
-        this.x = IntArray(64)
+        this.x = IntArray(BLOCK_SIZE_64)
         this.state = h.copyOf()
-        this.count = Counter.Bit32(incrementBy = blockSize())
+        this.count = Counter.Bit32(incrementBy = BLOCK_SIZE_64)
     }
 
     protected constructor(other: Bit32Digest): super(other) {
@@ -55,7 +55,7 @@ public sealed class Bit32Digest: Digest {
     protected final override fun compressProtected(input: ByteArray, offset: Int) {
         val x = x
 
-        input.bePackIntoUnsafe(x, destOffset = 0, sourceIndexStart = offset, sourceIndexEnd = offset + blockSize())
+        input.bePackIntoUnsafe(x, destOffset = 0, sourceIndexStart = offset, sourceIndexEnd = offset + BLOCK_SIZE_64)
 
         for (i in 16..<64) {
             val x15 = x[i - 15]
@@ -151,6 +151,8 @@ public sealed class Bit32Digest: Digest {
     }
 
     private companion object {
+        private const val BLOCK_SIZE_64 = 64
+
         private val K = intArrayOf(
              1116352408,  1899447441, -1245643825,  -373957723,
               961987163,  1508970993, -1841331548, -1424204075,

library/sha2/src/commonMain/kotlin/org/kotlincrypto/hash/sha2/Bit64Digest.kt

@@ -41,7 +41,7 @@ public sealed class Bit64Digest: Digest {
         h: LongArray,
     ): super(
         algorithm = "SHA-$d" + (t?.let { "/$it" } ?: ""),
-        blockSize = 128,
+        blockSize = BLOCK_SIZE_128,
         digestLength = (t ?: d) / 8,
     ) {
         this.isInitialized = if (t != null) {
@@ -58,7 +58,7 @@ public sealed class Bit64Digest: Digest {
         this.h = h
         this.x = LongArray(80)
         this.state = h.copyOf()
-        this.count = Counter.Bit32(incrementBy = blockSize())
+        this.count = Counter.Bit32(incrementBy = BLOCK_SIZE_128)
 
         if (t == null) return
 
@@ -95,7 +95,7 @@ public sealed class Bit64Digest: Digest {
     protected final override fun compressProtected(input: ByteArray, offset: Int) {
         val x = x
 
-        input.bePackIntoUnsafe(x, destOffset = 0, sourceIndexStart = offset, sourceIndexEnd = offset + blockSize())
+        input.bePackIntoUnsafe(x, destOffset = 0, sourceIndexStart = offset, sourceIndexEnd = offset + BLOCK_SIZE_128)
 
         for (i in 16..<80) {
             val x15 = x[i - 15]
@@ -201,6 +201,8 @@ public sealed class Bit64Digest: Digest {
     }
 
     private companion object {
+        private const val BLOCK_SIZE_128 = 128
+
         private val K = longArrayOf(
              4794697086780616226L,  8158064640168781261L, -5349999486874862801L, -1606136188198331460L,
              4131703408338449720L,  6480981068601479193L, -7908458776815382629L, -6116909921290321640L,