bitwarden/sdk-internal@fc75b90 1.0.0-2742-fc75b90 - [PM-24051] Init crypto and update kdf with MasterPasswordUnlock (bitwarden/sdk-internal#399)

Author: bitwarden-devops-bot

Package.swift

@@ -30,7 +30,7 @@ let package = Package(
             dependencies: ["BitwardenSdk"]),
         .binaryTarget(
   name: "BitwardenFFI",
-  url: "https://github.com/bitwarden/sdk-swift/releases/download/v1.0.0-2733-8d5a4e7/BitwardenFFI-1.0.0-8d5a4e7.xcframework.zip",
-  checksum: "1a3469852e62a0caef09926662d232b48bb8ed1eef77333d02eacb2d80da1273")
+  url: "https://github.com/bitwarden/sdk-swift/releases/download/v1.0.0-2742-fc75b90/BitwardenFFI-1.0.0-fc75b90.xcframework.zip",
+  checksum: "a781e7f84667247a95b4d65a629da91412b518ca15f743735f4c8c15e3a3b6f8")
     ]
 )

Sources/BitwardenSdk/BitwardenCollections.swift

@@ -998,8 +998,8 @@ private let initializationResult: InitializationResult = {
         return InitializationResult.contractVersionMismatch
     }
 
-    uniffiEnsureBitwardenCryptoInitialized()
     uniffiEnsureBitwardenCoreInitialized()
+    uniffiEnsureBitwardenCryptoInitialized()
     return InitializationResult.ok
 }()
 

Sources/BitwardenSdk/BitwardenCore.swift

@@ -4016,6 +4016,17 @@ public enum InitUserCryptoMethod {
          * The user's encrypted symmetric crypto key
          */userKey: EncString
     )
+    /**
+     * Master Password Unlock
+     */
+    case masterPasswordUnlock(
+        /**
+         * The user's master password
+         */password: String, 
+        /**
+         * Contains the data needed to unlock with the master password
+         */masterPasswordUnlock: MasterPasswordUnlockData
+    )
     /**
      * Never lock and/or biometric unlock
      */
