Add configuration for recommended extensions and update console logge…

…r parameters

- Added a configuration file for recommended extensions in the `.vscode` folder.
- Updated the console logger parameters in the `tasks.json` file.
- Removed unused imports and refactored code in the `GenerateCSRCommand.cs` file.
- Modified properties in the `GenerateYKCSR.csproj` file.
- Refactored code and added comments in the `YubiKeyKeyCollector.cs` file.
- Modified parameters and refactored code in the `YubiKeySignatureGenerator.cs` file.

Signed-off-by: Bryan Gonzalez <[email protected]>

.vscode/extensions.json

@@ -0,0 +1,5 @@
+{
+    "recommendations": [
+        "ms-dotnettools.csdevkit"
+    ]
+}

.vscode/tasks.json

@@ -9,7 +9,7 @@
                 "build",
                 "${workspaceFolder}/src.sln",
                 "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary"
+                "/consoleloggerparameters:NoSummary;ForceNoAlign"
             ],
             "problemMatcher": "$msCompile"
         },
@@ -21,7 +21,7 @@
                 "publish",
                 "${workspaceFolder}/src.sln",
                 "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary"
+                "/consoleloggerparameters:NoSummary;ForceNoAlign"
             ],
             "problemMatcher": "$msCompile"
         },

src/yk-csr-cli/GenerateCSRCommand.cs

@@ -1,6 +1,5 @@
 using System.CommandLine;
 using System.CommandLine.Binding;
-using System.CommandLine.Parsing;
 using System.Net;
 using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
@@ -268,6 +267,6 @@ public static async Task ExecuteAsync(Params boundParams, CancellationToken ctx
 
         if (boundParams.OutPubFile is not null) await File.WriteAllTextAsync(boundParams.OutPubFile.FullName, pubKeyPem, ctx);
 
-        if (boundParams.OutputPubToConsole || boundParams.OutPubFile is null) Console.WriteLine(pubKeyPem.ReplaceLineEndings());
+        if (boundParams.OutputPubToConsole) Console.WriteLine(pubKeyPem.ReplaceLineEndings());
     }
 }

src/yk-csr-cli/GenerateYKCSR.csproj

@@ -7,7 +7,6 @@
     <Nullable>enable</Nullable>
     <LangVersion>preview</LangVersion>
     <VersionPrefix>1.0.0</VersionPrefix>
-    <VersionSuffix>rc1</VersionSuffix>
     <UseAppHost>true</UseAppHost>
     <PublishSingleFile>true</PublishSingleFile>
     <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>

src/yk-csr-cli/YubiKeyKeyCollector.cs

@@ -38,10 +38,12 @@ private static bool VerifyPivPinHandler(KeyEntryData ked)
 
         return true;
     }
+
     private static readonly Dictionary<KeyEntryRequest, Func<KeyEntryData, bool>> requestHandlerMap = new() {
-    {KeyEntryRequest.Release, (_) => true},
-    {KeyEntryRequest.VerifyPivPin, VerifyPivPinHandler}
-};
+        {KeyEntryRequest.Release, (_) => true},
+        {KeyEntryRequest.VerifyPivPin, VerifyPivPinHandler}
+    };
+
     public YubiKeyKeyCollector(Handle parentWindow) { }
 
     public YubiKeyKeyCollector() { }

src/yk-csr-cli/YubiKeySignatureGenerator.cs

@@ -5,30 +5,20 @@
 
 using AlgConfig = (System.Security.Cryptography.HashAlgorithm digester, int algBits);
 
-sealed class YubiKeySignatureGenerator : X509SignatureGenerator
+sealed class YubiKeySignatureGenerator(PivSession pivSession, byte slotNumber, RSA rsaPublicKeyObject, RSASignaturePadding paddingScheme) : X509SignatureGenerator
 {
-    private static readonly Dictionary<HashAlgorithmName, AlgConfig> digesterMap = new()
-    {
-            {HashAlgorithmName.SHA1, (CryptographyProviders.Sha1Creator(),RsaFormat.Sha1)},
-            {HashAlgorithmName.SHA256, (CryptographyProviders.Sha256Creator(),RsaFormat.Sha256)},
-            {HashAlgorithmName.SHA384, (CryptographyProviders.Sha384Creator(),RsaFormat.Sha384)},
-            {HashAlgorithmName.SHA512, (CryptographyProviders.Sha512Creator(),RsaFormat.Sha512)},
-        };
-
-    private readonly PivSession _pivSession;
-    private readonly byte _slotNumber;
-    private readonly int _keySizeBits;
+    private static readonly Dictionary<HashAlgorithmName, AlgConfig> digesterMap = new() {
+        {HashAlgorithmName.SHA1, (CryptographyProviders.Sha1Creator(),RsaFormat.Sha1)},
+        {HashAlgorithmName.SHA256, (CryptographyProviders.Sha256Creator(),RsaFormat.Sha256)},
+        {HashAlgorithmName.SHA384, (CryptographyProviders.Sha384Creator(),RsaFormat.Sha384)},
+        {HashAlgorithmName.SHA512, (CryptographyProviders.Sha512Creator(),RsaFormat.Sha512)},
+    };
 
-    private readonly X509SignatureGenerator _defaultGenerator;
-    private readonly RSASignaturePaddingMode _paddingMode;
-    public YubiKeySignatureGenerator(PivSession pivSession, byte slotNumber, RSA rsaPublicKeyObject, RSASignaturePadding paddingScheme)
-    {
-        _pivSession = pivSession;
-        _slotNumber = slotNumber;
-        _keySizeBits = rsaPublicKeyObject.KeySize;
-        _defaultGenerator = CreateForRSA(rsaPublicKeyObject, paddingScheme);
-        _paddingMode = paddingScheme.Mode;
-    }
+    private readonly PivSession _pivSession = pivSession;
+    private readonly byte _slotNumber = slotNumber;
+    private readonly int _keySizeBits = rsaPublicKeyObject.KeySize;
+    private readonly X509SignatureGenerator _defaultGenerator = CreateForRSA(rsaPublicKeyObject, paddingScheme);
+    private readonly RSASignaturePaddingMode _paddingMode = paddingScheme.Mode;
 
     protected override PublicKey BuildPublicKey()
     {
@@ -48,8 +38,8 @@ public override byte[] SignData(byte[] data, HashAlgorithmName hashAlgorithm)
     }
 
     private static AlgConfig GetSupportedAlgConfig(HashAlgorithmName hashAlgorithm) => digesterMap.TryGetValue(hashAlgorithm, out var algConfig)
-            ? algConfig
-            : throw new ArgumentException("Unsupported Hash Algorithm", nameof(hashAlgorithm));
+        ? algConfig
+        : throw new ArgumentException("Unsupported Hash Algorithm", nameof(hashAlgorithm));
 
     private static byte[] DigestData(byte[] data, HashAlgorithmName hashAlgorithm)
     {