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

Fix arbitrary length hash function

Browse Source
This commit is contained in:
Ugljesa Jovanovic 2020-05-12 21:57:04 +02:00 committed by Ugljesa Jovanovic
parent 4cc7c7e92a
commit 21685191e7
No known key found for this signature in database
GPG Key ID: 178E6DFCECCB0E0F
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,8 +86,8 @@ class Argon2 internal constructor(
for (i in 1 until numberOf64ByteBlocks) { for (i in 1 until numberOf64ByteBlocks) {
v[i] = Blake2b.digest(v[i - 1]) v[i] = Blake2b.digest(v[i - 1])
} }
val remainingPartOfInput = input.copyOfRange(length.toInt() - numberOf64ByteBlocks * 32, input.size) val remainingPartOfInput = length.toInt() - numberOf64ByteBlocks * 32
val vLast = Blake2b.digest(remainingPartOfInput, hashLength = remainingPartOfInput.size) val vLast = Blake2b.digest(v[numberOf64ByteBlocks - 1], hashLength = remainingPartOfInput)
val concat = val concat =
(v.map { it.copyOfRange(0, 32) }) (v.map { it.copyOfRange(0, 32) })
.plus(listOf(vLast)) .plus(listOf(vLast))
@ -328,6 +328,7 @@ class Argon2 internal constructor(
type: ArgonType type: ArgonType
): Array<UByte> { ): Array<UByte> {
println("H0 Input")
val toDigest = parallelism.toLittleEndianUByteArray() + tagLength.toLittleEndianUByteArray() + memorySize.toLittleEndianUByteArray() + val toDigest = parallelism.toLittleEndianUByteArray() + tagLength.toLittleEndianUByteArray() + memorySize.toLittleEndianUByteArray() +
numberOfIterations.toLittleEndianUByteArray() + versionNumber.toLittleEndianUByteArray() + type.typeId.toUInt().toLittleEndianUByteArray() + numberOfIterations.toLittleEndianUByteArray() + versionNumber.toLittleEndianUByteArray() + type.typeId.toUInt().toLittleEndianUByteArray() +
password.size.toUInt().toLittleEndianUByteArray() + password + password.size.toUInt().toLittleEndianUByteArray() + password +
@ -335,6 +336,7 @@ class Argon2 internal constructor(
key.size.toUInt().toLittleEndianUByteArray() + key + key.size.toUInt().toLittleEndianUByteArray() + key +
associatedData.size.toUInt().toLittleEndianUByteArray() + associatedData associatedData.size.toUInt().toLittleEndianUByteArray() + associatedData
toDigest.hexColumsPrint(16) toDigest.hexColumsPrint(16)
println("Marker H0 Input end")
val h0 = Blake2b.digest( val h0 = Blake2b.digest(
parallelism.toLittleEndianUByteArray() + tagLength.toLittleEndianUByteArray() + memorySize.toLittleEndianUByteArray() + parallelism.toLittleEndianUByteArray() + tagLength.toLittleEndianUByteArray() + memorySize.toLittleEndianUByteArray() +
numberOfIterations.toLittleEndianUByteArray() + versionNumber.toLittleEndianUByteArray() + type.typeId.toUInt().toLittleEndianUByteArray()+ numberOfIterations.toLittleEndianUByteArray() + versionNumber.toLittleEndianUByteArray() + type.typeId.toUInt().toLittleEndianUByteArray()+
@ -345,6 +347,7 @@ class Argon2 internal constructor(
) )
h0.hexColumsPrint(8) h0.hexColumsPrint(8)
println("Marker H0")
val blockCount = (memorySize / (4U * parallelism)) * (4U * parallelism) val blockCount = (memorySize / (4U * parallelism)) * (4U * parallelism)
val columnCount = (blockCount / parallelism).toInt() val columnCount = (blockCount / parallelism).toInt()
@ -367,6 +370,8 @@ class Argon2 internal constructor(
h0 + 0.toUInt().toLittleEndianUByteArray() + i.toUInt().toLittleEndianUByteArray(), h0 + 0.toUInt().toLittleEndianUByteArray() + i.toUInt().toLittleEndianUByteArray(),
1024U 1024U
) )
matrix[i][0].hexColumsPrint(16)
println("Marker, matrix [$i][0]")
} }
//Compute B[i][1] //Compute B[i][1]
@ -376,6 +381,8 @@ class Argon2 internal constructor(
h0 + 1.toUInt().toLittleEndianUByteArray() + i.toUInt().toLittleEndianUByteArray(), h0 + 1.toUInt().toLittleEndianUByteArray() + i.toUInt().toLittleEndianUByteArray(),
1024U 1024U
) )
matrix[i][1].hexColumsPrint(16)
println("Marker, matrix [$i][1]")
} }
//Compute B[i][j] //Compute B[i][j]