Mac-compatible MatrixSDKCrypto

matrix-org · Oct 11, 2022 · 296214d · 296214d
1 parent 66df019
commit 296214d
Show file tree

Hide file tree

Showing 38 changed files with 64 additions and 70 deletions.
diff --git a/MatrixSDK.podspec b/MatrixSDK.podspec
@@ -45,7 +45,7 @@ Pod::Spec.new do |s|
  ss.dependency 'OLMKit', '~> 3.2.5'
  ss.dependency 'Realm', '10.27.0'
  ss.dependency 'libbase58', '~> 0.1.4'
- ss.ios.dependency 'MatrixSDK/CryptoSDK'
+ ss.dependency 'MatrixSDK/CryptoSDK'
  end
 
  s.subspec 'JingleCallStack' do |ss|
@@ -64,10 +64,9 @@ Pod::Spec.new do |s|
  ss.ios.dependency 'JitsiMeetSDK', '5.0.2'
  end
 
- # Experimental / NOT production-ready Rust-based crypto library, iOS-only
+ # Experimental / NOT production-ready Rust-based crypto library
  s.subspec 'CryptoSDK' do |ss|
- ss.platform = :ios
- ss.dependency 'MatrixSDKCrypto', '0.1.0', :configurations => ["DEBUG"]
+ ss.dependency 'MatrixSDKCrypto', '0.1.2', :configurations => ["DEBUG"]
  end
 
 end
diff --git a/MatrixSDK/Crypto/CrossSigning/Data/MXCrossSigningInfo.h b/MatrixSDK/Crypto/CrossSigning/Data/MXCrossSigningInfo.h
@@ -33,7 +33,7 @@ extern NSString *const MXCrossSigningInfoTrustLevelDidChangeNotification;
  */
 @interface MXCrossSigningInfo : NSObject <NSCoding>
 
-#if DEBUG && TARGET_OS_IPHONE
+#if DEBUG
 /**
  Initialize cross signing with MatrixSDKCrypto user identity
  */

diff --git a/MatrixSDK/Crypto/CrossSigning/Data/MXCrossSigningInfo.m b/MatrixSDK/Crypto/CrossSigning/Data/MXCrossSigningInfo.m
@@ -23,7 +23,7 @@
 
 @implementation MXCrossSigningInfo
 
-#if DEBUG && TARGET_OS_IPHONE
+#if DEBUG
 - (instancetype)initWithUserIdentity:(MXCryptoUserIdentityWrapper *)userIdentity
 {
  self = [self init];

diff --git a/MatrixSDK/Crypto/CrossSigning/Data/MXCryptoUserIdentityWrapper.swift b/MatrixSDK/Crypto/CrossSigning/Data/MXCryptoUserIdentityWrapper.swift
@@ -16,7 +16,7 @@
 
 import Foundation
 
-#if DEBUG && os(iOS)
+#if DEBUG
 
 import MatrixSDKCrypto
 

diff --git a/MatrixSDK/Crypto/CrossSigning/MXCrossSigningInfoSource.swift b/MatrixSDK/Crypto/CrossSigning/MXCrossSigningInfoSource.swift
@@ -16,7 +16,7 @@
 
 import Foundation
 
-#if DEBUG && os(iOS)
+#if DEBUG
 
 /// Convenience struct which transforms `MatrixSDKCrypto` cross signing info formats
 /// into `MatrixSDK` `MXCrossSigningInfo` formats.

diff --git a/MatrixSDK/Crypto/CrossSigning/MXCrossSigningV2.swift b/MatrixSDK/Crypto/CrossSigning/MXCrossSigningV2.swift
@@ -16,7 +16,7 @@
 
 import Foundation
 
-#if DEBUG && os(iOS)
+#if DEBUG
 
 /// A work-in-progress subclass of `MXCrossSigning` instantiated and used by `MXCryptoV2`.
 ///

diff --git a/MatrixSDK/Crypto/CryptoMachine/MXCryptoMachine.swift b/MatrixSDK/Crypto/CryptoMachine/MXCryptoMachine.swift
@@ -16,7 +16,7 @@
 
 import Foundation
 
-#if DEBUG && os(iOS)
+#if DEBUG
 
 import MatrixSDKCrypto
 
@@ -693,7 +693,7 @@ extension MXCryptoMachine: MXCryptoBackup {
  guard let json = MXTools.serialiseJSONObject(jsonKeys) else {
  throw Error.cannotSerialize
  }
- return try machine.importDecryptedKeys(keys: json, progressListener: progressListener)
+ return try machine.importDecryptedRoomKeys(keys: json, progressListener: progressListener)
  }
 }
 

