diff --git a/buildSrc/src/main/kotlin/Deps.kt b/buildSrc/src/main/kotlin/Deps.kt index a1d1631..1e43a78 100644 --- a/buildSrc/src/main/kotlin/Deps.kt +++ b/buildSrc/src/main/kotlin/Deps.kt @@ -16,7 +16,7 @@ object Versions { val kotlinCoroutines = "1.3.3" - val kotlin = "1.3.61" + val kotlin = "1.3.72" val kotlinSerialization = "0.11.1" val nodePlugin = "1.3.0" val dokkaPlugin = "0.9.18" diff --git a/multiplatform-crypto/src/commonMain/kotlin/com/ionspin/kotlin/crypto/keyderivation/Argon2.kt b/multiplatform-crypto/src/commonMain/kotlin/com/ionspin/kotlin/crypto/keyderivation/Argon2.kt index 0668596..e5a7948 100644 --- a/multiplatform-crypto/src/commonMain/kotlin/com/ionspin/kotlin/crypto/keyderivation/Argon2.kt +++ b/multiplatform-crypto/src/commonMain/kotlin/com/ionspin/kotlin/crypto/keyderivation/Argon2.kt @@ -509,6 +509,9 @@ class Argon2 internal constructor( processSegment(argonContext, argonInternalContext, segmentPosition) } } + println("Done with $iteration") + argonInternalContext.matrix[0][0].slice(0 .. 7).toTypedArray().hexColumsPrint(8) + argonInternalContext.matrix[argonContext.parallelism.toInt() - 1][argonInternalContext.columnCount - 1].slice(1016 .. 1023).toTypedArray().hexColumsPrint(8) } } @@ -549,7 +552,9 @@ class Argon2 internal constructor( println("Calling compress for I: $iteration S: $slice Lane: $lane Column: $column with l: $l z: $z") matrix[lane][column] = compressionFunctionG(matrix[lane][column - 1], matrix[l][z], matrix[lane][column], false) +// matrix[lane][column].hexColumsPrint(16) } + } else { for (column in (slice * segmentLength) until ((slice + 1) * segmentLength)) { val (l, z) = computeIndexNew( @@ -565,6 +570,8 @@ class Argon2 internal constructor( println("Calling compress for I: $iteration S: $slice Lane: $lane Column: $column with l: $l z: $z") matrix[lane][column] = compressionFunctionG(matrix[lane][column - 1], matrix[l][z], matrix[lane][column], false) +// matrix[lane][column].hexColumsPrint(16) + println("debug") } } } else { @@ -575,11 +582,14 @@ class Argon2 internal constructor( println("Calling compress for I: $iteration S: $slice Lane: $lane Column: $column with l: $l z: $z") matrix[lane][column] = compressionFunctionG(matrix[lane][column - 1], matrix[l][z], matrix[lane][column], true) +// matrix[lane][column].hexColumsPrint(16) } } + + // //Remaining iteration // val remainingIterations = (1..numberOfIterations.toInt()).map { iteration -> //