Cleanup deprecated methods.

Noticed a handful of deprecated methods and minor warnings while looking around.
Replaces with recommended methods
This commit is contained in:
Renee Vandervelde committed 2024-07-02 09:50:45 -05:00
1 parent b919de5d71
commit bd3cbb1662
9 files changed
+16 -14

No files matched your search

@@ -29,10 +29,10 @@ fun UByteArray.toHexString() : String {
fun Array<UByte>.hexColumnsPrint(chunk: Int = 16) {
val printout = this.map { it.toString(16).padStart(2, '0') }.chunked(chunk)
printout.forEach { println(it.joinToString(separator = " ") { it.toUpperCase() }) }
printout.forEach { println(it.joinToString(separator = " ") { it.uppercase() }) }
}
fun UByteArray.hexColumnsPrint(chunk: Int = 16) {
val printout = this.map { it.toString(16).padStart(2, '0') }.chunked(chunk)
printout.forEach { println(it.joinToString(separator = " ") { it.toUpperCase() }) }
printout.forEach { println(it.joinToString(separator = " ") { it.uppercase() }) }
}
@@ -27,7 +27,7 @@ object JsSodiumLoader {
}
suspend fun load() = suspendCoroutine<Unit> { continuation ->
suspend fun load() = suspendCoroutine { continuation ->
if (!getSodiumLoaded()) {
_libsodiumPromise.then<dynamic> {
sodium_init()
@@ -27,7 +27,7 @@ actual object Kdf {
): UByteArray {
return getSodium().crypto_kdf_derive_from_key(
subkeyLength.toUInt(),
subkeyId.toUInt(),
subkeyId,
context,
masterKey.toUInt8Array()
).toUByteArray()
@@ -8,7 +8,7 @@ import ext.libsodium.com.ionspin.kotlin.crypto.toUInt8Array
actual object PasswordHash {
/**
* The crypto_pwhash() function derives an outlen bytes long key from a password passwd whose length is passwdlen
* and a salt salt whose fixed length is crypto_pwhash_SALTBYTES bytes. passwdlen should be at least crypto_pwhash_
* and a salt whose fixed length is crypto_pwhash_SALTBYTES bytes. passwdlen should be at least crypto_pwhash_
* PASSWD_MIN and crypto_pwhash_PASSWD_MAX. outlen should be at least crypto_pwhash_BYTES_MIN = 16 (128 bits) and
* at most crypto_pwhash_BYTES_MAX.
*
@@ -93,7 +93,7 @@ actual object LibsodiumUtil {
actual fun fromHex(data: String): UByteArray {
val binLenReference = IntByReference(0)
val binSize = (data.length + 1) / 2 // -1 for terminator char
val hex = data.toCharArray().map { it.toByte() }.toByteArray()
val hex = data.toCharArray().map { it.code.toByte() }.toByteArray()
val result = ByteArray(binSize)
val resultCode = sodiumJna.sodium_hex2bin(
result,