variable rename for clarity (scp)

Author: DennisDyallo

Yubico.YubiKey/src/Yubico/YubiKey/Scp/Scp03KeyParameters.cs

@@ -21,8 +21,8 @@ namespace Yubico.YubiKey.Scp
     /// </summary>
     public sealed class Scp03KeyParameters : ScpKeyParameters, IDisposable
     {
-        private const int DefaultKvn = 0xFF;
-        private const int DefaultKid = 0x01;
+        private const int DefaultKeyKvn = 0xFF;
+        private const int DefaultKvn = 0x01;
 
         /// <summary>
         /// The static keys shared with the device when initiating the connection.
@@ -76,7 +76,7 @@ public Scp03KeyParameters(
         /// This property provides a convenient way to access default SCP03 key parameters,
         /// using the standard SCP03 key identifier (0x03) and default static keys with version number 0xFF.
         /// </remarks>
-        public static Scp03KeyParameters DefaultKey => new Scp03KeyParameters(ScpKeyIds.Scp03, DefaultKvn, new StaticKeys());
+        public static Scp03KeyParameters DefaultKey => new Scp03KeyParameters(ScpKeyIds.Scp03, DefaultKeyKvn, new StaticKeys());
 
         /// <summary>
         /// Creates a new instance of <see cref="Scp03KeyParameters"/>, representing the parameters for
@@ -86,7 +86,7 @@ public Scp03KeyParameters(
         /// <param name="staticKeys">The static keys shared with the device.</param>
         /// <returns>An instance of <see cref="Scp03KeyParameters"/> with key ID 0x03 and version number 0x01.</returns>
         public static Scp03KeyParameters FromStaticKeys(StaticKeys staticKeys) =>
-            new Scp03KeyParameters(ScpKeyIds.Scp03, DefaultKid, staticKeys);
+            new Scp03KeyParameters(ScpKeyIds.Scp03, DefaultKvn, staticKeys);
 
         /// <summary>
         /// This will clear all references and sensitive buffers  

Yubico.YubiKey/src/Yubico/YubiKey/Scp/ScpKeyIds.cs

@@ -32,6 +32,9 @@ public static class ScpKeyIds
     {
         /// <summary>
         /// Key ID '0x01' for static keys used for SCP03.
+        /// <remarks>When storing SCP03 keysets, the SDK
+        /// will store ke KID's 0x01, 0x02 and 0x03 for ENC, MAC, DEK on the YubiKey
+        /// </remarks>
         /// </summary>
         public const byte Scp03 = 0x01;
 

Yubico.YubiKey/src/Yubico/YubiKey/Scp03/StaticKeys.cs

@@ -190,7 +190,7 @@ internal StaticKeys GetCopy() =>
             };
 
         internal Scp03KeyParameters ConvertToScp03KeyParameters() =>
-                new Scp03KeyParameters(ScpKeyIds.Scp03, 0xFF, ConvertFromLegacy());
+                new Scp03KeyParameters(ScpKeyIds.Scp03, DefaultKvnValue, ConvertFromLegacy());
 
         /// <summary>
         /// Determine if the contents of each key is the same for both objects.

Yubico.YubiKey/tests/integration/Yubico/YubiKey/Scp/Scp11Tests.cs

@@ -605,14 +605,17 @@ private Memory<byte> GetSki(
         private static Scp03KeyParameters ImportScp03Key(
             SecurityDomainSession session)
         {
-            var scp03Ref = new KeyReference(0x01, 0x01);
+            byte scp03KeyId = 0x01;
+            byte kvn = 0x01;
+            
+            var scp03Ref = new KeyReference(scp03KeyId, kvn);
             var staticKeys = new StaticKeys(
                 GetRandomBytes(16),
                 GetRandomBytes(16),
                 GetRandomBytes(16)
             );
 
-            session.PutKey(scp03Ref, staticKeys, 0);
+            session.PutKey(scp03Ref, staticKeys);
 
             return new Scp03KeyParameters(scp03Ref, staticKeys);
         }