Fix build warnings

timokoessler · Sep 7, 2024 · e5ab795 · e5ab795
1 parent eea77b7
commit e5ab795
Show file tree

Hide file tree

Showing 15 changed files with 52 additions and 26 deletions.
diff --git a/Guard.Core/Security/WebAuthn/WebAuthnInterop.cs b/Guard.Core/Security/WebAuthn/WebAuthnInterop.cs
@@ -66,7 +66,7 @@ private static extern int WebAuthNAuthenticatorMakeCredential(
             [In] RawUserInfo rawUserInfo,
             [In] RawCoseCredentialParameters rawCoseCredParams,
             [In] RawClientData rawClientData,
-            [In, Optional] RawAuthenticatorMakeCredentialOptions rawMakeCredentialOptions,
+            [In, Optional] RawAuthenticatorMakeCredentialOptions? rawMakeCredentialOptions,
             [Out] out IntPtr rawCredentialAttestation
         );
 
@@ -123,7 +123,7 @@ private static extern WebAuthnHResult WebAuthNAuthenticatorGetAssertion(
             [In] IntPtr hWnd,
             [In, Optional] string rpId,
             [In] RawClientData rawClientData,
-            [In, Optional] RawAuthenticatorGetAssertionOptions rawGetAssertionOptions,
+            [In, Optional] RawAuthenticatorGetAssertionOptions? rawGetAssertionOptions,
             [Out] out IntPtr rawAssertionPtr
         );
 

diff --git a/Guard.Core/Security/WebAuthn/entities/Assertion.cs b/Guard.Core/Security/WebAuthn/entities/Assertion.cs
@@ -1,4 +1,5 @@
-using System.Runtime.InteropServices;
+#nullable disable
+using System.Runtime.InteropServices;
 
 // Based on https://github.com/dbeinder/Yoq.WindowsWebAuthn - Copyright (c) 2019 David Beinder - MIT License
 
@@ -82,15 +83,27 @@ public Assertion MarshalToPublic()
                 if (HmacSecret != IntPtr.Zero)
                 {
                     var rawSecret = Marshal.PtrToStructure<RawHmacSecretSalt>(HmacSecret);
-                    hmacSecret = new HmacSecret()
+                    if (rawSecret != null)
                     {
-                        First = new byte[rawSecret.FirstSize],
-                        Second = new byte[rawSecret.SecondSize]
-                    };
-                    if (rawSecret.FirstSize > 0 && rawSecret.First != IntPtr.Zero)
-                        Marshal.Copy(rawSecret.First, hmacSecret.First, 0, rawSecret.FirstSize);
-                    if (rawSecret.SecondSize > 0 && rawSecret.Second != IntPtr.Zero)
-                        Marshal.Copy(rawSecret.Second, hmacSecret.Second, 0, rawSecret.SecondSize);
+                        hmacSecret = new HmacSecret()
+                        {
+                            First = new byte[rawSecret.FirstSize],
+                            Second = new byte[rawSecret.SecondSize]
+                        };
+                        if (rawSecret.FirstSize > 0 && rawSecret.First != IntPtr.Zero)
+                        {
+                            Marshal.Copy(rawSecret.First, hmacSecret.First, 0, rawSecret.FirstSize);
+                        }
+                        if (rawSecret.SecondSize > 0 && rawSecret.Second != IntPtr.Zero)
+                        {
+                            Marshal.Copy(
+                                rawSecret.Second,
+                                hmacSecret.Second,
+                                0,
+                                rawSecret.SecondSize
+                            );
+                        }
+                    }
                 }
             }
 
@@ -135,6 +148,6 @@ internal class Assertion
 
         public LargeBlobStatus LargeBlobStatus;
         public byte[] LargeBlob;
-        public HmacSecret? HmacSecret;
+        public HmacSecret HmacSecret;
     }
 }
diff --git a/Guard.Core/Security/WebAuthn/entities/AuthenticatorGetAssertionOptions.cs b/Guard.Core/Security/WebAuthn/entities/AuthenticatorGetAssertionOptions.cs
@@ -1,4 +1,5 @@
-using System.Runtime.InteropServices;
+#nullable disable
+using System.Runtime.InteropServices;
 
 // Based on https://github.com/dbeinder/Yoq.WindowsWebAuthn - Copyright (c) 2019 David Beinder - MIT License
 

diff --git a/Guard.Core/Security/WebAuthn/entities/AuthenticatorMakeCredentialOptions.cs b/Guard.Core/Security/WebAuthn/entities/AuthenticatorMakeCredentialOptions.cs
@@ -1,4 +1,5 @@
-using System.Runtime.InteropServices;
+#nullable disable
+using System.Runtime.InteropServices;
 
 // Based on https://github.com/dbeinder/Yoq.WindowsWebAuthn - Copyright (c) 2019 David Beinder - MIT License
 

diff --git a/Guard.Core/Security/WebAuthn/entities/ClientData.cs b/Guard.Core/Security/WebAuthn/entities/ClientData.cs
@@ -1,4 +1,5 @@
-using System.Runtime.InteropServices;
+#nullable disable
+using System.Runtime.InteropServices;
 
 // Based on https://github.com/dbeinder/Yoq.WindowsWebAuthn - Copyright (c) 2019 David Beinder - MIT License
 
