test: comments, restructure

tests: fixed comments and code restructure

Author: DennisDyallo

Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/CredMgmtTests.cs

@@ -24,7 +24,7 @@ namespace Yubico.YubiKey.Fido2
     [Trait(TraitTypes.Category, TestCategories.Elevated)]
     public class CredMgmtTests : IClassFixture<BioFido2Fixture>
     {
-        private readonly BioFido2Fixture _bioFido2Fixture; // TODO Why bioFido2Fixture?
+        private readonly BioFido2Fixture _bioFido2Fixture; // This test should be able to run without a bio key
 
         public CredMgmtTests(BioFido2Fixture bioFido2Fixture)
         {

Yubico.YubiKey/tests/integration/Yubico/YubiKey/Piv/KeyAgreeTests.cs

@@ -107,16 +107,13 @@ public void KeyAgree_MatchesCSharp(
             var (_, testPrivateKey) = TestKeys.GetKeyPair(keyType);
 
             var peerPub = testPrivateKey.AsPublicKey();
-            var peerEcc = (ECPublicKey)peerPub;
-
-            var ecDsaObject = testPrivateKey.AsECDsa(); // Wtf, these are the same keys
-            var ecParams = ecDsaObject.ExportParameters(true);
-            using var peerEcdh = ECDiffieHellman.Create(ecParams);
+            var ecDsaObject = testPrivateKey.AsECDsa(); // Should ideally be different keys
+            var ecParamsPrivate = ecDsaObject.ExportParameters(true);
+            using var peerEcdh = ECDiffieHellman.Create(ecParamsPrivate);
 
             //  Build the YubiKey objects.
-            ecDsaObject = testPrivateKey.AsECDsa(); // Wtf, these are the same keys
-            ecParams = ecDsaObject.ExportParameters(false);
-            using var ecdh = ECDiffieHellman.Create(ecParams);
+            var ecParamsPublic = ecDsaObject.ExportParameters(false); // This should be the key from the Yubikey
+            using var ecdh = ECDiffieHellman.Create(ecParamsPublic);
 
             var hashAlgorithm = digestAlgorithm switch
             {
@@ -132,14 +129,14 @@ public void KeyAgree_MatchesCSharp(
             // The YubiKey computes the shared secret.
             Session.ImportPrivateKey(slotNumber, testPrivateKey.AsPrivateKey(), PivPinPolicy.Always,
                 PivTouchPolicy.Never);
-            var sharedSecret = Session.KeyAgree(slotNumber, peerEcc);
+            
+            var sharedSecret = Session.KeyAgree(slotNumber, peerPub);
 
             using var digester = GetHashAlgorithm(digestAlgorithm);
             digester.Initialize();
             _ = digester.TransformFinalBlock(sharedSecret, 0, sharedSecret.Length);
 
-            Assert.True(
-                peerSecret.SequenceEqual(digester.Hash!));
+            Assert.True(peerSecret.SequenceEqual(digester.Hash!));
         }
 
         [Theory]