From 178875b809412d17326d0c8fa295dae7557f162e Mon Sep 17 00:00:00 2001 From: valere Date: Fri, 21 Apr 2023 10:09:19 +0200 Subject: [PATCH 1/2] fix rust isCrossSigningVerified --- .../sdk/api/session/crypto/crosssigning/CrossSigningService.kt | 2 +- .../android/sdk/internal/crypto/RustCrossSigningService.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/CrossSigningService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/CrossSigningService.kt index 8c9be3fd78..b8c88cf6ab 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/CrossSigningService.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/CrossSigningService.kt @@ -24,7 +24,7 @@ import org.matrix.android.sdk.api.util.Optional interface CrossSigningService { /** - * Is our own device signed by our own cross signing identity. + * Is our published identity trusted. */ suspend fun isCrossSigningVerified(): Boolean diff --git a/matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/RustCrossSigningService.kt b/matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/RustCrossSigningService.kt index d008b09bbc..5a299bdc15 100644 --- a/matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/RustCrossSigningService.kt +++ b/matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/RustCrossSigningService.kt @@ -40,7 +40,7 @@ internal class RustCrossSigningService @Inject constructor( */ override suspend fun isCrossSigningVerified(): Boolean { return when (val identity = olmMachine.getIdentity(olmMachine.userId())) { - is OwnUserIdentity -> identity.trustsOurOwnDevice() + is OwnUserIdentity -> identity.verified() else -> false } } From b0149c49601952d5809e4abf3111671e013648c2 Mon Sep 17 00:00:00 2001 From: valere Date: Fri, 21 Apr 2023 10:15:03 +0200 Subject: [PATCH 2/2] Changelog + doc update --- changelog.d/8352.bugfix | 1 + .../android/sdk/internal/crypto/RustCrossSigningService.kt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changelog.d/8352.bugfix diff --git a/changelog.d/8352.bugfix b/changelog.d/8352.bugfix new file mode 100644 index 0000000000..695c02715e --- /dev/null +++ b/changelog.d/8352.bugfix @@ -0,0 +1 @@ +Fix: RustCrossSigning service API confusion (identity trusted vs own device trusted by identity) diff --git a/matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/RustCrossSigningService.kt b/matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/RustCrossSigningService.kt index 5a299bdc15..1ed8b0f8b0 100644 --- a/matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/RustCrossSigningService.kt +++ b/matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/RustCrossSigningService.kt @@ -36,7 +36,7 @@ internal class RustCrossSigningService @Inject constructor( ) : CrossSigningService { /** - * Is our own device signed by our own cross signing identity + * Is our own identity trusted */ override suspend fun isCrossSigningVerified(): Boolean { return when (val identity = olmMachine.getIdentity(olmMachine.userId())) {