Merge branch 'develop' into check_crl_for_current_client-cherry-pick

wireapp · Mar 1, 2024 · 834cc45 · 834cc45
2 parents 0030d84 + 5c7e158
commit 834cc45
Show file tree

Hide file tree

Showing 31 changed files with 435 additions and 847 deletions.
diff --git a/cryptography/src/commonJvmAndroid/kotlin/com.wire.kalium.cryptography/MLSClientImpl.kt b/cryptography/src/commonJvmAndroid/kotlin/com.wire.kalium.cryptography/MLSClientImpl.kt
@@ -331,7 +331,8 @@ class MLSClientImpl(
                     value.domain,
                     value.certificate,
                     toDeviceStatus(value.status),
-                    value.thumbprint
+                    value.thumbprint,
+                    value.serialNumber
                 )
             }
         }

diff --git a/cryptography/src/commonMain/kotlin/com/wire/kalium/cryptography/IDs.kt b/cryptography/src/commonMain/kotlin/com/wire/kalium/cryptography/IDs.kt
@@ -77,7 +77,8 @@ data class WireIdentity(
     val domain: String,
     val certificate: String,
     val status: CryptoCertificateStatus,
-    val thumbprint: String
+    val thumbprint: String,
+    val serialNumber: String
 )
 
 enum class CryptoCertificateStatus {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -38,7 +38,7 @@ pbandk = "0.14.2"
 turbine = "1.0.0"
 avs = "9.6.13"
 jna = "5.14.0"
-core-crypto = "1.0.0-rc.43"
+core-crypto = "1.0.0-rc.46"
 core-crypto-multiplatform = "0.6.0-rc.3-multiplatform-pre1"
 completeKotlin = "1.1.0"
 desugar-jdk = "2.0.4"
@@ -57,7 +57,6 @@ faker = "1.15.0"
 robolectric = "4.9"
 stately = "2.0.6"
 micrometer = "1.11.3"
-bouncy-castle = "1.70"
 konsist = "0.13.0"
 postgres = "1.0.2.RELEASE"
 r2dbc = "1.0.0.RELEASE"
@@ -213,6 +212,3 @@ jna = { module = "net.java.dev.jna:jna", version.ref = "jna" }
 kermit = { module = "co.touchlab:kermit", version.ref = "kermit" }
 micrometer = { module = "io.micrometer:micrometer-registry-prometheus", version.ref = "micrometer" }
 slf4js = { module = "org.slf4j:slf4j-simple", version.ref = "slf4js" }
-
-# bouncy castle
-bouncy-castle = { module = "org.bouncycastle:bcprov-jdk15on", version.ref = "bouncy-castle" }
diff --git a/logic/build.gradle.kts b/logic/build.gradle.kts
@@ -96,7 +96,6 @@ kotlin {
             dependencies {
                 implementation(libs.jna)
                 implementation(libs.coreCryptoJvm)
-                implementation(libs.bouncy.castle)
             }
         }
         val jvmTest by getting {

diff --git a/logic/src/appleMain/kotlin/com/wire/kalium/logic/feature/e2ei/PemCertificateDecoder.kt b/logic/src/appleMain/kotlin/com/wire/kalium/logic/feature/e2ei/PemCertificateDecoder.kt
diff --git a/logic/src/appleMain/kotlin/com/wire/kalium/logic/feature/e2ei/PlatformX509Certificate.kt b/logic/src/appleMain/kotlin/com/wire/kalium/logic/feature/e2ei/PlatformX509Certificate.kt
diff --git a/logic/src/appleMain/kotlin/com/wire/kalium/logic/feature/e2ei/X509CertificateGenerator.kt b/logic/src/appleMain/kotlin/com/wire/kalium/logic/feature/e2ei/X509CertificateGenerator.kt
diff --git a/...rc/commonJvmAndroid/kotlin/com/wire/kalium/logic/feature/e2ei/CertificateStatusChecker.kt b/...rc/commonJvmAndroid/kotlin/com/wire/kalium/logic/feature/e2ei/CertificateStatusChecker.kt
diff --git a/...c/src/commonJvmAndroid/kotlin/com/wire/kalium/logic/feature/e2ei/PemCertificateDecoder.kt b/...c/src/commonJvmAndroid/kotlin/com/wire/kalium/logic/feature/e2ei/PemCertificateDecoder.kt
diff --git a/...src/commonJvmAndroid/kotlin/com/wire/kalium/logic/feature/e2ei/PlatformX509Certificate.kt b/...src/commonJvmAndroid/kotlin/com/wire/kalium/logic/feature/e2ei/PlatformX509Certificate.kt
diff --git a/...rc/commonJvmAndroid/kotlin/com/wire/kalium/logic/feature/e2ei/X509CertificateGenerator.kt b/...rc/commonJvmAndroid/kotlin/com/wire/kalium/logic/feature/e2ei/X509CertificateGenerator.kt
diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/e2ei/CertificateStatusChecker.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/e2ei/CertificateStatusChecker.kt
diff --git a/.../feature/e2ei/CertificateStatusChecker.kt → ...c/feature/e2ei/CertificateStatusMapper.kt b/.../feature/e2ei/CertificateStatusChecker.kt → ...c/feature/e2ei/CertificateStatusMapper.kt
@@ -15,16 +15,20 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see http://www.gnu.org/licenses/.
  */
+
 package com.wire.kalium.logic.feature.e2ei
 
 import com.wire.kalium.cryptography.CryptoCertificateStatus
 
-actual interface CertificateStatusChecker {
-    actual fun status(notAfterTimestamp: Long, certificateStatus: CryptoCertificateStatus): CertificateStatus
+interface CertificateStatusMapper {
+    fun toCertificateStatus(certificateStatus: CryptoCertificateStatus): CertificateStatus
 }
 
-actual class CertificateStatusCheckerImpl : CertificateStatusChecker {
-    override fun status(notAfterTimestamp: Long, certificateStatus: CryptoCertificateStatus): CertificateStatus {
-        TODO("Not yet implemented")
-    }
+class CertificateStatusMapperImpl : CertificateStatusMapper {
+    override fun toCertificateStatus(certificateStatus: CryptoCertificateStatus): CertificateStatus =
+        when (certificateStatus) {
+            CryptoCertificateStatus.EXPIRED -> CertificateStatus.EXPIRED
+            CryptoCertificateStatus.REVOKED -> CertificateStatus.REVOKED
+            CryptoCertificateStatus.VALID -> CertificateStatus.VALID
+        }
 }
diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/e2ei/E2eiCertificate.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/e2ei/E2eiCertificate.kt
@@ -18,8 +18,7 @@
 package com.wire.kalium.logic.feature.e2ei
 
 data class E2eiCertificate(
-    val issuer: String = "",
-    val status: CertificateStatus = CertificateStatus.EXPIRED,
-    val serialNumber: String = "",
-    val certificateDetail: String = ""
+    val status: CertificateStatus,
+    val serialNumber: String,
+    val certificateDetail: String
 )
diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/e2ei/PemCertificateDecoder.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/e2ei/PemCertificateDecoder.kt
diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/e2ei/PlatformX509Certificate.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/e2ei/PlatformX509Certificate.kt