From f12cc69b60525b9ea5fb4a8c4f09d404ed3d619d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andre=CC=81=20Bispo?= <abispo@bitwarden.com>
Date: Mon, 24 Jul 2023 09:28:10 +0100
Subject: [PATCH] [PM-2297] Fix trust device bug/typo

---
 src/Core/Abstractions/IDeviceTrustCryptoService.cs | 2 +-
 src/Core/Services/DeviceTrustCryptoService.cs      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Core/Abstractions/IDeviceTrustCryptoService.cs b/src/Core/Abstractions/IDeviceTrustCryptoService.cs
index cd622984b..87b7bea12 100644
--- a/src/Core/Abstractions/IDeviceTrustCryptoService.cs
+++ b/src/Core/Abstractions/IDeviceTrustCryptoService.cs
@@ -10,7 +10,7 @@ namespace Bit.Core.Abstractions
         Task<DeviceResponse> TrustDeviceIfNeededAsync();
         Task<bool> GetShouldTrustDeviceAsync();
         Task SetShouldTrustDeviceAsync(bool value);
-        Task<SymmetricCryptoKey> DecryptUserKeyWithDeviceKeyAsync(string encryptedDevicePrivateKey, string encryptedUserKey);
+        Task<UserKey> DecryptUserKeyWithDeviceKeyAsync(string encryptedDevicePrivateKey, string encryptedUserKey);
         Task<bool> IsDeviceTrustedAsync();
     }
 }
diff --git a/src/Core/Services/DeviceTrustCryptoService.cs b/src/Core/Services/DeviceTrustCryptoService.cs
index 891cdd8c9..c56df81b4 100644
--- a/src/Core/Services/DeviceTrustCryptoService.cs
+++ b/src/Core/Services/DeviceTrustCryptoService.cs
@@ -59,7 +59,7 @@ namespace Bit.Core.Services
             var deviceIdentifier = await _appIdService.GetAppIdAsync();
             var deviceRequest = new TrustedDeviceKeysRequest
             {
-                EncryptedUserKey = (await _cryptoService.RsaEncryptAsync(userKey.EncKey, devicePublicKey)).EncryptedString,
+                EncryptedUserKey = (await _cryptoService.RsaEncryptAsync(userKey.Key, devicePublicKey)).EncryptedString,
                 EncryptedPublicKey = (await _cryptoService.EncryptAsync(devicePublicKey, userKey)).EncryptedString,
                 EncryptedPrivateKey = (await _cryptoService.EncryptAsync(devicePrivateKey, deviceKey)).EncryptedString,
             };
@@ -106,7 +106,7 @@ namespace Bit.Core.Services
             return existingDeviceKey != null;
         }
 
-        public async Task<SymmetricCryptoKey> DecryptUserKeyWithDeviceKeyAsync(string encryptedDevicePrivateKey, string encryptedUserKey)
+        public async Task<UserKey> DecryptUserKeyWithDeviceKeyAsync(string encryptedDevicePrivateKey, string encryptedUserKey)
         {
             // Get device key
             var existingDeviceKey = await GetDeviceKeyAsync();
@@ -125,7 +125,7 @@ namespace Bit.Core.Services
 
             // Attempt to decrypt encryptedUserDataKey with devicePrivateKey
             var userKey = await _cryptoService.RsaDecryptAsync(encryptedUserKey, devicePrivateKey);
-            return new SymmetricCryptoKey(userKey);
+            return new UserKey(userKey);
         }
     }
 }