diff --git a/MatrixSDK/Crypto/CryptoMachine/MXCryptoProtocols.swift b/MatrixSDK/Crypto/CryptoMachine/MXCryptoProtocols.swift
@@ -16,7 +16,7 @@
 
 import Foundation
 
-#if DEBUG && os(iOS)
+#if DEBUG
 
 import MatrixSDKCrypto
 

diff --git a/MatrixSDK/Crypto/CryptoMachine/MXCryptoRequests.swift b/MatrixSDK/Crypto/CryptoMachine/MXCryptoRequests.swift
@@ -16,7 +16,7 @@
 
 import Foundation
 
-#if DEBUG && os(iOS)
+#if DEBUG
 
 import MatrixSDKCrypto
 

diff --git a/MatrixSDK/Crypto/CryptoMachine/MXEventDecryptionResult+DecryptedEvent.swift b/MatrixSDK/Crypto/CryptoMachine/MXEventDecryptionResult+DecryptedEvent.swift
@@ -16,7 +16,7 @@
 
 import Foundation
 
-#if DEBUG && os(iOS)
+#if DEBUG
 
 import MatrixSDKCrypto
 

diff --git a/MatrixSDK/Crypto/Devices/Data/MXCryptoDeviceWrapper.swift b/MatrixSDK/Crypto/Devices/Data/MXCryptoDeviceWrapper.swift
@@ -16,7 +16,7 @@
 
 import Foundation
 
-#if DEBUG && os(iOS)
+#if DEBUG
 
 import MatrixSDKCrypto
 

diff --git a/MatrixSDK/Crypto/Devices/Data/MXDeviceInfo.h b/MatrixSDK/Crypto/Devices/Data/MXDeviceInfo.h
@@ -34,7 +34,7 @@ extern NSString *const MXDeviceInfoTrustLevelDidChangeNotification;
 
 - (instancetype)initWithDeviceId:(NSString *)deviceId;
 
-#if DEBUG && TARGET_OS_IPHONE
+#if DEBUG
 /**
  Initialize device info with MatrixSDKCrypto device
  */

diff --git a/MatrixSDK/Crypto/Devices/Data/MXDeviceInfo.m b/MatrixSDK/Crypto/Devices/Data/MXDeviceInfo.m
@@ -35,7 +35,7 @@ - (instancetype)initWithDeviceId:(NSString *)deviceId
  return self;
 }
 
