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

Bumpp kotlin to 1.3.72, working first iteration

Browse Source
This commit is contained in:
Ugljesa Jovanovic 2020-05-15 22:24:09 +02:00 committed by Ugljesa Jovanovic
parent 6c92936c5d
commit d92db320c3
No known key found for this signature in database
GPG Key ID: 178E6DFCECCB0E0F
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildSrc/src/main/kotlin/Deps.kt
View File

@ -16,7 +16,7 @@
object Versions { object Versions {
val kotlinCoroutines = "1.3.3" val kotlinCoroutines = "1.3.3"
val kotlin = "1.3.61" val kotlin = "1.3.72"
val kotlinSerialization = "0.11.1" val kotlinSerialization = "0.11.1"
val nodePlugin = "1.3.0" val nodePlugin = "1.3.0"
val dokkaPlugin = "0.9.18" val dokkaPlugin = "0.9.18"

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

@ -509,6 +509,9 @@ class Argon2 internal constructor(
processSegment(argonContext, argonInternalContext, segmentPosition) 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") println("Calling compress for I: $iteration S: $slice Lane: $lane Column: $column with l: $l z: $z")
matrix[lane][column] = matrix[lane][column] =
compressionFunctionG(matrix[lane][column - 1], matrix[l][z], matrix[lane][column], false) compressionFunctionG(matrix[lane][column - 1], matrix[l][z], matrix[lane][column], false)
// matrix[lane][column].hexColumsPrint(16)
} }
} else { } else {
for (column in (slice * segmentLength) until ((slice + 1) * segmentLength)) { for (column in (slice * segmentLength) until ((slice + 1) * segmentLength)) {
val (l, z) = computeIndexNew( 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") println("Calling compress for I: $iteration S: $slice Lane: $lane Column: $column with l: $l z: $z")
matrix[lane][column] = matrix[lane][column] =
compressionFunctionG(matrix[lane][column - 1], matrix[l][z], matrix[lane][column], false) compressionFunctionG(matrix[lane][column - 1], matrix[l][z], matrix[lane][column], false)
// matrix[lane][column].hexColumsPrint(16)
println("debug")
} }
} }
} else { } 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") println("Calling compress for I: $iteration S: $slice Lane: $lane Column: $column with l: $l z: $z")
matrix[lane][column] = matrix[lane][column] =
compressionFunctionG(matrix[lane][column - 1], matrix[l][z], matrix[lane][column], true) compressionFunctionG(matrix[lane][column - 1], matrix[l][z], matrix[lane][column], true)
// matrix[lane][column].hexColumsPrint(16)
} }
} }
// //Remaining iteration // //Remaining iteration
// val remainingIterations = (1..numberOfIterations.toInt()).map { iteration -> // val remainingIterations = (1..numberOfIterations.toInt()).map { iteration ->
// //