@@ -4102,22 +4113,25 @@ public struct FfiConverterTypeInitUserCryptoMethod: FfiConverterRustBuffer {
         case 1: return .password(password: try FfiConverterString.read(from: &buf), userKey: try FfiConverterTypeEncString.read(from: &buf)
         )
 
-        case 2: return .decryptedKey(decryptedUserKey: try FfiConverterString.read(from: &buf)
+        case 2: return .masterPasswordUnlock(password: try FfiConverterString.read(from: &buf), masterPasswordUnlock: try FfiConverterTypeMasterPasswordUnlockData.read(from: &buf)
         )
 
-        case 3: return .pin(pin: try FfiConverterString.read(from: &buf), pinProtectedUserKey: try FfiConverterTypeEncString.read(from: &buf)
+        case 3: return .decryptedKey(decryptedUserKey: try FfiConverterString.read(from: &buf)
         )
 
-        case 4: return .pinEnvelope(pin: try FfiConverterString.read(from: &buf), pinProtectedUserKeyEnvelope: try FfiConverterTypePasswordProtectedKeyEnvelope.read(from: &buf)
+        case 4: return .pin(pin: try FfiConverterString.read(from: &buf), pinProtectedUserKey: try FfiConverterTypeEncString.read(from: &buf)
         )
 
-        case 5: return .authRequest(requestPrivateKey: try FfiConverterTypeB64.read(from: &buf), method: try FfiConverterTypeAuthRequestMethod.read(from: &buf)
+        case 5: return .pinEnvelope(pin: try FfiConverterString.read(from: &buf), pinProtectedUserKeyEnvelope: try FfiConverterTypePasswordProtectedKeyEnvelope.read(from: &buf)
         )
 
-        case 6: return .deviceKey(deviceKey: try FfiConverterString.read(from: &buf), protectedDevicePrivateKey: try FfiConverterTypeEncString.read(from: &buf), deviceProtectedUserKey: try FfiConverterTypeUnsignedSharedKey.read(from: &buf)
+        case 6: return .authRequest(requestPrivateKey: try FfiConverterTypeB64.read(from: &buf), method: try FfiConverterTypeAuthRequestMethod.read(from: &buf)
         )
 
-        case 7: return .keyConnector(masterKey: try FfiConverterTypeB64.read(from: &buf), userKey: try FfiConverterTypeEncString.read(from: &buf)
+        case 7: return .deviceKey(deviceKey: try FfiConverterString.read(from: &buf), protectedDevicePrivateKey: try FfiConverterTypeEncString.read(from: &buf), deviceProtectedUserKey: try FfiConverterTypeUnsignedSharedKey.read(from: &buf)
+        )
+        
+        case 8: return .keyConnector(masterKey: try FfiConverterTypeB64.read(from: &buf), userKey: try FfiConverterTypeEncString.read(from: &buf)
         )
 
         default: throw UniffiInternalError.unexpectedEnumCase
@@ -4134,38 +4148,44 @@ public struct FfiConverterTypeInitUserCryptoMethod: FfiConverterRustBuffer {
             FfiConverterTypeEncString.write(userKey, into: &buf)
 
 
-        case let .decryptedKey(decryptedUserKey):
+        case let .masterPasswordUnlock(password,masterPasswordUnlock):
             writeInt(&buf, Int32(2))
+            FfiConverterString.write(password, into: &buf)
+            FfiConverterTypeMasterPasswordUnlockData.write(masterPasswordUnlock, into: &buf)
+            
+        
+        case let .decryptedKey(decryptedUserKey):
+            writeInt(&buf, Int32(3))
             FfiConverterString.write(decryptedUserKey, into: &buf)
 
 
         case let .pin(pin,pinProtectedUserKey):
-            writeInt(&buf, Int32(3))
+            writeInt(&buf, Int32(4))
             FfiConverterString.write(pin, into: &buf)
             FfiConverterTypeEncString.write(pinProtectedUserKey, into: &buf)
 
 
         case let .pinEnvelope(pin,pinProtectedUserKeyEnvelope):
-            writeInt(&buf, Int32(4))
+            writeInt(&buf, Int32(5))
             FfiConverterString.write(pin, into: &buf)
             FfiConverterTypePasswordProtectedKeyEnvelope.write(pinProtectedUserKeyEnvelope, into: &buf)
 
 
         case let .authRequest(requestPrivateKey,method):
-            writeInt(&buf, Int32(5))
+            writeInt(&buf, Int32(6))
             FfiConverterTypeB64.write(requestPrivateKey, into: &buf)
             FfiConverterTypeAuthRequestMethod.write(method, into: &buf)
 
 
         case let .deviceKey(deviceKey,protectedDevicePrivateKey,deviceProtectedUserKey):
-            writeInt(&buf, Int32(6))
+            writeInt(&buf, Int32(7))
             FfiConverterString.write(deviceKey, into: &buf)
             FfiConverterTypeEncString.write(protectedDevicePrivateKey, into: &buf)
             FfiConverterTypeUnsignedSharedKey.write(deviceProtectedUserKey, into: &buf)
 
 
         case let .keyConnector(masterKey,userKey):
-            writeInt(&buf, Int32(7))
+            writeInt(&buf, Int32(8))
             FfiConverterTypeB64.write(masterKey, into: &buf)
             FfiConverterTypeEncString.write(userKey, into: &buf)
 
@@ -5141,8 +5161,8 @@ private let initializationResult: InitializationResult = {
     }
 
     uniffiCallbackInitClientManagedTokens()
-    uniffiEnsureBitwardenEncodingInitialized()
     uniffiEnsureBitwardenCryptoInitialized()
+    uniffiEnsureBitwardenEncodingInitialized()
     return InitializationResult.ok
 }()
 

Sources/BitwardenSdk/BitwardenSDK.swift

@@ -8176,17 +8176,17 @@ private let initializationResult: InitializationResult = {
     uniffiCallbackInitFido2CredentialStore()
     uniffiCallbackInitFido2UserInterface()
     uniffiCallbackInitFolderRepository()
-    uniffiEnsureBitwardenStateInitialized()
-    uniffiEnsureBitwardenSendInitialized()
     uniffiEnsureBitwardenCollectionsInitialized()
-    uniffiEnsureBitwardenVaultInitialized()
-    uniffiEnsureBitwardenSshInitialized()
+    uniffiEnsureBitwardenFidoInitialized()
     uniffiEnsureBitwardenCryptoInitialized()
+    uniffiEnsureBitwardenGeneratorsInitialized()
     uniffiEnsureBitwardenCoreInitialized()
-    uniffiEnsureBitwardenExportersInitialized()
+    uniffiEnsureBitwardenSshInitialized()
+    uniffiEnsureBitwardenSendInitialized()
     uniffiEnsureBitwardenEncodingInitialized()
-    uniffiEnsureBitwardenGeneratorsInitialized()
-    uniffiEnsureBitwardenFidoInitialized()
+    uniffiEnsureBitwardenExportersInitialized()
+    uniffiEnsureBitwardenStateInitialized()
+    uniffiEnsureBitwardenVaultInitialized()
     return InitializationResult.ok
 }()
 

Sources/BitwardenSdk/BitwardenVault.swift

@@ -7662,8 +7662,8 @@ private let initializationResult: InitializationResult = {
     }
 
     uniffiEnsureBitwardenCollectionsInitialized()
-    uniffiEnsureBitwardenCoreInitialized()
     uniffiEnsureBitwardenCryptoInitialized()
+    uniffiEnsureBitwardenCoreInitialized()
     return InitializationResult.ok
 }()