diff --git a/src/Core/Auth/Models/Api/Request/Opaque/OpaqueRegistrationStartRequest.cs b/src/Core/Auth/Models/Api/Request/Opaque/OpaqueRegistrationStartRequest.cs index 355fda3ed0..3015f59e97 100644 --- a/src/Core/Auth/Models/Api/Request/Opaque/OpaqueRegistrationStartRequest.cs +++ b/src/Core/Auth/Models/Api/Request/Opaque/OpaqueRegistrationStartRequest.cs @@ -20,16 +20,25 @@ public class CipherConfiguration [Required] public Argon2KsfParameters Argon2Parameters { get; set; } - public Bitwarden.OPAQUE.CipherConfiguration ToNativeConfiguration() + public Bitwarden.Opaque.CipherConfiguration ToNativeConfiguration() { if (CipherSuite == OpaqueKe3Ristretto3DHArgonSuite) { - return new Bitwarden.OPAQUE.CipherConfiguration + return new Bitwarden.Opaque.CipherConfiguration { - OprfCS = Bitwarden.OPAQUE.OprfCS.Ristretto255, - KeGroup = Bitwarden.OPAQUE.KeGroup.Ristretto255, - KeyExchange = Bitwarden.OPAQUE.KeyExchange.TripleDH, - KSF = new Bitwarden.OPAQUE.Argon2id(Argon2Parameters.Iterations, Argon2Parameters.Memory, Argon2Parameters.Parallelism) + OprfCs = Bitwarden.Opaque.OprfCs.Ristretto255, + KeGroup = Bitwarden.Opaque.KeGroup.Ristretto255, + KeyExchange = Bitwarden.Opaque.KeyExchange.TripleDH, + Ksf = new Bitwarden.Opaque.Ksf + { + Algorithm = Bitwarden.Opaque.KsfAlgorithm.Argon2id, + Parameters = new Bitwarden.Opaque.KsfParameters + { + Iterations = Argon2Parameters.Iterations, + Memory = Argon2Parameters.Memory, + Parallelism = Argon2Parameters.Parallelism + } + } }; } else diff --git a/src/Core/Auth/Services/Implementations/OpaqueKeyExchangeService.cs b/src/Core/Auth/Services/Implementations/OpaqueKeyExchangeService.cs index 75294b05ef..fe94f65d31 100644 --- a/src/Core/Auth/Services/Implementations/OpaqueKeyExchangeService.cs +++ b/src/Core/Auth/Services/Implementations/OpaqueKeyExchangeService.cs @@ -7,7 +7,7 @@ using Bit.Core.Auth.Models.Data; using Bit.Core.Auth.Repositories; using Bit.Core.Entities; using Bit.Core.Repositories; -using Bitwarden.OPAQUE; +using Bitwarden.Opaque; using Microsoft.Extensions.Caching.Distributed; namespace Bit.Core.Auth.Services; diff --git a/src/Core/Core.csproj b/src/Core/Core.csproj index 8bd7b91a4c..ca863f4736 100644 --- a/src/Core/Core.csproj +++ b/src/Core/Core.csproj @@ -32,6 +32,7 @@ + @@ -78,7 +79,9 @@ +