v61.4.0 - Adding a IdentifyAttributes extension method to X509Certificate2

Author: monoman

InterlockLedger.Tags/Extensions/X509Certificate2Extensions.cs

@@ -30,15 +30,35 @@
 //
 // ******************************************************************************************************************************
 
-
+using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
 
 namespace InterlockLedger.Tags;
+
 public static class X509Certificate2Extensions
 {
-    public static KeyStrength KeyStrengthGuess(this X509Certificate2 certificate)
-        => certificate.Required().GetRSAPublicKey().KeyStrengthGuess();
+    public static (KeyStrength keyStrength, Algorithm algorithm) IdentifyAttributes(this X509Certificate2 certificate) =>
+        certificate.Selector(
+            (rsa) => (rsa.KeyStrengthGuess(), Algorithm.RSA),
+            (ec) => (KeyStrength.Strong, Algorithm.EcDSA),
+            () => (KeyStrength.Normal, Algorithm.Invalid));
+
+    public static TagPubKey PubKey(this X509Certificate2 certificate) =>
+        certificate.Selector<TagPubKey>(
+            (rsa) => new TagPubRSAKey(rsa.ExportParameters(false)),
+            (ec) => new TagPubEcDSAKey(ec.ExportParameters(false)));
 
-    public static TagPubKey PubKey(this X509Certificate2 certificate)
-        => TagPubKey.Resolve(certificate);
-}
+    private static T Selector<T>(this X509Certificate2 certificate,
+                                 Func<RSA, T> rsaFunc,
+                                 Func<ECDsa, T> ecdsaFunc,
+                                 Func<T>? errorFunc = null) =>
+        certificate.GetRSAPublicKey() switch {
+            RSA rsa => rsaFunc(rsa),
+            _ => certificate.GetECDsaPublicKey() switch {
+                ECDsa ec => ecdsaFunc(ec),
+                _ => errorFunc is null
+                    ? throw new NotSupportedException("Not yet supporting other kinds of certificates, than RSA and EcDSA!")
+                    : errorFunc()
+            }
+        };
+}

InterlockLedger.Tags/InterlockLedger.Tags.csproj

@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
+    <Import Project="..\version.props" />
     <PropertyGroup>
         <TargetFramework>net8.0</TargetFramework>
         <LangVersion>preview</LangVersion>
@@ -13,9 +13,7 @@
         <Product>InterlockLedger</Product>
         <RepositoryType>git</RepositoryType>
         <RepositoryUrl>https://github.com/interlockledger/interlockledger-tags.git</RepositoryUrl>
-        <Version>61.3.0</Version>
         <PackageId>InterlockLedger.Tags</PackageId>
-        <PackageReleaseNotes>Needed one more public property in ISigningKey EncodedBytes</PackageReleaseNotes>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <PackageReadmeFile>README.md</PackageReadmeFile>

version.props

@@ -0,0 +1,6 @@
+<Project>
+    <PropertyGroup>
+        <Version>61.4.0</Version>
+        <PackageReleaseNotes>Adding a IdentifyAttributes extension method to X509Certificate2</PackageReleaseNotes>
+    </PropertyGroup>
+</Project>