From 671867601cb0f1e617d548336b4698c700ad4b40 Mon Sep 17 00:00:00 2001
From: Isaiah Inuwa <iinuwa@bitwarden.com>
Date: Thu, 18 Dec 2025 13:41:54 -0600
Subject: [PATCH] Complete MakeCredential struct fields

---
 .../win_webauthn/src/plugin/types.rs          | 46 ++++++++++++++++++-
 1 file changed, 44 insertions(+), 2 deletions(-)

diff --git a/apps/desktop/desktop_native/win_webauthn/src/plugin/types.rs b/apps/desktop/desktop_native/win_webauthn/src/plugin/types.rs
index 39c516be67d..7729a5d56ce 100644
--- a/apps/desktop/desktop_native/win_webauthn/src/plugin/types.rs
+++ b/apps/desktop/desktop_native/win_webauthn/src/plugin/types.rs
@@ -4,7 +4,7 @@
 #![allow(non_snake_case)]
 #![allow(non_camel_case_types)]
 
-use std::{mem::MaybeUninit, ptr::NonNull};
+use std::{mem::MaybeUninit, num::NonZeroU32, ptr::NonNull};
 
 use base64::{engine::general_purpose::STANDARD, Engine as _};
 use windows::{
@@ -392,7 +392,49 @@ pub(super) struct WEBAUTHN_CTAPCBOR_MAKE_CREDENTIAL_REQUEST {
     pub cbCborExtensionsMap: u32,
     pub pbCborExtensionsMap: *const u8,
     pub pAuthenticatorOptions: *const WebAuthnCtapCborAuthenticatorOptions,
-    // Add other fields as needed...
+
+    // Pin Auth (Optional)
+    /// Indicates zero length PinAuth is included in the request
+    pub fEmptyPinAuth: BOOL,
+    pub cbPinAuth: u32,
+    pub pbPinAuth: *const u8,
+
+    /// "hmac-secret": true extension
+    pub lHmacSecretExt: i32,
+
+    /// "hmac-secret-mc" extension
+    pub pHmacSecretMcExtension: *const WEBAUTHN_CTAPCBOR_HMAC_SALT_EXTENSION,
+
+    /// "prf" extension
+    pub lPrfExt: i32,
+    pub cbHmacSecretSaltValues: u32,
+    pub pbHmacSecretSaltValues: *const u8,
+
+    /// "credProtect" extension. Nonzero if present
+    pub dwCredProtect: Option<NonZeroU32>,
+
+    /// Nonzero if present
+    pub dwPinProtocol: Option<NonZeroU32>,
+
+    /// Nonzero if present
+    pub dwEnterpriseAttestation: Option<NonZeroU32>,
+
+    /// "credBlob" extension. Nonzero if present
+    pub cbCredBlobExt: Option<NonZeroU32>,
+    pub pbCredBlobExt: *const u8,
+
+    /// "largeBlobKey": true extension
+    pub lLargeBlobKeyExt: i32,
+
+    /// "largeBlob": extension
+    pub dwLargeBlobSupport: u32,
+
+    /// "minPinLength": true extension
+    pub lMinPinLengthExt: i32,
+
+    /// "json" extension. Nonzero if present
+    pub cbJsonExt: u32,
+    pub pbJsonExt: *const u8,
 }
 
 #[derive(Debug)]