chore(cryptobox): remove cryptobox migration manager - WPB-22227

.github/workflows/test_pr_changes.yml

@@ -71,8 +71,6 @@ jobs:
               - 'scripts/**'
             wire-ios:
               - 'wire-ios/**'
-            wire-ios-cryptobox:
-              - 'wire-ios-cryptobox/**'
             wire-ios-data-model:
               - 'wire-ios-data-model/**'
             wire-ios-images:

Cartfile

@@ -1,3 +1,2 @@
-github "wireapp/cryptobox-ios" "v1.1.0_xcframework_arm64simulator"
 github "wireapp/libPhoneNumber-iOS" "1.1"
 github "wireapp/ocmock" "v3.4.3_Xcode14.3.1"

README.md

@@ -22,7 +22,7 @@ No license is granted to the Wire trademark and its associated logos, all of whi
 The Wire mobile app has an architectural layer that we call *sync engine*. It is the client-side layer that processes all the data that is displayed in the mobile app. It handles network communication and authentication with the backend, push notifications, local caching of data, client-side business logic, signaling with the audio-video libraries, encryption and decryption (using encryption libraries from a lower level) and other bits and pieces.
 
 The user interface layer of the mobile app is built on top of the *sync engine*, which provides the data to display to the UI.
-The sync engine itself is built on top of a few third-party frameworks, and uses Wire components that are shared between platforms for cryptography (Proteus/Cryptobox) and audio-video signaling (AVS).
+The sync engine itself is built on top of a few third-party frameworks, and uses Wire components that are shared between platforms for cryptography (Proteus/MLS) and audio-video signaling (AVS).
 
 ![Mobile app architecture](https://github.com/wireapp/wire/blob/master/assets/mobile-architecture.png?raw=true)
 

WireDomain/Sources/WireDomain/Notifications/Components/Legacy/PullEventsStep.swift

@@ -131,7 +131,6 @@ extension PullEventsStep {
             accountDirectory: accountContainer,
             sharedUserDefaults: sharedUserDefaults,
             syncContext: dependency.coreData.syncContext,
-            cryptoboxMigrationManager: CryptoboxMigrationManager(),
             coreCryptoKeyMigrationManager: CoreCryptoKeyMigrationManager(journal: journal),
             allowCreation: false,
             localDomain: BackendInfo.domain

WireDomain/Sources/WireDomain/Notifications/Components/Legacy/SyncEventsStep.swift

@@ -187,7 +187,6 @@ extension SyncEventsStep {
             accountDirectory: accountContainer,
             sharedUserDefaults: sharedUserDefaults,
             syncContext: dependency.coreData.syncContext,
-            cryptoboxMigrationManager: CryptoboxMigrationManager(),
             coreCryptoKeyMigrationManager: CoreCryptoKeyMigrationManager(journal: journal),
             allowCreation: false,
             localDomain: BackendInfo.domain

WireDomain/Sources/WireDomain/Notifications/Components/NSEClientScope.swift

@@ -32,7 +32,6 @@ protocol NSEClientScopeDependency: Dependency {
     var journal: Journal { get }
     var sharedUserDefaults: UserDefaults { get }
     var cookieStorage: CookieStorage { get }
-    var cryptoboxMigrationManager: CryptoboxMigrationManager { get }
 
 }
 
@@ -253,7 +252,6 @@ final class NSEClientScope: Component<NSEClientScopeDependency> {
                 accountDirectory: dependency.userAccountDataURL,
                 sharedUserDefaults: dependency.sharedUserDefaults,
                 syncContext: coreDataStack.syncContext,
-                cryptoboxMigrationManager: dependency.cryptoboxMigrationManager,
                 coreCryptoKeyMigrationManager: coreCryptoMigrationManager,
                 allowCreation: false,
                 localDomain: localDomain

WireDomain/Sources/WireDomain/Notifications/Components/NSEUserScope.swift

@@ -90,8 +90,6 @@ final class NSEUserScope: Component<NSEUserScopeDependency> {
         }
     }
 
-    public let cryptoboxMigrationManager: CryptoboxMigrationManager = .init()
-
     init(
         parent: any Scope,
         account: Account
@@ -143,10 +141,6 @@ final class NSEUserScope: Component<NSEUserScopeDependency> {
             throw Failure.userNotAuthenticated
         }
 
-        guard !cryptoboxMigrationManager.isMigrationNeeded(accountDirectory: userAccountDataURL) else {
-            throw Failure.mainAppRequired(message: "cryptobox migration required")
-        }
-
         guard coreCryptoKeyMigrationManager.isAnyMigrationRequired else {
             throw Failure.mainAppRequired(message: "core crypto key migration required")
         }

WireDomain/Sources/WireDomain/Repositories/Message/MessageLocalStore.swift

@@ -18,7 +18,6 @@
 
 import CoreData
 import GenericMessageProtocol
-import WireCryptobox
 import WireDataModel
 import WireLogging
 

wire-ios-cryptobox/WireCryptobox/ChaCha20Poly1305/AEADEncryption.swift → WireFoundation/Sources/WireCrypto/AEADEncryption.swift

@@ -17,9 +17,7 @@
 //
 
 import Clibsodium
-import Foundation
-import WireCrypto
-import WireUtilities
+public import Foundation
 
 public extension ChaCha20Poly1305 {
 
@@ -152,11 +150,11 @@ public extension ChaCha20Poly1305 {
 
         // MARK: - Verification
 
-        private static func verifyKey(bytes: [Byte]) throws {
+        private static func verifyKey(bytes: [UInt8]) throws {
             guard bytes.count == keyLength else { throw EncryptionError.malformedKey }
         }
 
-        private static func verifyNonce(bytes: [Byte]) throws {
+        private static func verifyNonce(bytes: [UInt8]) throws {
             guard bytes.count == nonceLength else { throw EncryptionError.malformedNonce }
         }
 
@@ -182,14 +180,14 @@ public extension ChaCha20Poly1305 {
 
         // MARK: - Buffer creation
 
-        static func generateRandomNonceBytes() -> [Byte] {
+        static func generateRandomNonceBytes() -> [UInt8] {
             var nonce = createByteArray(length: nonceLength)
             randombytes_buf(&nonce, nonce.count)
             return nonce
         }
 
-        private static func createByteArray(length: Int) -> [Byte] {
-            [Byte](repeating: 0, count: length)
+        private static func createByteArray(length: Int) -> [UInt8] {
+            [UInt8](repeating: 0, count: length)
         }
 
     }

fastlane/framework.rb

@@ -16,7 +16,6 @@ def self.all
             "WireUI",
             "wire-ios",
             "wire-ios-canvas",
-            "wire-ios-cryptobox",
             "wire-ios-data-model",
             "wire-ios-images",
             "wire-ios-link-preview",
@@ -65,7 +64,6 @@ def self.all
         frameworks["wire-ios-request-strategy"].add_dependency(frameworks["WireNetwork"])
         frameworks["wire-ios-request-strategy"].add_dependency(frameworks["WireLogging"])
 
-        frameworks["wire-ios-data-model"].add_dependency(frameworks["wire-ios-cryptobox"])
         frameworks["wire-ios-data-model"].add_dependency(frameworks["wire-ios-images"])
         frameworks["wire-ios-data-model"].add_dependency(frameworks["wire-ios-link-preview"])
         frameworks["wire-ios-data-model"].add_dependency(frameworks["wire-ios-transport"])
@@ -75,9 +73,6 @@ def self.all
         frameworks["wire-ios-data-model"].add_dependency(frameworks["WireLogging"])
 
         frameworks["wire-ios-mocktransport"].add_dependency(frameworks["wire-ios-testing"])
-        frameworks["wire-ios-mocktransport"].add_dependency(frameworks["wire-ios-cryptobox"])
-
-        frameworks["wire-ios-cryptobox"].add_dependency(frameworks["wire-ios-utilities"])
 
         frameworks["wire-ios-transport"].add_dependency(frameworks["wire-ios-utilities"])
         frameworks["wire-ios-transport"].add_dependency(frameworks["wire-ios-testing"]) # included in WireTransportTests