From e5e5b3c1ca038b18a07b099409f15ca5d2829302 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garci=CC=81a?= Date: Thu, 13 Mar 2025 11:59:01 +0100 Subject: [PATCH] Update to latest bindings --- .../Auth/Controllers/OpaqueKeyExchangeController.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Api/Auth/Controllers/OpaqueKeyExchangeController.cs b/src/Api/Auth/Controllers/OpaqueKeyExchangeController.cs index 4466cf2968..6f592d6edd 100644 --- a/src/Api/Auth/Controllers/OpaqueKeyExchangeController.cs +++ b/src/Api/Auth/Controllers/OpaqueKeyExchangeController.cs @@ -12,7 +12,7 @@ namespace Bit.Api.Auth.Controllers; public class OpaqueKeyExchangeController : Controller { private readonly IUserService _userService; - private readonly BitwardenOpaque _bitwardenOpaque; + private readonly BitwardenOpaqueServer _bitwardenOpaque; private CipherConfiguration _cipherConfiguration = new CipherConfiguration(); public OpaqueKeyExchangeController( @@ -20,7 +20,7 @@ public class OpaqueKeyExchangeController : Controller ) { _userService = userService; - _bitwardenOpaque = new BitwardenOpaque(); + _bitwardenOpaque = new BitwardenOpaqueServer(); _cipherConfiguration.KeGroup = KeGroup.Ristretto255; _cipherConfiguration.OprfCS = OprfCS.Ristretto255; _cipherConfiguration.KeyExchange = KeyExchange.TripleDH; @@ -31,9 +31,9 @@ public class OpaqueKeyExchangeController : Controller public async Task StartRegistration([FromBody] RegisterStartRequest request) { var user = await _userService.GetUserByPrincipalAsync(User); - var registrationRequest = _bitwardenOpaque.StartServerRegistration(_cipherConfiguration, System.Convert.FromBase64String(request.ClientRegistrationStartResult), user.Id.ToString()); - var message = registrationRequest.Item1; - var serverSetup = registrationRequest.Item2; + var registrationRequest = _bitwardenOpaque.StartRegistration(_cipherConfiguration, null, System.Convert.FromBase64String(request.ClientRegistrationStartResult), user.Id.ToString()); + var message = registrationRequest.registrationResponse; + var serverSetup = registrationRequest.serverSetup; // persist server setup var sessionId = Guid.NewGuid(); SessionStore.RegisterSessions.Add(sessionId, new RegisterSession() { SessionId = sessionId, ServerSetup = serverSetup, cipherConfiguration = _cipherConfiguration }); @@ -46,7 +46,7 @@ public class OpaqueKeyExchangeController : Controller { await Task.Run(() => { - var registrationFinish = _bitwardenOpaque.FinishServerRegistration(_cipherConfiguration, System.Convert.FromBase64String(request.ClientRegistrationFinishResult)); + var registrationFinish = _bitwardenOpaque.FinishRegistration(_cipherConfiguration, System.Convert.FromBase64String(request.ClientRegistrationFinishResult)); Console.WriteLine("Registration Finish: " + registrationFinish); }); return "Registration Finish";