oxen-io
/
session-android
mirror of https://github.com/oxen-io/session-android.git
1
0
Fork 0
Code Issues 1 Projects Releases Wiki Activity

Merge pull request #1 from chenjia404/randomness 

Update KeyPairUtilities.kt
This commit is contained in:
陈佳 2023-06-18 12:34:21 +08:00 committed by GitHub
parent 300c3a6605 fcfb47f930
commit e96a5347fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/org/thoughtcrime/securesms/crypto/KeyPairUtilities.kt
View File

@ -16,7 +16,7 @@ object KeyPairUtilities {
private val sodium by lazy { LazySodiumAndroid(SodiumAndroid()) }
fun generate(): KeyPairGenerationResult {
val seed = sodium.randomBytesBuf(16)
val seed = sodium.randomBytesBuf(32)
try {
return generate(seed)
} catch (exception: Exception) {
@ -25,8 +25,7 @@ object KeyPairUtilities {
}
fun generate(seed: ByteArray): KeyPairGenerationResult {
val padding = ByteArray(16) { 0 }
val ed25519KeyPair = sodium.cryptoSignSeedKeypair(seed + padding)
val ed25519KeyPair = sodium.cryptoSignSeedKeypair(seed)
val sodiumX25519KeyPair = sodium.convertKeyPairEd25519ToCurve25519(ed25519KeyPair)
val x25519KeyPair = ECKeyPair(DjbECPublicKey(sodiumX25519KeyPair.publicKey.asBytes), DjbECPrivateKey(sodiumX25519KeyPair.secretKey.asBytes))
return KeyPairGenerationResult(seed, ed25519KeyPair, x25519KeyPair)
@ -57,4 +56,4 @@ object KeyPairUtilities {
val ed25519KeyPair: KeyPair,
val x25519KeyPair: ECKeyPair
)
}
}