Rename GetValueString to GetValueAsString and GetValueBinary to GetVa…

…lueAsBinary

KeyManager.Library.KeyStore.HSM_PKCS11/PKCS11KeyStore.cs

@@ -115,7 +115,7 @@ public override async Task Create(IChangeKeyEntry change)
  {
  foreach (var material in entry.Variant.KeyContainers[0].Key.Materials)
  {
- var rawkey = material.GetValueBinary();
+ var rawkey = material.GetValueAsBinary();
  if (rawkey != null)
  {
  var attributes = GetKeyEntryAttributes(entry, true, material.Name);
@@ -644,7 +644,7 @@ public override async Task Update(IChangeKeyEntry change, bool ignoreIfMissing)
  var attributes = GetKeyEntryAttributes(entry);
  if (entry.Variant?.KeyContainers.Count == 1 && !entry.Variant.KeyContainers[0].Key.IsEmpty())
  {
- var rawkey = entry.Variant.KeyContainers[0].Key.GetAggregatedValueBinary();
+ var rawkey = entry.Variant.KeyContainers[0].Key.GetAggregatedValueAsBinary();
  if (rawkey != null)
  {
  // We should already have only one key material during an update

KeyManager.Library.KeyStore.LCP/LCPKeyStore.cs

@@ -153,7 +153,7 @@ public override async Task Delete(KeyEntryId identifier, KeyEntryClass keClass,
  var kc = ke.Variant.KeyContainers[0];
  if (!string.IsNullOrEmpty(key.Value))
  {
- kc.Key.SetAggregatedValueString(key.Value);
+ kc.Key.SetAggregatedValueAsString(key.Value);
  }
  if (kc is KeyVersion kv && key.Version != null)
  {
@@ -301,7 +301,7 @@ private static CredentialKey CreateCredentialKey(KeyEntryId identifier, KeyConta
  }
  if (kc != null)
  {
- var rawkey = kc.Key.GetAggregatedValueBinary();
+ var rawkey = kc.Key.GetAggregatedValueAsBinary();
  key.Value = (rawkey != null) ? Convert.ToHexString(rawkey) : null;
  }
  if (!string.IsNullOrEmpty(kc?.Key.Link?.KeyStoreFavorite))

KeyManager.Library.KeyStore.NXP_SAM.UI/Domain/SAMKeyStoreToolsControlViewModel.cs

@@ -152,7 +152,7 @@ private void SAMAuthenticate()
  key.setKeyType(LibLogicalAccess.Card.DESFireKeyType.DF_KEY_3K3DES);
  }
 
- key.fromString(SAMAuthKey.Key.GetAggregatedValueString(KeyValueStringFormat.HexStringWithSpace));
+ key.fromString(SAMAuthKey.Key.GetAggregatedValueAsString(KeyValueStringFormat.HexStringWithSpace));
  key.setKeyVersion(SAMAuthKey.Version);
  var cmd = (KeyStore as SAMKeyStore)?.Chip?.getCommands();
  if (cmd is SAMAV1ISO7816Commands samav1cmd)
@@ -231,7 +231,7 @@ private void SAMLockUnlock()
 
  var key = new LibLogicalAccess.Card.DESFireKey();
  key.setKeyType(LibLogicalAccess.Card.DESFireKeyType.DF_KEY_AES);
- key.fromString(SAMUnlockKey.Key.GetAggregatedValueString(KeyValueStringFormat.HexStringWithSpace));
+ key.fromString(SAMUnlockKey.Key.GetAggregatedValueAsString(KeyValueStringFormat.HexStringWithSpace));
  key.setKeyVersion(SAMUnlockKey.Version);
 
  if (cmd is SAMAV1ISO7816Commands samav1cmd)

KeyManager.Library.KeyStore.NXP_SAM.UI/Wizard/SAMAccessControlWizardFactory.cs

@@ -67,7 +67,7 @@ private static SAMSymmetricKeyEntry CreateKeyEntry(string id, string label, bool
  if (ke.Variant.KeyContainers[i] is KeyVersion keyVersion)
  {
  keyVersion.Version = i;
- keyVersion.Key.Materials[0].SetValueBinary(KeyGeneration.Random(keyVersion.Key.KeySize));
+ keyVersion.Key.Materials[0].SetValueAsBinary(KeyGeneration.Random(keyVersion.Key.KeySize));
  }
  }
  }

KeyManager.Library.KeyStore.NXP_SAM/ISLOG/ISLOGKeyStore.cs

@@ -138,17 +138,17 @@ public override async Task Open()
  if (ke.Variant.KeyContainers[0] is KeyVersion keya)
  {
  keya.Version = byte.Parse(versionEl.Attribute("vera")?.Value ?? "0");
- keya.Key.SetAggregatedValueString(keyEl.Attribute("keya")?.Value ?? string.Empty);
+ keya.Key.SetAggregatedValueAsString(keyEl.Attribute("keya")?.Value ?? string.Empty);
  }
  if (ke.Variant.KeyContainers[1] is KeyVersion keyb)
  {
  keyb.Version = byte.Parse(versionEl.Attribute("verb")?.Value ?? "0");
- keyb.Key.SetAggregatedValueString(keyEl.Attribute("keyb")?.Value ?? string.Empty);
+ keyb.Key.SetAggregatedValueAsString(keyEl.Attribute("keyb")?.Value ?? string.Empty);
  }
  if (keyc != null)
  {
  keyc.Version = byte.Parse(versionEl.Attribute("verc")?.Value ?? "0");
- keyc.Key.SetAggregatedValueString(keyEl.Attribute("keyc")?.Value ?? string.Empty);
+ keyc.Key.SetAggregatedValueAsString(keyEl.Attribute("keyc")?.Value ?? string.Empty);
  }
  }
 

KeyManager.Library.KeyStore.NXP_SAM/SAMKeyStore.cs

@@ -238,14 +238,14 @@ public override Task Delete(KeyEntryId identifier, KeyEntryClass keClass, bool i
  throw new KeyStoreException("Unexpected number of keys on the SAM Key Entry.");
  }
 
- keyVersions[0].Key.SetAggregatedValueString(string.Empty);
+ keyVersions[0].Key.SetAggregatedValueAsString(string.Empty);
  keyVersions[0].Version = infoav2.vera;
- keyVersions[1].Key.SetAggregatedValueString(string.Empty);
+ keyVersions[1].Key.SetAggregatedValueAsString(string.Empty);
  keyVersions[1].Version = infoav2.verb;
 
  if (keyEntry.Variant.KeyContainers.Count >= 3)
  {
- keyVersions[2].Key.SetAggregatedValueString(string.Empty);
+ keyVersions[2].Key.SetAggregatedValueAsString(string.Empty);
  keyVersions[2].Version = infoav2.verc;
  }
  }
@@ -381,7 +381,7 @@ public override Task Update(IChangeKeyEntry change, bool ignoreIfMissing)
  key.setKeyVersion(GetSAMProperties().AuthenticateKeyVersion);
  if (!string.IsNullOrEmpty(Properties?.Secret))
  {
- key.fromString(KeyMaterial.GetValueString(Properties.Secret, KeyValueStringFormat.HexStringWithSpace));
+ key.fromString(KeyMaterial.GetValueAsString(Properties.Secret, KeyValueStringFormat.HexStringWithSpace));
  }
  else
  {
@@ -424,7 +424,7 @@ public override Task Update(IChangeKeyEntry change, bool ignoreIfMissing)
  var containers = samkey.Variant.KeyContainers;
  var keys = new LibLogicalAccess.UCharCollectionCollection(containers.Count)
  {
- new LibLogicalAccess.ByteVector(containers[0].Key.GetAggregatedValueBinary(true))
+ new LibLogicalAccess.ByteVector(containers[0].Key.GetAggregatedValueAsBinary(true))
  };
  if (!containers[1].Key.IsEmpty())
  {
@@ -442,7 +442,7 @@ public override Task Update(IChangeKeyEntry change, bool ignoreIfMissing)
  log.Info("Updating value for key version B.");
  updateSettings.keyVb = 1;
  }
- keys.Add(new LibLogicalAccess.ByteVector(containers[1].Key.GetAggregatedValueBinary(true)));
+ keys.Add(new LibLogicalAccess.ByteVector(containers[1].Key.GetAggregatedValueAsBinary(true)));
  if (containers[1] is KeyVersion keyVersionB)
  {
  infoav2.verb = keyVersionB.Version;
@@ -455,7 +455,7 @@ public override Task Update(IChangeKeyEntry change, bool ignoreIfMissing)
  log.Info("Updating value for key version C.");
  updateSettings.keyVc = 1;
  }
- keys.Add(new LibLogicalAccess.ByteVector(containers[2].Key.GetAggregatedValueBinary(true)));
+ keys.Add(new LibLogicalAccess.ByteVector(containers[2].Key.GetAggregatedValueAsBinary(true)));
  if (containers[2] is KeyVersion keyVersionC)
  {
  infoav2.verc = keyVersionC.Version;
@@ -580,7 +580,7 @@ public static LibLogicalAccess.Card.DESFireKey CreateDESFireKey(LibLogicalAccess
  key.setKeyType(keyType);
  if (!string.IsNullOrEmpty(keyValue))
  {
- key.fromString(KeyMaterial.GetValueString(keyValue, KeyValueStringFormat.HexStringWithSpace));
+ key.fromString(KeyMaterial.GetValueAsString(keyValue, KeyValueStringFormat.HexStringWithSpace));
  }
  return key;
  }
@@ -665,7 +665,7 @@ public void UpdateCounter(SAMKeyUsageCounter counter)
  key.setKeyVersion(GetSAMProperties().AuthenticateKeyVersion);
  if (!string.IsNullOrEmpty(Properties?.Secret))
  {
- key.fromString(KeyMaterial.GetValueString(Properties.Secret, KeyValueStringFormat.HexStringWithSpace));
+ key.fromString(KeyMaterial.GetValueAsString(Properties.Secret, KeyValueStringFormat.HexStringWithSpace));
  }
  else
  {
@@ -726,7 +726,7 @@ public void UpdateCounter(SAMKeyUsageCounter counter)
  {
  if (!string.IsNullOrEmpty(GetSAMProperties().Secret) && !_unlocked)
  {
- UnlockSAM(av2cmd, GetSAMProperties().AuthenticateKeyEntryIdentifier, GetSAMProperties().AuthenticateKeyVersion, KeyMaterial.GetValueString(Properties?.Secret, KeyValueStringFormat.HexStringWithSpace));
+ UnlockSAM(av2cmd, GetSAMProperties().AuthenticateKeyEntryIdentifier, GetSAMProperties().AuthenticateKeyVersion, KeyMaterial.GetValueAsString(Properties?.Secret, KeyValueStringFormat.HexStringWithSpace));
  _unlocked = true;
  }
 

KeyManager.Library.Tests/KeyTests.cs

@@ -7,23 +7,23 @@ public class KeyTests
  public void OneMaterial_GetAggregatedValue_HexString()
  {
  var key = new Key(null, 16, "00112233445566778899AABBCCDDEEFF");
- var v = key.GetAggregatedValueString();
+ var v = key.GetAggregatedValueAsString();
  Assert.AreEqual("00112233445566778899AABBCCDDEEFF", v, true);
  }
 
  [TestMethod]
  public void OneMaterial_SetAggregatedValue_HexString()
  {
  var key = new Key();
- key.SetAggregatedValueString("00112233445566778899AABBCCDDEEFF");
+ key.SetAggregatedValueAsString("00112233445566778899AABBCCDDEEFF");
  Assert.AreEqual("00112233445566778899AABBCCDDEEFF", key.Materials[0].Value, true);
  }
 
  [TestMethod]
  public void OneMaterial_GetAggregatedValue_Binary()
  {
  var key = new Key(null, 16, "00112233445566778899AABBCCDDEEFF");
- var v = key.GetAggregatedValueBinary();
+ var v = key.GetAggregatedValueAsBinary();
  Assert.IsNotNull(v);
  Assert.AreEqual("00112233445566778899AABBCCDDEEFF", Convert.ToHexString(v), true);
  }
@@ -32,31 +32,31 @@ public void OneMaterial_GetAggregatedValue_Binary()
  public void OneMaterial_GetAggregatedValue_HexStringWithSpace()
  {
  var key = new Key(null, 16, "00112233445566778899AABBCCDDEEFF");
- var v = key.GetAggregatedValueString(KeyValueStringFormat.HexStringWithSpace);
+ var v = key.GetAggregatedValueAsString(KeyValueStringFormat.HexStringWithSpace);
  Assert.AreEqual("00 11 22 33 44 55 66 77 88 99 AA BB CC DD EE FF", v, true);
  }
 
  [TestMethod]
  public void OneMaterial_SetAggregatedValue_HexStringWithSpace()
  {
  var key = new Key();
- key.SetAggregatedValueString("00 11 22 33 44 55 66 77 88 99 AA BB CC DD EE FF", KeyValueStringFormat.HexStringWithSpace);
+ key.SetAggregatedValueAsString("00 11 22 33 44 55 66 77 88 99 AA BB CC DD EE FF", KeyValueStringFormat.HexStringWithSpace);
  Assert.AreEqual("00112233445566778899AABBCCDDEEFF", key.Materials[0].Value, true);
  }
 
  [TestMethod]
  public void TwoMaterials_GetAggregatedValue_HexString()
  {
  var key = new Key(null, 8, new KeyMaterial("0011223344556677"), new KeyMaterial("8899AABBCCDDEEFF"));
- var v = key.GetAggregatedValueString();
+ var v = key.GetAggregatedValueAsString();
  Assert.AreEqual("00112233445566778899AABBCCDDEEFF", v, true);
  }
 
  [TestMethod]
  public void TwoMaterials_SetAggregatedValue_HexString()
  {
  var key = new Key(null, 8, 2);
- key.SetAggregatedValueString("00112233445566778899AABBCCDDEEFF");
+ key.SetAggregatedValueAsString("00112233445566778899AABBCCDDEEFF");
  Assert.AreEqual("0011223344556677", key.Materials[0].Value, true);
  Assert.AreEqual("8899AABBCCDDEEFF", key.Materials[1].Value, true);
  }
@@ -65,7 +65,7 @@ public void TwoMaterials_SetAggregatedValue_HexString()
  public void TwoMaterials_GetAggregatedValue_Binary()
  {
  var key = new Key(null, 8, new KeyMaterial("0011223344556677"), new KeyMaterial("8899AABBCCDDEEFF"));
- var v = key.GetAggregatedValueBinary();
+ var v = key.GetAggregatedValueAsBinary();
  Assert.IsNotNull(v);
  Assert.AreEqual("00112233445566778899AABBCCDDEEFF", Convert.ToHexString(v), true);
  }

KeyManager.Library.UI/Domain/KeyChecksumConverter.cs

@@ -17,7 +17,7 @@ public object Convert(object[] values, Type targetType, object parameter, Cultur
  return string.Empty;
  }
 
- if (string.IsNullOrEmpty(value2.GetAggregatedValueString()))
+ if (string.IsNullOrEmpty(value2.GetAggregatedValueAsString()))
  {
  return Binding.DoNothing;
  }

KeyManager.Library.UI/KeyActionButtonsControl.xaml.cs

@@ -47,7 +47,7 @@ public KeyEntryClass KClass
 
  private void BtnCopy_Click(object sender, RoutedEventArgs e)
  {
- Clipboard.SetText(Key?.GetAggregatedValueString());
+ Clipboard.SetText(Key?.GetAggregatedValueAsString());
  }
 
  private async void BtnKeyStoreLink_Click(object sender, RoutedEventArgs e)
@@ -77,7 +77,7 @@ private void BtnImport_Click(object sender, RoutedEventArgs e)
  if (ofd.ShowDialog() == true)
  {
  var key = System.IO.File.ReadAllBytes(ofd.FileName);
- Key.SetAggregatedValueString(Convert.ToHexString(key));
+ Key.SetAggregatedValueAsString(Convert.ToHexString(key));
  }
  }
 
@@ -86,7 +86,7 @@ private void BtnExport_Click(object sender, RoutedEventArgs e)
  var sfd = new SaveFileDialog();
  if (sfd.ShowDialog() == true)
  {
- System.IO.File.WriteAllBytes(sfd.FileName, Convert.FromHexString(Key.GetAggregatedValueString() ?? ""));
+ System.IO.File.WriteAllBytes(sfd.FileName, Convert.FromHexString(Key.GetAggregatedValueAsString() ?? ""));
  }
  }
 
@@ -102,7 +102,7 @@ private void BtnPrint_Click(object sender, RoutedEventArgs e)
  if (KClass == KeyEntryClass.Symmetric)
  {
  var kcv = new KCV();
- control.KeyChecksum = kcv.ComputeKCV(Key.Tags, Key.GetAggregatedValueString() ?? "", null);
+ control.KeyChecksum = kcv.ComputeKCV(Key.Tags, Key.GetAggregatedValueAsString() ?? "", null);
  }
  printDialog.PrintVisual(control, "Leosac Key Manager - Key Printing");
  }

KeyManager.Library/CRC32Checksum.cs

@@ -8,7 +8,7 @@ public class CRC32Checksum : KeyChecksum
 
  public override byte[] ComputeKCV(Key key, byte[]? iv)
  {
- var rawkey = key.GetAggregatedValueBinary() ?? throw new Exception("Key value is null");
+ var rawkey = key.GetAggregatedValueAsBinary() ?? throw new Exception("Key value is null");
 
  // Use the IV as a Salt
  byte[] data;

KeyManager.Library/KCV.cs

@@ -32,7 +32,7 @@ public override byte[] ComputeKCV(Key key, byte[]? iv)
  using (var ms = new MemoryStream())
  {
  var crypto = KeyHelper.GetSymmetricAlgorithm(key, CipherMode.CBC, true) ?? throw new Exception("Unsupported key for KCV calcul.");
- var parameters = new ParametersWithIV(new KeyParameter(key.GetAggregatedValueBinary()), paddediv);
+ var parameters = new ParametersWithIV(new KeyParameter(key.GetAggregatedValueAsBinary()), paddediv);
  crypto.Init(true, parameters);
  result = crypto.DoFinal(data);
  Array.Resize(ref result, 3);