TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-23 10:05:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check recovery password is hex if its not a mnemonic

Browse Source
This commit is contained in:
Andrew 2024-06-28 12:43:40 +09:30
parent 17fbe5403c
commit 3cc00caeab
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libsignal/src/main/java/org/session/libsignal/crypto/MnemonicCodec.kt
View File

@ -1,6 +1,7 @@
package org.session.libsignal.crypto package org.session.libsignal.crypto
import org.session.libsignal.utilities.Hex import org.session.libsignal.utilities.Hex
import org.session.libsignal.utilities.isHex
import java.util.zip.CRC32 import java.util.zip.CRC32
/** /**
@ -126,6 +127,7 @@ class MnemonicCodec(private val loadFileContents: (String) -> String) {
fun decodeMnemonicOrHexAsByteArray(mnemonicOrHex: String): ByteArray = try { fun decodeMnemonicOrHexAsByteArray(mnemonicOrHex: String): ByteArray = try {
decode(mnemonic = mnemonicOrHex).let(Hex::fromStringCondensed) decode(mnemonic = mnemonicOrHex).let(Hex::fromStringCondensed)
} catch (decodeException: Exception) { } catch (decodeException: Exception) {
if (mnemonicOrHex.isHex()) throw decodeException
try { try {
Hex.fromStringCondensed(mnemonicOrHex) Hex.fromStringCondensed(mnemonicOrHex)
} catch (_: Exception) { } catch (_: Exception) {

9
libsignal/src/main/java/org/session/libsignal/utilities/Hex.kt Normal file
View File

@ -0,0 +1,9 @@
package org.session.libsignal.utilities
private val HEX_CHARS = buildSet {
addAll('0'..'9')
addAll('a'..'f')
addAll('A'..'F')
}
fun String.isHex() = all { it in HEX_CHARS }