misc: fix namespaces and minor things

DennisDyallo · DennisDyallo · commit 97a5c8a70511 · 2025-02-13T09:38:10.000+01:00
diff --git a/.github/workflows/verify-code-style.yml b/.github/workflows/verify-code-style.yml
@@ -30,7 +30,7 @@ on:
 jobs:
   verify-code-style:
     name: "Verify code style"
-    runs-on: windows-2019
+    runs-on: windows-latest
   
     steps:
       - uses: actions/checkout@v4
diff --git a/Yubico.Core/src/Yubico/Core/Devices/Hid/WindowsHidDevice.cs b/Yubico.Core/src/Yubico/Core/Devices/Hid/WindowsHidDevice.cs
@@ -76,7 +76,8 @@ private void ResolveIdsFromInstancePath(string instancePath)
             // 012345678901234567890123456789
             //             ^---     ^---
 
-#pragma warning disable CA1862
+// Disable string comparison warning for this method as it needs to compile for both net47, netstandard 2.0 and 2.1
+#pragma warning disable CA1862 
             if (instancePath.ToUpperInvariant().Contains("VID") && instancePath.ToUpperInvariant().Contains("HID"))
 #pragma warning restore CA1862
             {
diff --git a/Yubico.Core/src/Yubico/PlatformInterop/Desktop/SCard/SCardReaderStates.cs b/Yubico.Core/src/Yubico/PlatformInterop/Desktop/SCard/SCardReaderStates.cs
@@ -23,30 +23,24 @@ namespace Yubico.PlatformInterop
 {
     [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
     // Justification: Fields are read/write via interop. Readonly might not have any effect there, but it may give
-    // maintainers a falls impression about the true nature of these fields.
+    // maintainers a false impression about the true nature of these fields.
     [SuppressMessage("ReSharper", "FieldCanBeMadeReadOnly.Local")]
     [SuppressMessage("Style", "IDE0044:Add readonly modifier")]
     internal struct SCARD_READER_STATE
     {
-#pragma warning disable IDE0032
-        [MarshalAs(UnmanagedType.LPStr)]
-        private string _readerName;
-#pragma warning restore IDE0032
         private IntPtr _userData;
         private uint _currentState;
         private uint _eventState;
         private uint _atrLength;
+        
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = 36)]
         private byte[] _answerToReset;
 
         private const uint SequenceMask = 0xFFFF_0000;
         private const uint StateMask = 0x0000_FFFF;
 
-        public string ReaderName
-        {
-            get => _readerName;
-            set => _readerName = value;
-        }
+        [field: MarshalAs(UnmanagedType.LPStr)]
+        public string ReaderName { get; set; }
 
         public SCARD_STATE CurrentState => (SCARD_STATE)(_currentState & StateMask);
         public SCARD_STATE EventState => (SCARD_STATE)(_eventState & StateMask);
diff --git a/Yubico.YubiKey/examples/Fido2SampleCode/Fido2SampleCode.csproj b/Yubico.YubiKey/examples/Fido2SampleCode/Fido2SampleCode.csproj
@@ -11,25 +11,19 @@ distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. -->
-<!--     <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT'">$(TargetFrameworks);net6.0-windows</TargetFrameworks>
- -->
-<Project Sdk="Microsoft.NET.Sdk">
 
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-	<TargetFramework>net9.0</TargetFramework>
-	<Nullable>disable</Nullable>
+    <TargetFramework>net9.0</TargetFramework>
+    <Nullable>disable</Nullable>
     <IsPackable>false</IsPackable>
-    <!--<UseWindowsForms Condition=" '$(OS)' == 'Windows_NT'">true</UseWindowsForms>-->
     <AnalysisMode>AllDisabledByDefault</AnalysisMode>
   </PropertyGroup>
   <ItemGroup>
-<None Update="appsettings.json">
-  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-</None>
+    <None Update="appsettings.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <ProjectReference Include="..\SharedSampleCode\SharedSampleCode.csproj" />
-
   </ItemGroup>
-
-
 </Project>
diff --git a/Yubico.YubiKey/examples/OathSampleCode/YubiKeyOperations/AddCredential.cs b/Yubico.YubiKey/examples/OathSampleCode/YubiKeyOperations/AddCredential.cs
@@ -193,7 +193,6 @@ public static bool RunAddCredentialFromQR(
 
         private static void ReportResult(Credential credential)
         {
-#pragma warning disable CA1305
             var outputList = new StringBuilder("Added credential:");
             _ = outputList.AppendLine();
             _ = outputList.AppendLine($"Issuer    : {credential.Issuer}");
diff --git a/Yubico.YubiKey/examples/OathSampleCode/YubiKeyOperations/CalculateCredentials.cs b/Yubico.YubiKey/examples/OathSampleCode/YubiKeyOperations/CalculateCredentials.cs
@@ -14,14 +14,12 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 using System.Text;
 using Yubico.YubiKey.Oath;
 using Yubico.YubiKey.Sample.SharedCode;
 
 namespace Yubico.YubiKey.Sample.OathSampleCode
 {
-    [SuppressMessage("Globalization", "CA1305:Specify IFormatProvider")]
     public static class CalculateCredentials
     {
         // Get OTP (One-Time Password) values for all configured credentials on the YubiKey.
diff --git a/Yubico.YubiKey/examples/OathSampleCode/YubiKeyOperations/GetCredentials.cs b/Yubico.YubiKey/examples/OathSampleCode/YubiKeyOperations/GetCredentials.cs
@@ -14,14 +14,12 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 using System.Text;
 using Yubico.YubiKey.Oath;
 using Yubico.YubiKey.Sample.SharedCode;
 
 namespace Yubico.YubiKey.Sample.OathSampleCode
 {
-    [SuppressMessage("Globalization", "CA1305:Specify IFormatProvider")]
     public static class GetCredentials
     {
         // Get all configured credentials on the YbiKey.
diff --git a/Yubico.YubiKey/examples/OathSampleCode/YubiKeyOperations/RemoveCredential.cs b/Yubico.YubiKey/examples/OathSampleCode/YubiKeyOperations/RemoveCredential.cs
@@ -13,14 +13,12 @@
 // limitations under the License.
 
 using System;
-using System.Diagnostics.CodeAnalysis;
 using System.Text;
 using Yubico.YubiKey.Oath;
 using Yubico.YubiKey.Sample.SharedCode;
 
 namespace Yubico.YubiKey.Sample.OathSampleCode
 {
-    [SuppressMessage("Globalization", "CA1305:Specify IFormatProvider")]
     public static class RemoveCredential
     {
         // Remove an existing credential on the YubiKey.
diff --git a/Yubico.YubiKey/examples/OathSampleCode/YubiKeyOperations/RenameCredential.cs b/Yubico.YubiKey/examples/OathSampleCode/YubiKeyOperations/RenameCredential.cs
@@ -13,14 +13,12 @@
 // limitations under the License.
 
 using System;
-using System.Diagnostics.CodeAnalysis;
 using System.Text;
 using Yubico.YubiKey.Oath;
 using Yubico.YubiKey.Sample.SharedCode;
 
 namespace Yubico.YubiKey.Sample.OathSampleCode
 {
-    [SuppressMessage("Globalization", "CA1305:Specify IFormatProvider")]
     public static class RenameCredential
     {
         // Rename the existing credential on the YubiKey by setting new issuer and account names.
diff --git a/Yubico.YubiKey/examples/SharedSampleCode/SharedSampleCode.csproj b/Yubico.YubiKey/examples/SharedSampleCode/SharedSampleCode.csproj
@@ -25,8 +25,8 @@ limitations under the License. -->
   </PropertyGroup>
 
   <!--
-  To test against local YubiKey library changes, uncomment the following line and adjust the path as needed.
-  and comment out the PackageReference line that references the wildcard version (which is attained from NuGet).
+  To test against local YubiKey library changes, uncomment the following line and adjust the path as needed 
+  and comment out the Yubico.YubiKey PackageReference line below that references the wildcard version (which would then be fetched from the NuGet servers).
   <ItemGroup>
     <ProjectReference Include="..\..\src\Yubico.YubiKey.csproj" />
   </ItemGroup>-->
diff --git a/Yubico.YubiKey/examples/SharedSampleCode/YubiKeyOperations/ChooseYubiKey.cs b/Yubico.YubiKey/examples/SharedSampleCode/YubiKeyOperations/ChooseYubiKey.cs
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 
 namespace Yubico.YubiKey.Sample.SharedCode
@@ -105,9 +104,7 @@ public static bool RunChooseYubiKey(
             for (int index = 0; index < yubiKeyArray.Length; index++)
             {
                 string versionNumber = yubiKeyArray[index].FirmwareVersion.ToString();
-#pragma warning disable CA1305
                 string serialNumber = yubiKeyArray[index].SerialNumber.ToString() ?? "No serial number";
-#pragma warning restore CA1305
                 choices[index] = versionNumber + " : " + serialNumber;
             }
 
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/SetPinCommand.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/SetPinCommand.cs
@@ -15,7 +15,6 @@
 using System;
 using System.Globalization;
 using System.Security.Cryptography;
-using Yubico.Core.Cryptography;
 using Yubico.Core.Iso7816;
 using Yubico.YubiKey.Fido2.PinProtocols;
 
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Cose/CoseAlgorithmIdentifier.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Cose/CoseAlgorithmIdentifier.cs
@@ -23,7 +23,7 @@ namespace Yubico.YubiKey.Fido2.Cose
     /// </para>
     /// </remarks>
     /// </summary>
-    public enum CoseAlgorithmIdentifier // TODO move into KeyDefinitions ?
+    public enum CoseAlgorithmIdentifier
     {
         /// <summary>
         /// No algorithm specified.
@@ -38,7 +38,7 @@ public enum CoseAlgorithmIdentifier // TODO move into KeyDefinitions ?
         /// <summary>
         /// ECDH with key derivation function HKDF using SHA-256.
         /// </summary>
-        ECDHwHKDF256 = -25, // TODO Remove? Cannot find a ref to this.
+        ECDHwHKDF256 = -25,
 
         /// <summary>
         /// ECDSA with SHA-384 using the NIST P-384 curve.
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Cose/CoseEcCurve.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Cose/CoseEcCurve.cs
@@ -23,7 +23,7 @@ namespace Yubico.YubiKey.Fido2.Cose
     /// </para>
     /// </remarks>
     /// </summary>
-    public enum CoseEcCurve // TODO move into KeyDefinitions ?
+    public enum CoseEcCurve
     {
         /// <summary>
         /// The EC curve could not be determined.
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Cose/CoseKeyType.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Cose/CoseKeyType.cs
@@ -23,7 +23,7 @@ namespace Yubico.YubiKey.Fido2.Cose
     /// </para>
     /// </remarks>
     /// </summary>
-    public enum CoseKeyType // TODO move into KeyDefinitions ?
+    public enum CoseKeyType
     {
         /// <summary>
         /// The type could not be determined.
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Fido2Session.MakeCredential.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Fido2Session.MakeCredential.cs
@@ -15,7 +15,6 @@
 using System;
 using System.Security.Cryptography;
 using Microsoft.Extensions.Logging;
-using Yubico.Core.Cryptography;
 using Yubico.YubiKey.Fido2.Commands;
 
 namespace Yubico.YubiKey.Fido2
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/KeyEntryData.cs b/Yubico.YubiKey/src/Yubico/YubiKey/KeyEntryData.cs
@@ -14,7 +14,6 @@
 
 using System;
 using System.Security.Cryptography;
-using Yubico.Core.Cryptography;
 
 namespace Yubico.YubiKey
 {
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Otp/Commands/SlotConfigureBase.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Otp/Commands/SlotConfigureBase.cs
@@ -17,7 +17,6 @@
 using System.Globalization;
 using System.Security.Cryptography;
 using Yubico.Core.Buffers;
-using Yubico.Core.Cryptography;
 using Yubico.Core.Iso7816;
 
 namespace Yubico.YubiKey.Otp.Commands
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Piv/Commands/ImportAsymmetricKeyCommand.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Piv/Commands/ImportAsymmetricKeyCommand.cs
@@ -15,7 +15,6 @@
 using System;
 using System.Globalization;
 using System.Security.Cryptography;
-using Yubico.Core.Cryptography;
 using Yubico.Core.Iso7816;
 
 namespace Yubico.YubiKey.Piv.Commands
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Piv/Objects/CardholderUniqueId.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Piv/Objects/CardholderUniqueId.cs
@@ -16,7 +16,6 @@
 using System.Globalization;
 using System.Security.Cryptography;
 using Microsoft.Extensions.Logging;
-using Yubico.Core.Cryptography;
 using Yubico.Core.Logging;
 using Yubico.Core.Tlv;
 using Yubico.YubiKey.Cryptography;
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Piv/PivEccPrivateKey.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Piv/PivEccPrivateKey.cs
@@ -15,7 +15,6 @@
 using System;
 using System.Globalization;
 using System.Security.Cryptography;
-using Yubico.Core.Cryptography;
 using Yubico.Core.Tlv;
 
 namespace Yubico.YubiKey.Piv
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Piv/PivPrivateKey.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Piv/PivPrivateKey.cs
@@ -15,7 +15,6 @@
 using System;
 using System.Globalization;
 using System.Security.Cryptography;
-using Yubico.Core.Cryptography;
 
 namespace Yubico.YubiKey.Piv
 {
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Piv/PivRsaPrivateKey.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Piv/PivRsaPrivateKey.cs
@@ -15,7 +15,6 @@
 using System;
 using System.Globalization;
 using System.Security.Cryptography;
-using Yubico.Core.Cryptography;
 using Yubico.Core.Tlv;
 
 namespace Yubico.YubiKey.Piv
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Piv/PivSession.Objects.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Piv/PivSession.Objects.cs
@@ -16,7 +16,6 @@
 using System.Globalization;
 using System.Security.Cryptography;
 using Microsoft.Extensions.Logging;
-using Yubico.Core.Cryptography;
 using Yubico.YubiKey.Piv.Commands;
 using Yubico.YubiKey.Piv.Objects;
 
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Scp/Scp03State.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Scp/Scp03State.cs
@@ -15,7 +15,6 @@
 using System;
 using System.Linq;
 using System.Security.Cryptography;
-using Yubico.Core.Cryptography;
 using Yubico.Core.Iso7816;
 using Yubico.YubiKey.Scp.Commands;
 using Yubico.YubiKey.Scp.Helpers;
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Scp03/Commands/PutKeyCommand.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Scp03/Commands/PutKeyCommand.cs
@@ -15,7 +15,6 @@
 using System;
 using System.IO;
 using System.Security.Cryptography;
-using Yubico.Core.Cryptography;
 using Yubico.Core.Iso7816;
 using Yubico.YubiKey.Cryptography;
 
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Scp03/Session.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Scp03/Session.cs
@@ -15,7 +15,6 @@
 using System;
 using System.Linq;
 using System.Security.Cryptography;
-using Yubico.Core.Cryptography;
 using Yubico.Core.Iso7816;
 using Yubico.YubiKey.Scp03.Commands;
 
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Scp03/SessionKeys.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Scp03/SessionKeys.cs
@@ -14,7 +14,6 @@
 
 using System;
 using System.Security.Cryptography;
-using Yubico.Core.Cryptography;
 
 namespace Yubico.YubiKey.Scp03
 {
diff --git a/Yubico.YubiKey/tests/utilities/Yubico/YubiKey/TestUtilities/CertConverter.cs b/Yubico.YubiKey/tests/utilities/Yubico/YubiKey/TestUtilities/CertConverter.cs
@@ -70,15 +70,13 @@ public CertConverter(char[] pemCertString)
                 CertificateStartLength,
                 pemCertString.Length - (CertificateStartLength + CertificateEndLength));
             _certificateObject = X509CertificateLoader.LoadCertificate(certDer);
-            //_certificateObject = new X509Certificate2(certDer);
             SetAlgorithm();
         }
 
         // Build a local cert object from the DER encoding of an X.509 cert.
         public CertConverter(byte[] certDer)
         {
             _certificateObject = X509CertificateLoader.LoadCertificate(certDer);
-
             SetAlgorithm();
         }
 
@@ -92,7 +90,6 @@ public CertConverter(X509Certificate2 cert)
         {
             byte[] certDer = cert.GetRawCertData();
             _certificateObject = X509CertificateLoader.LoadCertificate(certDer);
-
             SetAlgorithm();
         }
 
@@ -109,10 +106,7 @@ public X509Certificate2 GetCertObject()
         }
 
         // Return the DER encoding of the X.509 certificate.
-        public byte[] GetCertDer()
-        {
-            return _certificateObject.GetRawCertData();
-        }
+        public byte[] GetCertDer() => _certificateObject.GetRawCertData();
 
         public char[] GetCertPem()
         {

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,8 @@ private void ResolveIdsFromInstancePath(string instancePath)`
`76`	`76`	`// 012345678901234567890123456789`
`77`	`77`	`// ^--- ^---`
`78`	`78`
`79`		`-#pragma warning disable CA1862`
	`79`	`+// Disable string comparison warning for this method as it needs to compile for both net47, netstandard 2.0 and 2.1`
	`80`	`+#pragma warning disable CA1862`
`80`	`81`	`if (instancePath.ToUpperInvariant().Contains("VID") && instancePath.ToUpperInvariant().Contains("HID"))`
`81`	`82`	`#pragma warning restore CA1862`
`82`	`83`	`{`
Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,6 @@ public static bool RunAddCredentialFromQR(`
`193`	`193`
`194`	`194`	`private static void ReportResult(Credential credential)`
`195`	`195`	`{`
`196`		`-#pragma warning disable CA1305`
`197`	`196`	`var outputList = new StringBuilder("Added credential:");`
`198`	`197`	`_ = outputList.AppendLine();`
`199`	`198`	`_ = outputList.AppendLine($"Issuer : {credential.Issuer}");`
Original file line number	Diff line number	Diff line change
`@@ -14,14 +14,12 @@`
`14`	`14`
`15`	`15`	`using System;`
`16`	`16`	`using System.Collections.Generic;`
`17`		`-using System.Diagnostics.CodeAnalysis;`
`18`	`17`	`using System.Text;`
`19`	`18`	`using Yubico.YubiKey.Oath;`
`20`	`19`	`using Yubico.YubiKey.Sample.SharedCode;`
`21`	`20`
`22`	`21`	`namespace Yubico.YubiKey.Sample.OathSampleCode`
`23`	`22`	`{`
`24`		`- [SuppressMessage("Globalization", "CA1305:Specify IFormatProvider")]`
`25`	`23`	`public static class CalculateCredentials`
`26`	`24`	`{`
`27`	`25`	`// Get OTP (One-Time Password) values for all configured credentials on the YubiKey.`
Original file line number	Diff line number	Diff line change
`@@ -13,14 +13,12 @@`
`13`	`13`	`// limitations under the License.`
`14`	`14`
`15`	`15`	`using System;`
`16`		`-using System.Diagnostics.CodeAnalysis;`
`17`	`16`	`using System.Text;`
`18`	`17`	`using Yubico.YubiKey.Oath;`
`19`	`18`	`using Yubico.YubiKey.Sample.SharedCode;`
`20`	`19`
`21`	`20`	`namespace Yubico.YubiKey.Sample.OathSampleCode`
`22`	`21`	`{`
`23`		`- [SuppressMessage("Globalization", "CA1305:Specify IFormatProvider")]`
`24`	`22`	`public static class RemoveCredential`
`25`	`23`	`{`
`26`	`24`	`// Remove an existing credential on the YubiKey.`