Bumpp kotlin to 1.3.72, working first iteration

This commit is contained in:
Ugljesa Jovanovic authored and Ugljesa Jovanovic committed 2020-05-16 22:18:19 +02:00
1 parent 6c92936c5d
commit d92db320c3
2 files changed
+11 -1

No files matched your search

@@ -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 ->
//