@@ -18,7 +19,7 @@ internal class RawClientData
         public IntPtr ClientDataJSON;
 
         // Hash algorithm ID used to hash the pbClientDataJSON field.
-        public string? HashAlgId;
+        public string HashAlgId;
 
         public RawClientData() { }
 

diff --git a/Guard.Core/Security/WebAuthn/entities/CommonAttestation.cs b/Guard.Core/Security/WebAuthn/entities/CommonAttestation.cs
@@ -1,4 +1,5 @@
-using System.Runtime.InteropServices;
+#nullable disable
+using System.Runtime.InteropServices;
 using System.Security.Cryptography.X509Certificates;
 
 // Based on https://github.com/dbeinder/Yoq.WindowsWebAuthn - Copyright (c) 2019 David Beinder - MIT License

diff --git a/Guard.Core/Security/WebAuthn/entities/CredProtect.cs b/Guard.Core/Security/WebAuthn/entities/CredProtect.cs
@@ -1,4 +1,5 @@
-using System.Runtime.InteropServices;
+#nullable disable
+using System.Runtime.InteropServices;
 
 // Based on https://github.com/dbeinder/Yoq.WindowsWebAuthn - Copyright (c) 2019 David Beinder - MIT License
 

diff --git a/Guard.Core/Security/WebAuthn/entities/CredentialAttestation.cs b/Guard.Core/Security/WebAuthn/entities/CredentialAttestation.cs
@@ -1,4 +1,5 @@
-using System.Runtime.InteropServices;
+#nullable disable
+using System.Runtime.InteropServices;
 
 // Based on https://github.com/dbeinder/Yoq.WindowsWebAuthn - Copyright (c) 2019 David Beinder - MIT License
 

diff --git a/Guard.Core/Security/WebAuthn/entities/Credentials.cs b/Guard.Core/Security/WebAuthn/entities/Credentials.cs
@@ -1,4 +1,5 @@
-using System.Runtime.InteropServices;
+#nullable disable
+using System.Runtime.InteropServices;
 
 // Based on https://github.com/dbeinder/Yoq.WindowsWebAuthn - Copyright (c) 2019 David Beinder - MIT License
 

diff --git a/Guard.Core/Security/WebAuthn/entities/CredentialsEx.cs b/Guard.Core/Security/WebAuthn/entities/CredentialsEx.cs
@@ -1,4 +1,5 @@
-using System.Runtime.InteropServices;
+#nullable disable
+using System.Runtime.InteropServices;
 
 // Based on https://github.com/dbeinder/Yoq.WindowsWebAuthn - Copyright (c) 2019 David Beinder - MIT License
 

diff --git a/Guard.Core/Security/WebAuthn/entities/Enumerations.cs b/Guard.Core/Security/WebAuthn/entities/Enumerations.cs
@@ -1,4 +1,5 @@
-using System.Collections.Concurrent;
+#nullable disable
+using System.Collections.Concurrent;
 using System.ComponentModel;
 using System.Reflection;
 using System.Runtime.InteropServices;

diff --git a/Guard.Core/Security/WebAuthn/entities/HmacSecret.cs b/Guard.Core/Security/WebAuthn/entities/HmacSecret.cs
@@ -1,4 +1,5 @@
-using System.Runtime.InteropServices;
+#nullable disable
+using System.Runtime.InteropServices;
 
 // Based on https://github.com/dbeinder/Yoq.WindowsWebAuthn - Copyright (c) 2019 David Beinder - MIT License
 

diff --git a/Guard.Core/Security/WebAuthn/entities/HmacSecretSalt.cs b/Guard.Core/Security/WebAuthn/entities/HmacSecretSalt.cs
@@ -1,4 +1,5 @@
-using System.Runtime.InteropServices;
+#nullable disable
+using System.Runtime.InteropServices;
 
 // Based on https://github.com/dbeinder/Yoq.WindowsWebAuthn - Copyright (c) 2019 David Beinder - MIT License
 

diff --git a/Guard.Core/Security/WebAuthn/entities/RawCoseCredentialParameters.cs b/Guard.Core/Security/WebAuthn/entities/RawCoseCredentialParameters.cs
@@ -1,4 +1,5 @@
-using System.Runtime.InteropServices;
+#nullable disable
+using System.Runtime.InteropServices;
 
 // Based on https://github.com/dbeinder/Yoq.WindowsWebAuthn - Copyright (c) 2019 David Beinder - MIT License
 

diff --git a/Guard.Core/Security/WebAuthn/entities/WebAuthnExtensions.cs b/Guard.Core/Security/WebAuthn/entities/WebAuthnExtensions.cs
@@ -1,4 +1,5 @@
-using System.Runtime.CompilerServices;
+#nullable disable
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // Based on https://github.com/dbeinder/Yoq.WindowsWebAuthn - Copyright (c) 2019 David Beinder - MIT License