From 87eb58d6b4f316f451d8f6d26177cfa592761fe1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Augusto=20C=C3=A9sar=20Dias?= Date: Wed, 25 Oct 2023 11:48:58 +0200 Subject: [PATCH 1/2] chore(deps): update core crypto to latest version --- .../kotlin/com.wire.kalium.cryptography/CoreCryptoCentral.kt | 4 ++-- .../kotlin/com.wire.kalium.cryptography/MLSClientImpl.kt | 2 +- gradle/libs.versions.toml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cryptography/src/commonJvmAndroid/kotlin/com.wire.kalium.cryptography/CoreCryptoCentral.kt b/cryptography/src/commonJvmAndroid/kotlin/com.wire.kalium.cryptography/CoreCryptoCentral.kt index e7aea03d32f..a2398b3d597 100644 --- a/cryptography/src/commonJvmAndroid/kotlin/com.wire.kalium.cryptography/CoreCryptoCentral.kt +++ b/cryptography/src/commonJvmAndroid/kotlin/com.wire.kalium.cryptography/CoreCryptoCentral.kt @@ -27,7 +27,7 @@ import java.io.File actual suspend fun coreCryptoCentral(rootDir: String, databaseKey: String): CoreCryptoCentral { val path = "$rootDir/${CoreCryptoCentralImpl.KEYSTORE_NAME}" File(rootDir).mkdirs() - val coreCrypto = coreCryptoDeferredInit(path, databaseKey, Ciphersuites.DEFAULT.lower()) + val coreCrypto = coreCryptoDeferredInit(path, databaseKey, Ciphersuites.DEFAULT.lower(), null) coreCrypto.setCallbacks(Callbacks()) return CoreCryptoCentralImpl(coreCrypto, rootDir) } @@ -62,7 +62,7 @@ private class Callbacks : CoreCryptoCallbacks { class CoreCryptoCentralImpl(private val cc: CoreCrypto, private val rootDir: String) : CoreCryptoCentral { override suspend fun mlsClient(clientId: CryptoQualifiedClientId): MLSClient { - cc.mlsInit(clientId.toString().encodeToByteArray(), Ciphersuites.DEFAULT.lower()) + cc.mlsInit(clientId.toString().encodeToByteArray(), Ciphersuites.DEFAULT.lower(), null) return MLSClientImpl(cc) } diff --git a/cryptography/src/commonJvmAndroid/kotlin/com.wire.kalium.cryptography/MLSClientImpl.kt b/cryptography/src/commonJvmAndroid/kotlin/com.wire.kalium.cryptography/MLSClientImpl.kt index 335b15b6461..13781ab0ea2 100644 --- a/cryptography/src/commonJvmAndroid/kotlin/com.wire.kalium.cryptography/MLSClientImpl.kt +++ b/cryptography/src/commonJvmAndroid/kotlin/com.wire.kalium.cryptography/MLSClientImpl.kt @@ -249,7 +249,7 @@ class MLSClientImpl( } override suspend fun e2eiMlsInitOnly(enrollment: E2EIClient, certificateChain: CertificateChain) { - coreCrypto.e2eiMlsInitOnly((enrollment as E2EIClientImpl).wireE2eIdentity, certificateChain) + coreCrypto.e2eiMlsInitOnly((enrollment as E2EIClientImpl).wireE2eIdentity, certificateChain, null) } override suspend fun isE2EIEnabled(): Boolean { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4c1582ad678..e276a3e29d8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -36,7 +36,7 @@ pbandk = "0.14.2" turbine = "1.0.0" avs = "9.4.14" jna = "5.13.0" -core-crypto = "1.0.0-rc.12" +core-crypto = "1.0.0-rc.16" core-crypto-multiplatform = "0.6.0-rc.3-multiplatform-pre1" completeKotlin = "1.1.0" desugar-jdk = "2.0.3" From 96d76cc0760fb3df5361f8e3928f9e437acdf151 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Augusto=20C=C3=A9sar=20Dias?= Date: Mon, 30 Oct 2023 16:15:41 +0100 Subject: [PATCH 2/2] Update to latest CC --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e276a3e29d8..28b2eecb758 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -36,7 +36,7 @@ pbandk = "0.14.2" turbine = "1.0.0" avs = "9.4.14" jna = "5.13.0" -core-crypto = "1.0.0-rc.16" +core-crypto = "1.0.0-rc.17" core-crypto-multiplatform = "0.6.0-rc.3-multiplatform-pre1" completeKotlin = "1.1.0" desugar-jdk = "2.0.3"