YoungBlood/libsodium_wasm_experimental
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixed row mixing

Browse Source
This commit is contained in:
Ugljesa Jovanovic 2020-05-14 22:48:19 +02:00 committed by Ugljesa Jovanovic
parent 9b800e34bc
commit 3519d2240f
No known key found for this signature in database
GPG Key ID: 178E6DFCECCB0E0F
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
multiplatform-crypto/src/commonMain/kotlin/com/ionspin/kotlin/crypto/keyderivation/Argon2.kt
View File

@ -113,13 +113,9 @@ class Argon2 internal constructor(
val z = Array<UByte>(1024) { 0U } val z = Array<UByte>(1024) { 0U }
// Do the argon/blake2b mixing on rows // Do the argon/blake2b mixing on rows
for (i in 0..7) { for (i in 0..7) {
println("Q round $i")
q.hexColumsPrint(16)
val startOfRow = (i * 8 * 16) val startOfRow = (i * 8 * 16)
val endOfRow = startOfRow + (8 * 16) val endOfRow = startOfRow + (8 * 16)
val rowToMix = r.copyOfRange(startOfRow, endOfRow) val rowToMix = r.copyOfRange(startOfRow, endOfRow)
println("Mixing row:")
rowToMix.hexColumsPrint(16)
mixRound(rowToMix) mixRound(rowToMix)
.map { it.toLittleEndianUByteArray() } .map { it.toLittleEndianUByteArray() }
.flatMap { it.asIterable() } .flatMap { it.asIterable() }
@ -130,6 +126,7 @@ class Argon2 internal constructor(
q.hexColumsPrint(16) q.hexColumsPrint(16)
// Do the argon/blake2b mixing on columns // Do the argon/blake2b mixing on columns
for (i in 0..7) { for (i in 0..7) {
println("Z round ${i}")
copyIntoGBlockColumn( copyIntoGBlockColumn(
z, z,
i, i,
@ -142,7 +139,7 @@ class Argon2 internal constructor(
println("---- Z -----") println("---- Z -----")
z.hexColumsPrint(16) z.hexColumsPrint(16)
val final = if (xorWithCurrentBlock) { val final = if (xorWithCurrentBlock) {
println("Z xor R xoe CURRENT") println("Z xor R xor CURRENT")
(z xor r) xor ((x xor y) xor currentBlock) (z xor r) xor ((x xor y) xor currentBlock)
} else { } else {
println("Z xor R") println("Z xor R")
@ -156,14 +153,18 @@ class Argon2 internal constructor(
private fun extractColumnFromGBlock(gBlock: Array<UByte>, columnPosition: Int): Array<UByte> { private fun extractColumnFromGBlock(gBlock: Array<UByte>, columnPosition: Int): Array<UByte> {
val result = Array<UByte>(128) { 0U } val result = Array<UByte>(128) { 0U }
for (i in 0..7) { for (i in 0..7) {
result[i] = gBlock[i * 8 + columnPosition] gBlock.copyOfRange(i * 128 + (columnPosition * 16), i * 128 + (columnPosition * 16) + 16).copyInto(result, i * 16)
} }
return result return result
} }
private fun copyIntoGBlockColumn(gBlock: Array<UByte>, columnPosition: Int, columnData: Array<UByte>) { private fun copyIntoGBlockColumn(gBlock: Array<UByte>, columnPosition: Int, columnData: Array<UByte>) {
for (i in 0..7) { for (i in 0..7) {
gBlock[i * 8 + columnPosition] = columnData[i] println("Mixed column data ${i}")
val column = columnData.copyOfRange(i * 16, i * 16 + 16)
column.hexColumsPrint(16)
column.copyInto(gBlock, i * 128 + columnPosition * 16)
// gBlock[i * 8 + columnPosition] = columnData[i]
} }
} }
@ -180,6 +181,7 @@ class Argon2 internal constructor(
v = mix(v, 1, 6, 11, 12) v = mix(v, 1, 6, 11, 12)
v = mix(v, 2, 7, 8, 13) v = mix(v, 2, 7, 8, 13)
v = mix(v, 3, 4, 9, 14) v = mix(v, 3, 4, 9, 14)
v.hexColumsPrint(2)
return v return v
} }

4
multiplatform-crypto/src/commonMain/kotlin/com/ionspin/kotlin/crypto/util/Util.kt
View File

@ -31,8 +31,8 @@ fun Array<UByte>.hexColumsPrint(chunk : Int = 16) {
printout.forEach { println(it.joinToString(separator = " ") { it.toUpperCase() }) } printout.forEach { println(it.joinToString(separator = " ") { it.toUpperCase() }) }
} }
fun Array<ULong>.hexColumsPrint() { fun Array<ULong>.hexColumsPrint(chunk: Int = 3) {
val printout = this.map { it.toString(16) }.chunked(3) val printout = this.map { it.toString(16) }.chunked(chunk)
printout.forEach { println(it.joinToString(separator = " ") { it.toUpperCase() }) } printout.forEach { println(it.joinToString(separator = " ") { it.toUpperCase() }) }
} }