samples: revert sample code changes

Author: DennisDyallo

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

@@ -735,12 +735,8 @@ 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 Ed25519",
-                "ECC X25519"
+                "ECC P-384"
             };
 
             int response = _menuObject.RunMenu("Which algorithm?", menuItems);
@@ -749,12 +745,8 @@ private bool GetAsymmetricAlgorithm(out PivAlgorithm algorithm)
             {
                 0 => PivAlgorithm.Rsa1024,
                 1 => PivAlgorithm.Rsa2048,
-                2 => PivAlgorithm.Rsa3072,
-                3 => PivAlgorithm.Rsa4096,
-                4 => PivAlgorithm.EccP256,
-                5 => PivAlgorithm.EccP384,
-                6 => PivAlgorithm.EccEd25519,
-                7 => PivAlgorithm.EccX25519,
+                2 => PivAlgorithm.EccP256,
+                3 => PivAlgorithm.EccP384,
                 _ => PivAlgorithm.None,
             };
 

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

@@ -45,18 +45,7 @@ public SamplePivSlotContents()
 
         public void PrintPublicKeyPem()
         {
-            char[] pubKeyPem;
-
-            if (PublicKey.Algorithm is PivAlgorithm.EccX25519 or PivAlgorithm.EccEd25519) 
-            {
-                var publicKeyParameters = KeyParametersPivHelper.CreatePublicKeyParameters(
-                    PublicKey.PivEncodedPublicKey, 
-                    PublicKey.Algorithm.GetKeyType());
-                
-                pubKeyPem = PemOperations.BuildPem("PUBLIC KEY", publicKeyParameters.ExportSubjectPublicKeyInfo());
-            } else {
-                pubKeyPem = KeyConverter.GetPemFromPivPublicKey(PublicKey);
-            }
+            char[] pubKeyPem = KeyConverter.GetPemFromPivPublicKey(PublicKey);
             SampleMenu.WriteMessage(MessageType.Title, 0, "\n" + new string(pubKeyPem) + "\n");
         }
 

Yubico.YubiKey/examples/SharedSampleCode/SharedSampleCode.csproj

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

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

@@ -211,11 +211,8 @@ public GenerateKeyPairResponse(
         public PivPublicKey GetData() =>
             Status switch
             {
-#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
+                ResponseStatus.Success => PivPublicKey.Create(ResponseApdu.Data),
                 _ => throw new InvalidOperationException(StatusMessage),
             };
-
     }
 }

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

@@ -43,10 +43,6 @@ 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;

Yubico.YubiKey/src/Yubico/YubiKey/Piv/KeyParametersPivHelper.cs

@@ -25,7 +25,7 @@ namespace Yubico.YubiKey.Piv;
 /// This class converts from a Piv Encoded Key to either instances of the common IPublicKeyParameters and IPrivateKeyParameters
 /// or concrete the concrete types that inherit these interfaces.
 /// </summary>
-public static class KeyParametersPivHelper
+internal static class KeyParametersPivHelper
 {
     public static IPublicKeyParameters CreatePublicKeyParameters(ReadOnlyMemory<byte> pivEncodedKey, KeyType keyType) =>
         keyType switch