WIP update PIV samples to support curve25519

Author: AdamVe

Yubico.YubiKey/examples/PivSampleCode/Run/PivSampleRun.Operations.cs

@@ -712,8 +712,12 @@ private bool GetAsymmetricAlgorithm(out PivAlgorithm algorithm)
             string[] menuItems = new string[] {
                 "RSA 1024",
                 "RSA 2048",
+                "RSA 3076",
+                "RSA 4096",
                 "ECC P-256",
-                "ECC P-384"
+                "ECC P-384",
+                "ECC Ed25519",
+                "ECC X25519"
             };
 
             int response = _menuObject.RunMenu("Which algorithm?", menuItems);
@@ -722,8 +726,12 @@ private bool GetAsymmetricAlgorithm(out PivAlgorithm algorithm)
             {
                 0 => PivAlgorithm.Rsa1024,
                 1 => PivAlgorithm.Rsa2048,
-                2 => PivAlgorithm.EccP256,
-                3 => PivAlgorithm.EccP384,
+                2 => PivAlgorithm.Rsa3072,
+                3 => PivAlgorithm.Rsa4096,
+                4 => PivAlgorithm.EccP256,
+                5 => PivAlgorithm.EccP384,
+                6 => PivAlgorithm.EccEd25519,
+                7 => PivAlgorithm.EccX25519,
                 _ => PivAlgorithm.None,
             };
 

Yubico.YubiKey/examples/PivSampleCode/SlotContents/SamplePivSlotContents.cs

@@ -14,6 +14,7 @@
 
 using System;
 using System.Security.Cryptography.X509Certificates;
+using Yubico.YubiKey.Cryptography;
 using Yubico.YubiKey.Piv;
 using Yubico.YubiKey.Sample.SharedCode;
 
@@ -32,6 +33,8 @@ public class SamplePivSlotContents
 
         public PivPublicKey PublicKey { get; set; }
 
+        //public IPublicKeyParameters PublicKeyParameters { get; set; }
+
         public CertificateRequest CertRequest { get; set; }
 
         private byte[] _certRequestDer;
@@ -45,7 +48,14 @@ public SamplePivSlotContents()
 
         public void PrintPublicKeyPem()
         {
-            char[] pubKeyPem = KeyConverter.GetPemFromPivPublicKey(PublicKey);
+            char[] pubKeyPem;
+
+            if (PublicKey.Algorithm.GetKeyType() == KeyType.X25519 || PublicKey.Algorithm.GetKeyType() == KeyType.Ed25519) {
+                var publicKeyParameters = KeyParametersPivHelper.CreatePublicKeyParameters(PublicKey.PivEncodedPublicKey, PublicKey.Algorithm.GetKeyType());
+                pubKeyPem = PemOperations.BuildPem("PUBLIC KEY", publicKeyParameters.ExportSubjectPublicKeyInfo());
+            } else {
+                pubKeyPem = KeyConverter.GetPemFromPivPublicKey(PublicKey);
+            }
             SampleMenu.WriteMessage(MessageType.Title, 0, "\n" + new string(pubKeyPem) + "\n");
         }
 

Yubico.YubiKey/examples/SharedSampleCode/SharedSampleCode.csproj

@@ -32,7 +32,8 @@ limitations under the License. -->
   </ItemGroup>-->
 
   <ItemGroup>
-    <PackageReference Include="Yubico.YubiKey" Version="1.*-*" />
+    <!-- <PackageReference Include="Yubico.YubiKey" Version="1.*-*" /> -->
+    <ProjectReference Include="..\..\src\Yubico.YubiKey.csproj" />
   </ItemGroup>
 
 </Project>

Yubico.YubiKey/src/Yubico/YubiKey/Piv/Commands/GenerateKeyPairResponse.cs

@@ -216,8 +216,11 @@ public GenerateKeyPairResponse(
             // but in some times the caller is receiving a pivpublickey..
             Status switch
             {
-                ResponseStatus.Success => PivPublicKey.Create(ResponseApdu.Data),
+#pragma warning disable CS0618 // Type or member is obsolete
+                ResponseStatus.Success => PivPublicKey.Create(ResponseApdu.Data, Algorithm),
+#pragma warning restore CS0618 // Type or member is obsolete
                 _ => throw new InvalidOperationException(StatusMessage),
             };
+
     }
 }

Yubico.YubiKey/src/Yubico/YubiKey/Piv/KeyParametersPivExtensions.cs

@@ -44,6 +44,10 @@ public static Memory<byte> ToPivEncodedPublicKey(this IPublicKeyParameters param
         };
     }
 
+    public static PivPublicKey ToPivPublicKey(this IPublicKeyParameters parameters) {
+        return PivPublicKey.Create(parameters.ToPivEncodedPublicKey(), parameters.KeyType.GetPivAlgorithm());
+    }
+
     private static Memory<byte> EncodeRSAPublicKeyParameters(RSAPublicKeyParameters parameters)
     {
         var rsaParameters = parameters.Parameters;