-#if DEBUG && TARGET_OS_IPHONE
+#if DEBUG
 - (instancetype)initWithDevice:(MXCryptoDeviceWrapper *)device
 {
  self = [super init];

diff --git a/MatrixSDK/Crypto/Devices/MXDeviceInfoSource.swift b/MatrixSDK/Crypto/Devices/MXDeviceInfoSource.swift
@@ -16,7 +16,7 @@
 
 import Foundation
 
-#if DEBUG && os(iOS)
+#if DEBUG
 
 /// Convenience struct which transforms `MatrixSDKCrypto` device formats
 /// into `MatrixSDK` `MXDeviceInfo` formats.

diff --git a/MatrixSDK/Crypto/KeyBackup/Engine/MXCryptoKeyBackupEngine.swift b/MatrixSDK/Crypto/KeyBackup/Engine/MXCryptoKeyBackupEngine.swift
@@ -16,7 +16,7 @@
 
 import Foundation
 
-#if DEBUG && os(iOS)
+#if DEBUG
 
 import MatrixSDKCrypto
 

diff --git a/MatrixSDK/Crypto/MXCryptoV2.swift b/MatrixSDK/Crypto/MXCryptoV2.swift
@@ -27,35 +27,31 @@ public extension MXCrypto {
  @objc static func createCryptoV2IfAvailable(session: MXSession!) -> MXCrypto? {
  let log = MXNamedLog(name: "MXCryptoV2")
 
- #if os(iOS)
- guard MXSDKOptions.sharedInstance().enableCryptoV2 else {
- return nil
- }
-
- guard
- let session = session,
- let restClient = session.matrixRestClient,
- let userId = restClient.credentials?.userId,
- let deviceId = restClient.credentials?.deviceId
- else {
- log.failure("Cannot create crypto V2, missing properties")
- return nil
- }
-
- do {
- return try MXCryptoV2(userId: userId, deviceId: deviceId, session: session, restClient: restClient)
- } catch {
- log.failure("Error creating crypto V2", context: error)
- return nil
- }
- #else
+ guard MXSDKOptions.sharedInstance().enableCryptoV2 else {
  return nil
- #endif
+ }
+
+ guard
+ let session = session,
+ let restClient = session.matrixRestClient,
+ let userId = restClient.credentials?.userId,
+ let deviceId = restClient.credentials?.deviceId
+ else {
+ log.failure("Cannot create crypto V2, missing properties")
+ return nil
+ }
+
+ do {
+ return try MXCryptoV2(userId: userId, deviceId: deviceId, session: session, restClient: restClient)
+ } catch {
+ log.failure("Error creating crypto V2", context: error)
+ return nil
+ }
  }
 }
 #endif
 
-#if DEBUG && os(iOS)
+#if DEBUG
 
 import MatrixSDKCrypto
 

diff --git a/MatrixSDK/Crypto/SecretStorage/MXCryptoSecretStoreV2.swift b/MatrixSDK/Crypto/SecretStorage/MXCryptoSecretStoreV2.swift
@@ -16,7 +16,7 @@
 
 import Foundation
 
-#if DEBUG && os(iOS)
+#if DEBUG
 
 /// Secret store compatible with Rust-based Crypto V2, where
 /// backup secrets are stored internally in the Crypto machine

diff --git a/MatrixSDK/Crypto/Trust/MXTrustLevelSource.swift b/MatrixSDK/Crypto/Trust/MXTrustLevelSource.swift
@@ -16,7 +16,7 @@
 
 import Foundation
 
-#if DEBUG && os(iOS)
+#if DEBUG
 
 /// Convenience struct which transforms `MatrixSDKCrypto` trust levels
 /// into `MatrixSDK` `MXUserTrustLevel`, `MXDeviceTrustLevel` and `MXUsersTrustLevelSummary` formats.

diff --git a/MatrixSDK/Crypto/Verification/MXKeyVerificationManagerV2.swift b/MatrixSDK/Crypto/Verification/MXKeyVerificationManagerV2.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-#if DEBUG && os(iOS)
+#if DEBUG
 
 import MatrixSDKCrypto
 

diff --git a/MatrixSDK/Crypto/Verification/Requests/MXKeyVerificationRequestV2.swift b/MatrixSDK/Crypto/Verification/Requests/MXKeyVerificationRequestV2.swift
@@ -16,7 +16,7 @@
 
 import Foundation
 
-#if DEBUG && os(iOS)
+#if DEBUG
 
 import MatrixSDKCrypto
 

diff --git a/MatrixSDK/Crypto/Verification/Transactions/SAS/MXSASTransactionV2.swift b/MatrixSDK/Crypto/Verification/Transactions/SAS/MXSASTransactionV2.swift
@@ -16,7 +16,7 @@
 
 import Foundation
 
-#if DEBUG && os(iOS)
+#if DEBUG
 
 import MatrixSDKCrypto
 

diff --git a/MatrixSDKTests/Crypto/CrossSigning/Data/MXCrossSigningInfoUnitTests.swift b/MatrixSDKTests/Crypto/CrossSigning/Data/MXCrossSigningInfoUnitTests.swift
@@ -18,7 +18,7 @@ import Foundation
 import XCTest
 @testable import MatrixSDK
 
-#if DEBUG && os(iOS)
+#if DEBUG
 
 import MatrixSDKCrypto
 

diff --git a/MatrixSDKTests/Crypto/CrossSigning/MXCrossSigningInfoSourceUnitTests.swift b/MatrixSDKTests/Crypto/CrossSigning/MXCrossSigningInfoSourceUnitTests.swift
@@ -18,7 +18,7 @@ import Foundation
 import XCTest
 @testable import MatrixSDK
 
-#if DEBUG && os(iOS)
+#if DEBUG
 
 import MatrixSDKCrypto
 

diff --git a/MatrixSDKTests/Crypto/CrossSigning/MXCrossSigningV2UnitTests.swift b/MatrixSDKTests/Crypto/CrossSigning/MXCrossSigningV2UnitTests.swift
@@ -18,7 +18,7 @@ import Foundation
 import XCTest
 @testable import MatrixSDK
 
-#if os(iOS)
+#if DEBUG
 
 import MatrixSDKCrypto
 

diff --git a/MatrixSDKTests/Crypto/CryptoMachine/Device+Stub.swift b/MatrixSDKTests/Crypto/CryptoMachine/Device+Stub.swift
@@ -16,7 +16,7 @@
 
 import Foundation
 
-#if DEBUG && os(iOS)
+#if DEBUG
 
 import MatrixSDKCrypto
 

diff --git a/MatrixSDKTests/Crypto/CryptoMachine/MXCryptoProtocolStubs.swift b/MatrixSDKTests/Crypto/CryptoMachine/MXCryptoProtocolStubs.swift
@@ -17,7 +17,7 @@
 import Foundation
 @testable import MatrixSDK
 
-#if DEBUG && os(iOS)
+#if DEBUG
 
 @testable import MatrixSDKCrypto
 

diff --git a/MatrixSDKTests/Crypto/CryptoMachine/MXCryptoRequestsUnitTests.swift b/MatrixSDKTests/Crypto/CryptoMachine/MXCryptoRequestsUnitTests.swift
@@ -17,7 +17,7 @@
 import Foundation
 @testable import MatrixSDK
 
-#if DEBUG && os(iOS)
+#if DEBUG
 
 import MatrixSDKCrypto
 

diff --git a/MatrixSDKTests/Crypto/Devices/Data/MXDeviceInfoUnitTests.swift b/MatrixSDKTests/Crypto/Devices/Data/MXDeviceInfoUnitTests.swift
@@ -18,7 +18,7 @@ import Foundation
 import XCTest
 @testable import MatrixSDK
 
-#if DEBUG && os(iOS)
+#if DEBUG
 
 import MatrixSDKCrypto
 

diff --git a/MatrixSDKTests/Crypto/Devices/MXDeviceInfoSourceUnitTests.swift b/MatrixSDKTests/Crypto/Devices/MXDeviceInfoSourceUnitTests.swift
@@ -18,7 +18,7 @@ import Foundation
 import XCTest
 @testable import MatrixSDK
 
-#if DEBUG && os(iOS)
+#if DEBUG
 
 import MatrixSDKCrypto
 

diff --git a/MatrixSDKTests/Crypto/KeyBackup/Engine/MXCryptoKeyBackupEngineUnitTests.swift b/MatrixSDKTests/Crypto/KeyBackup/Engine/MXCryptoKeyBackupEngineUnitTests.swift
@@ -17,7 +17,7 @@
 import Foundation
 @testable import MatrixSDK
 
-#if DEBUG && os(iOS)
+#if DEBUG
 
 import MatrixSDKCrypto
 

diff --git a/MatrixSDKTests/Crypto/Trust/MXTrustLevelSourceUnitTests.swift b/MatrixSDKTests/Crypto/Trust/MXTrustLevelSourceUnitTests.swift
@@ -18,7 +18,7 @@ import Foundation
 import XCTest
 @testable import MatrixSDK
 
-#if DEBUG && os(iOS)
+#if DEBUG
 
 import MatrixSDKCrypto
 

diff --git a/MatrixSDKTests/Crypto/Verification/MXKeyVerificationManagerV2UnitTests.swift b/MatrixSDKTests/Crypto/Verification/MXKeyVerificationManagerV2UnitTests.swift
@@ -18,7 +18,7 @@ import Foundation
 import XCTest
 @testable import MatrixSDK
 
-#if DEBUG && os(iOS)
+#if DEBUG
 
 class MXKeyVerificationManagerV2UnitTests: XCTestCase {
  class MockSession: MXSession {

diff --git a/MatrixSDKTests/Crypto/Verification/Requests/MXKeyVerificationRequestV2UnitTests.swift b/MatrixSDKTests/Crypto/Verification/Requests/MXKeyVerificationRequestV2UnitTests.swift
@@ -17,7 +17,7 @@
 import Foundation
 import XCTest
 
-#if DEBUG && os(iOS)
+#if DEBUG
 
 import MatrixSDKCrypto
 @testable import MatrixSDK

diff --git a/MatrixSDKTests/Crypto/Verification/Requests/VerificationRequest+Stub.swift b/MatrixSDKTests/Crypto/Verification/Requests/VerificationRequest+Stub.swift
@@ -16,7 +16,7 @@
 
 import Foundation
 
-#if DEBUG && os(iOS)
+#if DEBUG
 
 import MatrixSDKCrypto
 

diff --git a/MatrixSDKTests/Crypto/Verification/Transactions/SAS/MXSASTransactionV2UnitTests.swift b/MatrixSDKTests/Crypto/Verification/Transactions/SAS/MXSASTransactionV2UnitTests.swift
@@ -17,7 +17,7 @@
 import Foundation
 import XCTest
 
-#if os(iOS)
+#if DEBUG
 
 import MatrixSDKCrypto
 @testable import MatrixSDK

diff --git a/MatrixSDKTests/Crypto/Verification/Transactions/SAS/Sas+Stub.swift b/MatrixSDKTests/Crypto/Verification/Transactions/SAS/Sas+Stub.swift
@@ -16,7 +16,7 @@
 
 import Foundation
 
-#if DEBUG && os(iOS)
+#if DEBUG
 
 import MatrixSDKCrypto