From 8a2848e6e39a0cd1a533be823564adf658d2fbc2 Mon Sep 17 00:00:00 2001 From: Infendro Date: Mon, 1 Dec 2025 19:13:58 +0100 Subject: [PATCH] refactor hash functions --- .../kotlin/com/infendro/hash/keccak/Keccak.kt | 13 +- .../kotlin/com/infendro/hash/md/MD5.kt | 121 +++++++-------- .../kotlin/com/infendro/hash/sha1/SHA1.kt | 100 ++++++------ .../kotlin/com/infendro/hash/sha2/SHA-224.kt | 108 ++++++------- .../kotlin/com/infendro/hash/sha2/SHA-256.kt | 103 ++++++------- .../kotlin/com/infendro/hash/sha2/SHA-384.kt | 143 ++++++++--------- .../kotlin/com/infendro/hash/sha2/SHA-512.kt | 145 ++++++++---------- 7 files changed, 341 insertions(+), 392 deletions(-) diff --git a/src/commonMain/kotlin/com/infendro/hash/keccak/Keccak.kt b/src/commonMain/kotlin/com/infendro/hash/keccak/Keccak.kt index 27bdcb6..0c382eb 100644 --- a/src/commonMain/kotlin/com/infendro/hash/keccak/Keccak.kt +++ b/src/commonMain/kotlin/com/infendro/hash/keccak/Keccak.kt @@ -19,7 +19,7 @@ abstract class Keccak internal constructor( 0x000000000000008aUL, 0x0000000000000088UL, 0x0000000080008009UL, 0x000000008000000aUL, 0x000000008000808bUL, 0x800000000000008bUL, 0x8000000000008089UL, 0x8000000000008003UL, 0x8000000000008002UL, 0x8000000000000080UL, 0x000000000000800aUL, 0x800000008000000aUL, - 0x8000000080008081UL, 0x8000000000008080UL, 0x0000000080000001UL, 0x8000000080008008UL + 0x8000000080008081UL, 0x8000000000008080UL, 0x0000000080000001UL, 0x8000000080008008UL, ) private val rotation = arrayOf( @@ -33,6 +33,9 @@ abstract class Keccak internal constructor( override fun hash( value: UByteArray, ): UByteArray { + val state = ULongArray(25) + + // padding val paddedValue = buildList { addAll(value) add(domain) @@ -42,13 +45,11 @@ abstract class Keccak internal constructor( add(0x80U) } - val state = ULongArray(25) - // absorb - val chunks = paddedValue + val blocks = paddedValue .chunked(rate) { it.toUByteArray() } - for (chunk in chunks) { - val numbers = chunk.toULongArray(LITTLE_ENDIAN) + for (block in blocks) { + val numbers = block.toULongArray(LITTLE_ENDIAN) for ((i, number) in numbers.withIndex()) { state[i] = state[i] xor number } diff --git a/src/commonMain/kotlin/com/infendro/hash/md/MD5.kt b/src/commonMain/kotlin/com/infendro/hash/md/MD5.kt index 6d0a240..41dfa9c 100644 --- a/src/commonMain/kotlin/com/infendro/hash/md/MD5.kt +++ b/src/commonMain/kotlin/com/infendro/hash/md/MD5.kt @@ -12,26 +12,23 @@ object MD5 : HashFunction() { override val block: Int get() = 64 - private val s = intArrayOf( - 7, 12, 17, 22, - 7, 12, 17, 22, - 7, 12, 17, 22, - 7, 12, 17, 22, - 5, 9, 14, 20, - 5, 9, 14, 20, - 5, 9, 14, 20, - 5, 9, 14, 20, - 4, 11, 16, 23, - 4, 11, 16, 23, - 4, 11, 16, 23, - 4, 11, 16, 23, - 6, 10, 15, 21, - 6, 10, 15, 21, - 6, 10, 15, 21, - 6, 10, 15, 21, + private val initial = uintArrayOf( + 0x67452301U, 0xefcdab89U, + 0x98badcfeU, 0x10325476U, ) - private val k = uintArrayOf( + private val shifts = intArrayOf( + 7, 12, 17, 22, 7, 12, 17, 22, + 7, 12, 17, 22, 7, 12, 17, 22, + 5, 9, 14, 20, 5, 9, 14, 20, + 5, 9, 14, 20, 5, 9, 14, 20, + 4, 11, 16, 23, 4, 11, 16, 23, + 4, 11, 16, 23, 4, 11, 16, 23, + 6, 10, 15, 21, 6, 10, 15, 21, + 6, 10, 15, 21, 6, 10, 15, 21, + ) + + private val c = uintArrayOf( 0xd76aa478U, 0xe8c7b756U, 0x242070dbU, 0xc1bdceeeU, 0xf57c0fafU, 0x4787c62aU, 0xa8304613U, 0xfd469501U, 0x698098d8U, 0x8b44f7afU, 0xffff5bb1U, 0x895cd7beU, @@ -53,64 +50,58 @@ object MD5 : HashFunction() { override fun hash( value: UByteArray, ): UByteArray { - var a0 = 0x67452301U - var b0 = 0xefcdab89U - var c0 = 0x98badcfeU - var d0 = 0x10325476U - val ml = value.size.toULong() * 8UL + val h = initial.copyOf() + val l = value.size.toULong() * 8UL + // padding val paddedValue = buildList { addAll(value) add(0x80U) while (size % 64 != 56) { add(0x00U) } - addAll(ml.toUByteArray(LITTLE_ENDIAN)) + addAll(l.toUByteArray(LITTLE_ENDIAN)) } - val chunks = paddedValue + // process + val blocks = paddedValue .chunked(64) { it.toUByteArray() } - for (chunk in chunks) { - val w = buildList { - addAll(chunk.toUIntArray(LITTLE_ENDIAN)) - } - - var a = a0 - var b = b0 - var c = c0 - var d = d0 - - for (i in 0..<64) { - val f = when (i) { - in 0..15 -> (b and c) or (b.inv() and d) - in 16..31 -> (d and b) or (d.inv() and c) - in 32..47 -> b xor c xor d - else -> c xor (b or d.inv()) - } - val g = when (i) { - in 0..15 -> i - in 16..31 -> (5 * i + 1) % 16 - in 32..47 -> (3 * i + 5) % 16 - else -> (7 * i) % 16 - } - val temp = a - a = d - d = c - c = b - b += (temp + f + k[i] + w[g]).rotateLeft(s[i]) - } - - a0 += a - b0 += b - c0 += c - d0 += d + for (block in blocks) { + val w = block.toUIntArray(LITTLE_ENDIAN) + process(h, w) } - return ubyteArrayOf( - *a0.toUByteArray(LITTLE_ENDIAN), - *b0.toUByteArray(LITTLE_ENDIAN), - *c0.toUByteArray(LITTLE_ENDIAN), - *d0.toUByteArray(LITTLE_ENDIAN), - ) + return h.toUByteArray(LITTLE_ENDIAN) + } + + private fun process( + h: UIntArray, + w: UIntArray, + ) { + val v = h.copyOf() + + for (i in 0..<64) { + var f = when (i) { + in 0..15 -> (v[1] and v[2]) or (v[1].inv() and v[3]) + in 16..31 -> (v[3] and v[1]) or (v[3].inv() and v[2]) + in 32..47 -> v[1] xor v[2] xor v[3] + else -> v[2] xor (v[1] or v[3].inv()) + } + val g = when (i) { + in 0..15 -> i + in 16..31 -> (5 * i + 1) % 16 + in 32..47 -> (3 * i + 5) % 16 + else -> (7 * i) % 16 + } + f += v[0] + c[i] + w[g] + v[0] = v[3] + v[3] = v[2] + v[2] = v[1] + v[1] += f.rotateLeft(shifts[i]) + } + + for (i in 0..3) { + h[i] += v[i] + } } } diff --git a/src/commonMain/kotlin/com/infendro/hash/sha1/SHA1.kt b/src/commonMain/kotlin/com/infendro/hash/sha1/SHA1.kt index f49a26a..fe01ad3 100644 --- a/src/commonMain/kotlin/com/infendro/hash/sha1/SHA1.kt +++ b/src/commonMain/kotlin/com/infendro/hash/sha1/SHA1.kt @@ -11,76 +11,74 @@ object SHA1 : HashFunction() { override val block: Int get() = 64 + private val initial = uintArrayOf( + 0x67452301U, 0xefcdaB89U, + 0x98badcfeU, 0x10325476U, + 0xc3d2e1f0U, + ) + override fun hash( value: UByteArray, ): UByteArray { - var h0 = 0x67452301U - var h1 = 0xefcdaB89U - var h2 = 0x98badcfeU - var h3 = 0x10325476U - var h4 = 0xc3d2e1f0U - val ml = value.size.toULong() * 8UL + val h = initial.copyOf() + val l = value.size.toULong() * 8UL + // padding val paddedValue = buildList { addAll(value) add(0x80U) while (size % 64 != 56) { add(0x00U) } - addAll(ml.toUByteArray()) + addAll(l.toUByteArray()) } - val chunks = paddedValue + // process + val blocks = paddedValue .chunked(64) { it.toUByteArray() } - for (chunk in chunks) { + for (block in blocks) { val w = buildList { - addAll(chunk.toUIntArray()) + addAll(block.toUIntArray()) for (i in 16..<80) { val word = (get(i - 3) xor get(i - 8) xor get(i - 14) xor get(i - 16)).rotateLeft(1) add(word) } - } - - var a = h0 - var b = h1 - var c = h2 - var d = h3 - var e = h4 - - for (i in 0..<80) { - val f = when (i) { - in 0..<20 -> (b and c) or (b.inv() and d) - in 20..<40 -> b xor c xor d - in 40..<60 -> (b and c) or (b and d) or (c and d) - else -> b xor c xor d - } - val k = when (i) { - in 0..<20 -> 0x5a827999U - in 20..<40 -> 0x6ed9eba1U - in 40..<60 -> 0x8f1bbcdcU - else -> 0xca62c1d6U - } - val temp = a.rotateLeft(5) + f + e + k + w[i] - e = d - d = c - c = b.rotateLeft(30) - b = a - a = temp - } - - h0 += a - h1 += b - h2 += c - h3 += d - h4 += e + }.toUIntArray() + process(h, w) } - return ubyteArrayOf( - *h0.toUByteArray(), - *h1.toUByteArray(), - *h2.toUByteArray(), - *h3.toUByteArray(), - *h4.toUByteArray(), - ) + return h.toUByteArray() + } + + private fun process( + h: UIntArray, + w: UIntArray, + ) { + val v = h.copyOf() + + for (i in 0..<80) { + val f = when (i) { + in 0..<20 -> (v[1] and v[2]) or (v[1].inv() and v[3]) + in 20..<40 -> v[1] xor v[2] xor v[3] + in 40..<60 -> (v[1] and v[2]) or (v[1] and v[3]) or (v[2] and v[3]) + else -> v[1] xor v[2] xor v[3] + } + val k = when (i) { + in 0..<20 -> 0x5a827999U + in 20..<40 -> 0x6ed9eba1U + in 40..<60 -> 0x8f1bbcdcU + else -> 0xca62c1d6U + } + val temp = v[0].rotateLeft(5) + f + v[4] + k + w[i] + v[4] = v[3] + v[3] = v[2] + v[2] = v[1].rotateLeft(30) + v[1] = v[0] + v[0] = temp + } + + for (i in 0..4) { + h[i] += v[i] + } } } diff --git a/src/commonMain/kotlin/com/infendro/hash/sha2/SHA-224.kt b/src/commonMain/kotlin/com/infendro/hash/sha2/SHA-224.kt index 823ca22..1b982d8 100644 --- a/src/commonMain/kotlin/com/infendro/hash/sha2/SHA-224.kt +++ b/src/commonMain/kotlin/com/infendro/hash/sha2/SHA-224.kt @@ -11,7 +11,14 @@ object `SHA-224` : HashFunction() { override val block: Int get() = 64 - private val k = uintArrayOf( + private val initial = uintArrayOf( + 0xc1059ed8U, 0x367cd507U, + 0x3070dd17U, 0xf70e5939U, + 0xffc00b31U, 0x68581511U, + 0x64f98fa7U, 0xbefa4fa4U, + ) + + private val c = uintArrayOf( 0x428a2f98U, 0x71374491U, 0xb5c0fbcfU, 0xe9b5dba5U, 0x3956c25bU, 0x59f111f1U, 0x923f82a4U, 0xab1c5ed5U, 0xd807aa98U, 0x12835b01U, 0x243185beU, 0x550c7dc3U, 0x72be5d74U, 0x80deb1feU, 0x9bdc06a7U, 0xc19bf174U, 0xe49b69c1U, 0xefbe4786U, 0x0fc19dc6U, 0x240ca1ccU, 0x2de92c6fU, 0x4a7484aaU, 0x5cb0a9dcU, 0x76f988daU, @@ -25,82 +32,63 @@ object `SHA-224` : HashFunction() { override fun hash( value: UByteArray, ): UByteArray { - var h0 = 0xc1059ed8U - var h1 = 0x367cd507U - var h2 = 0x3070dd17U - var h3 = 0xf70e5939U - var h4 = 0xffc00b31U - var h5 = 0x68581511U - var h6 = 0x64f98fa7U - var h7 = 0xbefa4fa4U - val ml = value.size.toULong() * 8UL + val h = initial.copyOf() + val l = value.size.toULong() * 8UL + // padding val paddedValue = buildList { addAll(value) add(0x80U) while (size % 64 != 56) { add(0x00U) } - addAll(ml.toUByteArray()) + addAll(l.toUByteArray()) } - val chunks = paddedValue + // process + val blocks = paddedValue .chunked(64) { it.toUByteArray() } - for (chunk in chunks) { + for (block in blocks) { val w = buildList { - addAll(chunk.toUIntArray()) + addAll(block.toUIntArray()) for (i in 16..<64) { val s0 = get(i - 15).rotateRight(7) xor get(i - 15).rotateRight(18) xor (get(i - 15) shr 3) val s1 = get(i - 2).rotateRight(17) xor get(i - 2).rotateRight(19) xor (get(i - 2) shr 10) add(get(i - 16) + s0 + get(i - 7) + s1) } - } - - var a = h0 - var b = h1 - var c = h2 - var d = h3 - var e = h4 - var f = h5 - var g = h6 - var h = h7 - - for (i in 0..<64) { - val s0 = a.rotateRight(2) xor a.rotateRight(13) xor a.rotateRight(22) - val s1 = e.rotateRight(6) xor e.rotateRight(11) xor e.rotateRight(25) - val ch = (e and f) xor (e.inv() and g) - val temp1 = h + s1 + ch + k[i] + w[i] - val maj = (a and b) xor (a and c) xor (b and c) - val temp2 = s0 + maj - - h = g - g = f - f = e - e = d + temp1 - d = c - c = b - b = a - a = temp1 + temp2 - } - - h0 += a - h1 += b - h2 += c - h3 += d - h4 += e - h5 += f - h6 += g - h7 += h + }.toUIntArray() + process(h, w) } - return ubyteArrayOf( - *h0.toUByteArray(), - *h1.toUByteArray(), - *h2.toUByteArray(), - *h3.toUByteArray(), - *h4.toUByteArray(), - *h5.toUByteArray(), - *h6.toUByteArray(), - ) + return h.sliceArray(0..6).toUByteArray() + } + + private fun process( + h: UIntArray, + w: UIntArray, + ) { + val v = h.copyOf() + + for (i in 0..<64) { + val s0 = v[0].rotateRight(2) xor v[0].rotateRight(13) xor v[0].rotateRight(22) + val s1 = v[4].rotateRight(6) xor v[4].rotateRight(11) xor v[4].rotateRight(25) + val ch = (v[4] and v[5]) xor (v[4].inv() and v[6]) + val temp1 = v[7] + s1 + ch + this.c[i] + w[i] + val maj = (v[0] and v[1]) xor (v[0] and v[2]) xor (v[1] and v[2]) + val temp2 = s0 + maj + + v[7] = v[6] + v[6] = v[5] + v[5] = v[4] + v[4] = v[3] + temp1 + v[3] = v[2] + v[2] = v[1] + v[1] = v[0] + v[0] = temp1 + temp2 + } + + for (i in 0..7) { + h[i] += v[i] + } } } diff --git a/src/commonMain/kotlin/com/infendro/hash/sha2/SHA-256.kt b/src/commonMain/kotlin/com/infendro/hash/sha2/SHA-256.kt index 10239b9..c41c83e 100644 --- a/src/commonMain/kotlin/com/infendro/hash/sha2/SHA-256.kt +++ b/src/commonMain/kotlin/com/infendro/hash/sha2/SHA-256.kt @@ -11,7 +11,14 @@ object `SHA-256` : HashFunction() { override val block: Int get() = 64 - private val k = uintArrayOf( + private val initial = uintArrayOf( + 0x6a09e667U, 0xbb67ae85U, + 0x3c6ef372U, 0xa54ff53aU, + 0x510e527fU, 0x9b05688cU, + 0x1f83d9abU, 0x5be0cd19U, + ) + + private val c = uintArrayOf( 0x428a2f98U, 0x71374491U, 0xb5c0fbcfU, 0xe9b5dba5U, 0x3956c25bU, 0x59f111f1U, 0x923f82a4U, 0xab1c5ed5U, 0xd807aa98U, 0x12835b01U, 0x243185beU, 0x550c7dc3U, 0x72be5d74U, 0x80deb1feU, 0x9bdc06a7U, 0xc19bf174U, 0xe49b69c1U, 0xefbe4786U, 0x0fc19dc6U, 0x240ca1ccU, 0x2de92c6fU, 0x4a7484aaU, 0x5cb0a9dcU, 0x76f988daU, @@ -25,25 +32,20 @@ object `SHA-256` : HashFunction() { override fun hash( value: UByteArray, ): UByteArray { - var h0 = 0x6a09e667U - var h1 = 0xbb67ae85U - var h2 = 0x3c6ef372U - var h3 = 0xa54ff53aU - var h4 = 0x510e527fU - var h5 = 0x9b05688cU - var h6 = 0x1f83d9abU - var h7 = 0x5be0cd19U - val ml = value.size.toULong() * 8UL + val h = initial.copyOf() + val l = value.size.toULong() * 8UL + // padding val paddedValue = buildList { addAll(value) add(0x80U) while (size % 64 != 56) { add(0x00U) } - addAll(ml.toUByteArray()) + addAll(l.toUByteArray()) } + // process val chunks = paddedValue .chunked(64) { it.toUByteArray() } for (chunk in chunks) { @@ -54,54 +56,39 @@ object `SHA-256` : HashFunction() { val s1 = get(i - 2).rotateRight(17) xor get(i - 2).rotateRight(19) xor (get(i - 2) shr 10) add(get(i - 16) + s0 + get(i - 7) + s1) } - } - - var a = h0 - var b = h1 - var c = h2 - var d = h3 - var e = h4 - var f = h5 - var g = h6 - var h = h7 - - for (i in 0..<64) { - val s0 = a.rotateRight(2) xor a.rotateRight(13) xor a.rotateRight(22) - val s1 = e.rotateRight(6) xor e.rotateRight(11) xor e.rotateRight(25) - val ch = (e and f) xor (e.inv() and g) - val temp1 = h + s1 + ch + k[i] + w[i] - val maj = (a and b) xor (a and c) xor (b and c) - val temp2 = s0 + maj - - h = g - g = f - f = e - e = d + temp1 - d = c - c = b - b = a - a = temp1 + temp2 - } - - h0 += a - h1 += b - h2 += c - h3 += d - h4 += e - h5 += f - h6 += g - h7 += h + }.toUIntArray() + process(h, w) } - return ubyteArrayOf( - *h0.toUByteArray(), - *h1.toUByteArray(), - *h2.toUByteArray(), - *h3.toUByteArray(), - *h4.toUByteArray(), - *h5.toUByteArray(), - *h6.toUByteArray(), - *h7.toUByteArray(), - ) + return h.toUByteArray() + } + + private fun process( + h: UIntArray, + w: UIntArray, + ) { + val v = h.copyOf() + + for (i in 0..<64) { + val s0 = v[0].rotateRight(2) xor v[0].rotateRight(13) xor v[0].rotateRight(22) + val s1 = v[4].rotateRight(6) xor v[4].rotateRight(11) xor v[4].rotateRight(25) + val ch = (v[4] and v[5]) xor (v[4].inv() and v[6]) + val temp1 = v[7] + s1 + ch + this.c[i] + w[i] + val maj = (v[0] and v[1]) xor (v[0] and v[2]) xor (v[1] and v[2]) + val temp2 = s0 + maj + + v[7] = v[6] + v[6] = v[5] + v[5] = v[4] + v[4] = v[3] + temp1 + v[3] = v[2] + v[2] = v[1] + v[1] = v[0] + v[0] = temp1 + temp2 + } + + for (i in 0..7) { + h[i] += v[i] + } } } diff --git a/src/commonMain/kotlin/com/infendro/hash/sha2/SHA-384.kt b/src/commonMain/kotlin/com/infendro/hash/sha2/SHA-384.kt index 90b8fff..20c9d49 100644 --- a/src/commonMain/kotlin/com/infendro/hash/sha2/SHA-384.kt +++ b/src/commonMain/kotlin/com/infendro/hash/sha2/SHA-384.kt @@ -11,103 +11,96 @@ object `SHA-384` : HashFunction() { override val block: Int get() = 128 - private val k = ulongArrayOf( - 0x428a2f98d728ae22UL, 0x7137449123ef65cdUL, 0xb5c0fbcfec4d3b2fUL, 0xe9b5dba58189dbbcUL, 0x3956c25bf348b538UL, - 0x59f111f1b605d019UL, 0x923f82a4af194f9bUL, 0xab1c5ed5da6d8118UL, 0xd807aa98a3030242UL, 0x12835b0145706fbeUL, - 0x243185be4ee4b28cUL, 0x550c7dc3d5ffb4e2UL, 0x72be5d74f27b896fUL, 0x80deb1fe3b1696b1UL, 0x9bdc06a725c71235UL, - 0xc19bf174cf692694UL, 0xe49b69c19ef14ad2UL, 0xefbe4786384f25e3UL, 0x0fc19dc68b8cd5b5UL, 0x240ca1cc77ac9c65UL, - 0x2de92c6f592b0275UL, 0x4a7484aa6ea6e483UL, 0x5cb0a9dcbd41fbd4UL, 0x76f988da831153b5UL, 0x983e5152ee66dfabUL, - 0xa831c66d2db43210UL, 0xb00327c898fb213fUL, 0xbf597fc7beef0ee4UL, 0xc6e00bf33da88fc2UL, 0xd5a79147930aa725UL, - 0x06ca6351e003826fUL, 0x142929670a0e6e70UL, 0x27b70a8546d22ffcUL, 0x2e1b21385c26c926UL, 0x4d2c6dfc5ac42aedUL, - 0x53380d139d95b3dfUL, 0x650a73548baf63deUL, 0x766a0abb3c77b2a8UL, 0x81c2c92e47edaee6UL, 0x92722c851482353bUL, - 0xa2bfe8a14cf10364UL, 0xa81a664bbc423001UL, 0xc24b8b70d0f89791UL, 0xc76c51a30654be30UL, 0xd192e819d6ef5218UL, - 0xd69906245565a910UL, 0xf40e35855771202aUL, 0x106aa07032bbd1b8UL, 0x19a4c116b8d2d0c8UL, 0x1e376c085141ab53UL, - 0x2748774cdf8eeb99UL, 0x34b0bcb5e19b48a8UL, 0x391c0cb3c5c95a63UL, 0x4ed8aa4ae3418acbUL, 0x5b9cca4f7763e373UL, - 0x682e6ff3d6b2b8a3UL, 0x748f82ee5defb2fcUL, 0x78a5636f43172f60UL, 0x84c87814a1f0ab72UL, 0x8cc702081a6439ecUL, - 0x90befffa23631e28UL, 0xa4506cebde82bde9UL, 0xbef9a3f7b2c67915UL, 0xc67178f2e372532bUL, 0xca273eceea26619cUL, - 0xd186b8c721c0c207UL, 0xeada7dd6cde0eb1eUL, 0xf57d4f7fee6ed178UL, 0x06f067aa72176fbaUL, 0x0a637dc5a2c898a6UL, - 0x113f9804bef90daeUL, 0x1b710b35131c471bUL, 0x28db77f523047d84UL, 0x32caab7b40c72493UL, 0x3c9ebe0a15c9bebcUL, - 0x431d67c49c100d4cUL, 0x4cc5d4becb3e42b6UL, 0x597f299cfc657e2aUL, 0x5fcb6fab3ad6faecUL, 0x6c44198c4a475817UL, + private val initial = ulongArrayOf( + 0xcbbb9d5dc1059ed8UL, 0x629a292a367cd507UL, + 0x9159015a3070dd17UL, 0x152fecd8f70e5939UL, + 0x67332667ffc00b31UL, 0x8eb44a8768581511UL, + 0xdb0c2e0d64f98fa7UL, 0x47b5481dbefa4fa4UL, + ) + + private val c = ulongArrayOf( + 0x428a2f98d728ae22UL, 0x7137449123ef65cdUL, 0xb5c0fbcfec4d3b2fUL, 0xe9b5dba58189dbbcUL, + 0x3956c25bf348b538UL, 0x59f111f1b605d019UL, 0x923f82a4af194f9bUL, 0xab1c5ed5da6d8118UL, + 0xd807aa98a3030242UL, 0x12835b0145706fbeUL, 0x243185be4ee4b28cUL, 0x550c7dc3d5ffb4e2UL, + 0x72be5d74f27b896fUL, 0x80deb1fe3b1696b1UL, 0x9bdc06a725c71235UL, 0xc19bf174cf692694UL, + 0xe49b69c19ef14ad2UL, 0xefbe4786384f25e3UL, 0x0fc19dc68b8cd5b5UL, 0x240ca1cc77ac9c65UL, + 0x2de92c6f592b0275UL, 0x4a7484aa6ea6e483UL, 0x5cb0a9dcbd41fbd4UL, 0x76f988da831153b5UL, + 0x983e5152ee66dfabUL, 0xa831c66d2db43210UL, 0xb00327c898fb213fUL, 0xbf597fc7beef0ee4UL, + 0xc6e00bf33da88fc2UL, 0xd5a79147930aa725UL, 0x06ca6351e003826fUL, 0x142929670a0e6e70UL, + 0x27b70a8546d22ffcUL, 0x2e1b21385c26c926UL, 0x4d2c6dfc5ac42aedUL, 0x53380d139d95b3dfUL, + 0x650a73548baf63deUL, 0x766a0abb3c77b2a8UL, 0x81c2c92e47edaee6UL, 0x92722c851482353bUL, + 0xa2bfe8a14cf10364UL, 0xa81a664bbc423001UL, 0xc24b8b70d0f89791UL, 0xc76c51a30654be30UL, + 0xd192e819d6ef5218UL, 0xd69906245565a910UL, 0xf40e35855771202aUL, 0x106aa07032bbd1b8UL, + 0x19a4c116b8d2d0c8UL, 0x1e376c085141ab53UL, 0x2748774cdf8eeb99UL, 0x34b0bcb5e19b48a8UL, + 0x391c0cb3c5c95a63UL, 0x4ed8aa4ae3418acbUL, 0x5b9cca4f7763e373UL, 0x682e6ff3d6b2b8a3UL, + 0x748f82ee5defb2fcUL, 0x78a5636f43172f60UL, 0x84c87814a1f0ab72UL, 0x8cc702081a6439ecUL, + 0x90befffa23631e28UL, 0xa4506cebde82bde9UL, 0xbef9a3f7b2c67915UL, 0xc67178f2e372532bUL, + 0xca273eceea26619cUL, 0xd186b8c721c0c207UL, 0xeada7dd6cde0eb1eUL, 0xf57d4f7fee6ed178UL, + 0x06f067aa72176fbaUL, 0x0a637dc5a2c898a6UL, 0x113f9804bef90daeUL, 0x1b710b35131c471bUL, + 0x28db77f523047d84UL, 0x32caab7b40c72493UL, 0x3c9ebe0a15c9bebcUL, 0x431d67c49c100d4cUL, + 0x4cc5d4becb3e42b6UL, 0x597f299cfc657e2aUL, 0x5fcb6fab3ad6faecUL, 0x6c44198c4a475817UL, ) override fun hash( value: UByteArray, ): UByteArray { - var h0 = 0xcbbb9d5dc1059ed8UL - var h1 = 0x629a292a367cd507UL - var h2 = 0x9159015a3070dd17UL - var h3 = 0x152fecd8f70e5939UL - var h4 = 0x67332667ffc00b31UL - var h5 = 0x8eb44a8768581511UL - var h6 = 0xdb0c2e0d64f98fa7UL - var h7 = 0x47b5481dbefa4fa4UL - val ml = value.size.toULong() * 8UL + val h = initial.copyOf() + val l = value.size.toULong() * 8UL + // padding val paddedValue = buildList { addAll(value) add(0x80U) while (size % 128 != 120) { add(0x00U) } - addAll(ml.toUByteArray()) + addAll(l.toUByteArray()) } - val chunks = paddedValue + // process + val blocks = paddedValue .chunked(128) { it.toUByteArray() } - for (chunk in chunks) { + for (block in blocks) { val w = buildList { - addAll(chunk.toULongArray()) + addAll(block.toULongArray()) for (i in 16..<80) { val s0 = get(i - 15).rotateRight(1) xor get(i - 15).rotateRight(8) xor (get(i - 15) shr 7) val s1 = get(i - 2).rotateRight(19) xor get(i - 2).rotateRight(61) xor (get(i - 2) shr 6) add(get(i - 16) + s0 + get(i - 7) + s1) } - } - - var a = h0 - var b = h1 - var c = h2 - var d = h3 - var e = h4 - var f = h5 - var g = h6 - var h = h7 - - for (i in 0..<80) { - val s0 = a.rotateRight(28) xor a.rotateRight(34) xor a.rotateRight(39) - val s1 = e.rotateRight(14) xor e.rotateRight(18) xor e.rotateRight(41) - val ch = (e and f) xor (e.inv() and g) - val temp1 = h + s1 + ch + k[i] + w[i] - val maj = (a and b) xor (a and c) xor (b and c) - val temp2 = s0 + maj - - h = g - g = f - f = e - e = d + temp1 - d = c - c = b - b = a - a = temp1 + temp2 - } - - h0 += a - h1 += b - h2 += c - h3 += d - h4 += e - h5 += f - h6 += g - h7 += h + }.toULongArray() + process(h, w) } - return ubyteArrayOf( - *h0.toUByteArray(), - *h1.toUByteArray(), - *h2.toUByteArray(), - *h3.toUByteArray(), - *h4.toUByteArray(), - *h5.toUByteArray(), - ) + return h.sliceArray(0..5).toUByteArray() + } + + private fun process( + h: ULongArray, + w: ULongArray, + ) { + val v = h.copyOf() + + for (i in 0..<80) { + val s0 = v[0].rotateRight(28) xor v[0].rotateRight(34) xor v[0].rotateRight(39) + val s1 = v[4].rotateRight(14) xor v[4].rotateRight(18) xor v[4].rotateRight(41) + val ch = (v[4] and v[5]) xor (v[4].inv() and v[6]) + val temp1 = v[7] + s1 + ch + this.c[i] + w[i] + val maj = (v[0] and v[1]) xor (v[0] and v[2]) xor (v[1] and v[2]) + val temp2 = s0 + maj + + v[7] = v[6] + v[6] = v[5] + v[5] = v[4] + v[4] = v[3] + temp1 + v[3] = v[2] + v[2] = v[1] + v[1] = v[0] + v[0] = temp1 + temp2 + } + + for (i in 0..7) { + h[i] += v[i] + } } } diff --git a/src/commonMain/kotlin/com/infendro/hash/sha2/SHA-512.kt b/src/commonMain/kotlin/com/infendro/hash/sha2/SHA-512.kt index 7cfc5e9..f7137fd 100644 --- a/src/commonMain/kotlin/com/infendro/hash/sha2/SHA-512.kt +++ b/src/commonMain/kotlin/com/infendro/hash/sha2/SHA-512.kt @@ -11,105 +11,96 @@ object `SHA-512` : HashFunction() { override val block: Int get() = 128 - private val k = ulongArrayOf( - 0x428a2f98d728ae22UL, 0x7137449123ef65cdUL, 0xb5c0fbcfec4d3b2fUL, 0xe9b5dba58189dbbcUL, 0x3956c25bf348b538UL, - 0x59f111f1b605d019UL, 0x923f82a4af194f9bUL, 0xab1c5ed5da6d8118UL, 0xd807aa98a3030242UL, 0x12835b0145706fbeUL, - 0x243185be4ee4b28cUL, 0x550c7dc3d5ffb4e2UL, 0x72be5d74f27b896fUL, 0x80deb1fe3b1696b1UL, 0x9bdc06a725c71235UL, - 0xc19bf174cf692694UL, 0xe49b69c19ef14ad2UL, 0xefbe4786384f25e3UL, 0x0fc19dc68b8cd5b5UL, 0x240ca1cc77ac9c65UL, - 0x2de92c6f592b0275UL, 0x4a7484aa6ea6e483UL, 0x5cb0a9dcbd41fbd4UL, 0x76f988da831153b5UL, 0x983e5152ee66dfabUL, - 0xa831c66d2db43210UL, 0xb00327c898fb213fUL, 0xbf597fc7beef0ee4UL, 0xc6e00bf33da88fc2UL, 0xd5a79147930aa725UL, - 0x06ca6351e003826fUL, 0x142929670a0e6e70UL, 0x27b70a8546d22ffcUL, 0x2e1b21385c26c926UL, 0x4d2c6dfc5ac42aedUL, - 0x53380d139d95b3dfUL, 0x650a73548baf63deUL, 0x766a0abb3c77b2a8UL, 0x81c2c92e47edaee6UL, 0x92722c851482353bUL, - 0xa2bfe8a14cf10364UL, 0xa81a664bbc423001UL, 0xc24b8b70d0f89791UL, 0xc76c51a30654be30UL, 0xd192e819d6ef5218UL, - 0xd69906245565a910UL, 0xf40e35855771202aUL, 0x106aa07032bbd1b8UL, 0x19a4c116b8d2d0c8UL, 0x1e376c085141ab53UL, - 0x2748774cdf8eeb99UL, 0x34b0bcb5e19b48a8UL, 0x391c0cb3c5c95a63UL, 0x4ed8aa4ae3418acbUL, 0x5b9cca4f7763e373UL, - 0x682e6ff3d6b2b8a3UL, 0x748f82ee5defb2fcUL, 0x78a5636f43172f60UL, 0x84c87814a1f0ab72UL, 0x8cc702081a6439ecUL, - 0x90befffa23631e28UL, 0xa4506cebde82bde9UL, 0xbef9a3f7b2c67915UL, 0xc67178f2e372532bUL, 0xca273eceea26619cUL, - 0xd186b8c721c0c207UL, 0xeada7dd6cde0eb1eUL, 0xf57d4f7fee6ed178UL, 0x06f067aa72176fbaUL, 0x0a637dc5a2c898a6UL, - 0x113f9804bef90daeUL, 0x1b710b35131c471bUL, 0x28db77f523047d84UL, 0x32caab7b40c72493UL, 0x3c9ebe0a15c9bebcUL, - 0x431d67c49c100d4cUL, 0x4cc5d4becb3e42b6UL, 0x597f299cfc657e2aUL, 0x5fcb6fab3ad6faecUL, 0x6c44198c4a475817UL, + private val initial = ulongArrayOf( + 0x6a09e667f3bcc908UL, 0xbb67ae8584caa73bUL, + 0x3c6ef372fe94f82bUL, 0xa54ff53a5f1d36f1UL, + 0x510e527fade682d1UL, 0x9b05688c2b3e6c1fUL, + 0x1f83d9abfb41bd6bUL, 0x5be0cd19137e2179UL, + ) + + private val c = ulongArrayOf( + 0x428a2f98d728ae22UL, 0x7137449123ef65cdUL, 0xb5c0fbcfec4d3b2fUL, 0xe9b5dba58189dbbcUL, + 0x3956c25bf348b538UL, 0x59f111f1b605d019UL, 0x923f82a4af194f9bUL, 0xab1c5ed5da6d8118UL, + 0xd807aa98a3030242UL, 0x12835b0145706fbeUL, 0x243185be4ee4b28cUL, 0x550c7dc3d5ffb4e2UL, + 0x72be5d74f27b896fUL, 0x80deb1fe3b1696b1UL, 0x9bdc06a725c71235UL, 0xc19bf174cf692694UL, + 0xe49b69c19ef14ad2UL, 0xefbe4786384f25e3UL, 0x0fc19dc68b8cd5b5UL, 0x240ca1cc77ac9c65UL, + 0x2de92c6f592b0275UL, 0x4a7484aa6ea6e483UL, 0x5cb0a9dcbd41fbd4UL, 0x76f988da831153b5UL, + 0x983e5152ee66dfabUL, 0xa831c66d2db43210UL, 0xb00327c898fb213fUL, 0xbf597fc7beef0ee4UL, + 0xc6e00bf33da88fc2UL, 0xd5a79147930aa725UL, 0x06ca6351e003826fUL, 0x142929670a0e6e70UL, + 0x27b70a8546d22ffcUL, 0x2e1b21385c26c926UL, 0x4d2c6dfc5ac42aedUL, 0x53380d139d95b3dfUL, + 0x650a73548baf63deUL, 0x766a0abb3c77b2a8UL, 0x81c2c92e47edaee6UL, 0x92722c851482353bUL, + 0xa2bfe8a14cf10364UL, 0xa81a664bbc423001UL, 0xc24b8b70d0f89791UL, 0xc76c51a30654be30UL, + 0xd192e819d6ef5218UL, 0xd69906245565a910UL, 0xf40e35855771202aUL, 0x106aa07032bbd1b8UL, + 0x19a4c116b8d2d0c8UL, 0x1e376c085141ab53UL, 0x2748774cdf8eeb99UL, 0x34b0bcb5e19b48a8UL, + 0x391c0cb3c5c95a63UL, 0x4ed8aa4ae3418acbUL, 0x5b9cca4f7763e373UL, 0x682e6ff3d6b2b8a3UL, + 0x748f82ee5defb2fcUL, 0x78a5636f43172f60UL, 0x84c87814a1f0ab72UL, 0x8cc702081a6439ecUL, + 0x90befffa23631e28UL, 0xa4506cebde82bde9UL, 0xbef9a3f7b2c67915UL, 0xc67178f2e372532bUL, + 0xca273eceea26619cUL, 0xd186b8c721c0c207UL, 0xeada7dd6cde0eb1eUL, 0xf57d4f7fee6ed178UL, + 0x06f067aa72176fbaUL, 0x0a637dc5a2c898a6UL, 0x113f9804bef90daeUL, 0x1b710b35131c471bUL, + 0x28db77f523047d84UL, 0x32caab7b40c72493UL, 0x3c9ebe0a15c9bebcUL, 0x431d67c49c100d4cUL, + 0x4cc5d4becb3e42b6UL, 0x597f299cfc657e2aUL, 0x5fcb6fab3ad6faecUL, 0x6c44198c4a475817UL, ) override fun hash( value: UByteArray, ): UByteArray { - var h0 = 0x6a09e667f3bcc908UL - var h1 = 0xbb67ae8584caa73bUL - var h2 = 0x3c6ef372fe94f82bUL - var h3 = 0xa54ff53a5f1d36f1UL - var h4 = 0x510e527fade682d1UL - var h5 = 0x9b05688c2b3e6c1fUL - var h6 = 0x1f83d9abfb41bd6bUL - var h7 = 0x5be0cd19137e2179UL - val ml = value.size.toULong() * 8UL + val h = initial.copyOf() + val l = value.size.toULong() * 8UL + // padding val paddedValue = buildList { addAll(value) add(0x80U) while (size % 128 != 120) { add(0x00U) } - addAll(ml.toUByteArray()) + addAll(l.toUByteArray()) } - val chunks = paddedValue + // process + val blocks = paddedValue .chunked(128) { it.toUByteArray() } - for (chunk in chunks) { + for (block in blocks) { val w = buildList { - addAll(chunk.toULongArray()) + addAll(block.toULongArray()) for (i in 16..<80) { val s0 = get(i - 15).rotateRight(1) xor get(i - 15).rotateRight(8) xor (get(i - 15) shr 7) val s1 = get(i - 2).rotateRight(19) xor get(i - 2).rotateRight(61) xor (get(i - 2) shr 6) add(get(i - 16) + s0 + get(i - 7) + s1) } - } - - var a = h0 - var b = h1 - var c = h2 - var d = h3 - var e = h4 - var f = h5 - var g = h6 - var h = h7 - - for (i in 0..<80) { - val s0 = a.rotateRight(28) xor a.rotateRight(34) xor a.rotateRight(39) - val s1 = e.rotateRight(14) xor e.rotateRight(18) xor e.rotateRight(41) - val ch = (e and f) xor (e.inv() and g) - val temp1 = h + s1 + ch + k[i] + w[i] - val maj = (a and b) xor (a and c) xor (b and c) - val temp2 = s0 + maj - - h = g - g = f - f = e - e = d + temp1 - d = c - c = b - b = a - a = temp1 + temp2 - } - - h0 += a - h1 += b - h2 += c - h3 += d - h4 += e - h5 += f - h6 += g - h7 += h + }.toULongArray() + process(h, w) } - return ubyteArrayOf( - *h0.toUByteArray(), - *h1.toUByteArray(), - *h2.toUByteArray(), - *h3.toUByteArray(), - *h4.toUByteArray(), - *h5.toUByteArray(), - *h6.toUByteArray(), - *h7.toUByteArray(), - ) + return h.toUByteArray() + } + + private fun process( + h: ULongArray, + w: ULongArray, + ) { + val v = h.copyOf() + + for (i in 0..<80) { + val s0 = v[0].rotateRight(28) xor v[0].rotateRight(34) xor v[0].rotateRight(39) + val s1 = v[4].rotateRight(14) xor v[4].rotateRight(18) xor v[4].rotateRight(41) + val ch = (v[4] and v[5]) xor (v[4].inv() and v[6]) + val temp1 = v[7] + s1 + ch + this.c[i] + w[i] + val maj = (v[0] and v[1]) xor (v[0] and v[2]) xor (v[1] and v[2]) + val temp2 = s0 + maj + + v[7] = v[6] + v[6] = v[5] + v[5] = v[4] + v[4] = v[3] + temp1 + v[3] = v[2] + v[2] = v[1] + v[1] = v[0] + v[0] = temp1 + temp2 + } + + for (i in 0..7) { + h[i] += v[i] + } } }