Fix 4th set of Codacy warnings

KeyManager.Library.KeyStore.File/FileKeyStore.cs

@@ -169,7 +169,7 @@ private byte[] GetWrappingKey()
  return key;
  }
 
- public override Task<IList<KeyEntryId>> GetAll(KeyEntryClass? keClass = null)
+ public override Task<IList<KeyEntryId>> GetAll(KeyEntryClass? keClass)
  {
  log.Info(string.Format("Getting all key entries (class: `{0}`)...", keClass));
  IList<KeyEntryId> keyEntries = new List<KeyEntryId>();

KeyManager.Library.KeyStore.HSM_PKCS11/PKCS11KeyEntry.cs

@@ -6,7 +6,7 @@ namespace Leosac.KeyManager.Library.KeyStore.HSM_PKCS11
 {
  public abstract class PKCS11KeyEntry : KeyEntry
  {
- public PKCS11KeyEntry()
+ protected PKCS11KeyEntry()
  {
  Identifier.Id = Guid.NewGuid().ToString("N");
  }
@@ -78,7 +78,9 @@ private static uint GetKeySize(CKK ckk)
  public static KeyEntryClass GetKeyEntryClassFromCKK(CKK ckk)
  {
  if (ckk == CKK.CKK_DSA || ckk == CKK.CKK_ECDSA || ckk == CKK.CKK_RSA)
+ {
  return KeyEntryClass.Asymmetric;
+ }
 
  return KeyEntryClass.Symmetric;
  }

KeyManager.Library.KeyStore.LCP/LCPKeyStore.cs

@@ -15,11 +15,6 @@ public class LCPKeyStore : KeyStore
  private ICredentialKeyAPI? _keyAPI;
  private string? _authToken;
 
- public LCPKeyStore()
- {
-
- }
-
  public override string Name => "LCP";
 
  public override bool CanCreateKeyEntries => true;
@@ -168,7 +163,7 @@ public override async Task<IList<KeyEntryId>> GetAll(KeyEntryClass? keClass)
  var keys = await _keyAPI!.GetAll();
  foreach (var k in keys)
  {
- entries.Add(new KeyEntryId()
+ entries.Add(new KeyEntryId
  {
  Id = k.Id.ToString(),
  Label = k.Name
@@ -182,7 +177,9 @@ public override async Task<IList<KeyEntryId>> GetAll(KeyEntryClass? keClass)
  private void CheckAuthentication()
  {
  if (_authAPI == null || _keyAPI == null || string.IsNullOrEmpty(_authToken))
+ {
  throw new Exception("Please open the key store first to perform authentication.");
+ }
  }
 
  public LCPKeyStoreProperties GetLCPProperties()
@@ -277,7 +274,9 @@ public override async Task Update(IChangeKeyEntry change, bool ignoreIfMissing)
  }
  }
  else
+ {
  throw new NotImplementedException();
+ }
 
  log.Info(string.Format("Key entry `{0}` updated.", change.Identifier));
  }

KeyManager.Library.KeyStore.LCP/LCPKeyStoreProperties.cs

@@ -30,7 +30,9 @@ public override bool Equals(object? obj)
  public bool Equals(LCPKeyStoreProperties? p)
  {
  if (p is null)
+ {
  return false;
+ }
 
  if (Object.ReferenceEquals(this, p))
  {
@@ -51,10 +53,7 @@ public bool Equals(LCPKeyStoreProperties? p)
  {
  if (lhs is null)
  {
- if (rhs is null)
- return true;
-
- return false;
+ return rhs is null;
  }
 
  return lhs.Equals(rhs);

KeyManager.Library.KeyStore.Memory/MemoryKeyEntry.cs

@@ -44,7 +44,7 @@ public override IList<KeyEntryVariant> GetAllVariants(KeyEntryClass? classFilter
  if (classFilter == null || classFilter == KeyEntryClass.Asymmetric)
  {
  var rsavar = new KeyEntryVariant { Name = "RSA" };
- rsavar.KeyContainers.Add(new KeyContainer("Key", new Key(new[] { "RSA", KeyEntryClass.Asymmetric.ToString() }, 0, new KeyMaterial[]
+ rsavar.KeyContainers.Add(new KeyContainer("Key", new Key(new[] { "RSA", KeyEntryClass.Asymmetric.ToString() }, 0, new[]
  {
  new KeyMaterial("", KeyMaterial.PRIVATE_KEY),
  new KeyMaterial("", KeyMaterial.PUBLIC_KEY)

KeyManager.Library.KeyStore.Memory/MemoryKeyStore.cs

@@ -81,7 +81,7 @@ public override async Task Delete(KeyEntryId identifier, KeyEntryClass keClass,
  return keyEntry;
  }
 
- public override Task<IList<KeyEntryId>> GetAll(KeyEntryClass? keClass = null)
+ public override Task<IList<KeyEntryId>> GetAll(KeyEntryClass? keClass)
  {
  IList<KeyEntryId> list = _keyEntries.Where(k => keClass == null || k.KClass == keClass).Select(k => k.Identifier).ToList();
  return Task.FromResult(list);

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

@@ -21,7 +21,7 @@ public SAMKeyStorePropertiesControlViewModel()
  });
  }
 
- private LibLogicalAccess.LibraryManager _lla;
+ private readonly LibLogicalAccess.LibraryManager _lla;
 
  public SAMKeyStoreProperties? SAMProperties
  {

KeyManager.Library.KeyStore.NXP_SAM/SAMKeyStore.cs

@@ -164,7 +164,9 @@ public override Task Close()
  public override Task<bool> CheckKeyEntryExists(KeyEntryId identifier, KeyEntryClass keClass)
  {
  if (identifier.Id == null)
+ {
  return Task.FromResult(false);
+ }
 
  if (uint.TryParse(identifier.Id, out uint entry))
  {
@@ -423,16 +425,25 @@ public override Task Update(IChangeKeyEntry change, bool ignoreIfMissing)
  foreach (var keyversion in samkey.Variant.KeyContainers)
  {
  if (string.IsNullOrEmpty(keyversion.Key.GetAggregatedValue<string>()))
+ {
  keys.Add(new LibLogicalAccess.ByteVector(new byte[keyversion.Key.KeySize]));
+ }
  else
+ {
  keys.Add(new LibLogicalAccess.ByteVector(keyversion.Key.GetAggregatedValue<byte[]>(KeyValueFormat.Binary)));
+ }
  }
 
  infoav2.vera = keyVersions[0].Version;
  if (keyVersions.Length >= 2)
+ {
  infoav2.verb = keyVersions[1].Version;
+ }
+
  if (keyVersions.Length >= 3)
+ {
  infoav2.verc = keyVersions[2].Version;
+ }
 
  if (keyVersions[0].Key.Tags.Contains("AES"))
  {
@@ -489,7 +500,7 @@ public override Task Update(IChangeKeyEntry change, bool ignoreIfMissing)
  }
 
  OnKeyEntryUpdated(change);
- log.Info(String.Format("Key entry `{0}` updated.", change.Identifier));
+ log.Info(string.Format("Key entry `{0}` updated.", change.Identifier));
  return Task.CompletedTask;
  }
 
@@ -678,9 +689,13 @@ public void UpdateCounter(SAMKeyUsageCounter counter)
  byte[] div;
  log.Info(string.Format("Resolving key link with Key Entry Identifier `{0}`, Key Version `{1}`, Div Input `{2}`...", keyIdentifier, containerSelector, divInput));
  if (!string.IsNullOrEmpty(divInput))
+ {
  div = Convert.FromHexString(divInput);
+ }
  else
+ {
  div = Array.Empty<byte>();
+ }
 
  if (!await CheckKeyEntryExists(keyIdentifier, keClass))
  {

KeyManager.Library.KeyStore.NXP_SAM/SAMKeyStoreProperties.cs

@@ -4,10 +4,10 @@ namespace Leosac.KeyManager.Library.KeyStore.NXP_SAM
 {
  public class SAMKeyStoreProperties : KeyStoreProperties, IEquatable<SAMKeyStoreProperties>
  {
- public SAMKeyStoreProperties() : base()
+ public SAMKeyStoreProperties()
  {
  _readerProvider = "PCSC";
- _readerUnit = String.Empty;
+ _readerUnit = string.Empty;
  _autoSwitchToAV2 = true;
  _authenticateKeyEntryIdentifier = 0;
  _authenticateKeyType = DESFireKeyType.DF_KEY_AES;
@@ -80,13 +80,19 @@ public override bool Equals(object? obj)
  public bool Equals(SAMKeyStoreProperties? p)
  {
  if (p is null)
+ {
  return false;
+ }
 
  if (Object.ReferenceEquals(this, p))
+ {
  return true;
+ }
 
  if (this.GetType() != p.GetType())
+ {
  return false;
+ }
 
  return (ReaderProvider == p.ReaderProvider) && (ReaderUnit == p.ReaderUnit) && (AutoSwitchToAV2 == p.AutoSwitchToAV2) &&
  (AuthenticateKeyEntryIdentifier == p.AuthenticateKeyEntryIdentifier) && (_authenticateKeyVersion == p._authenticateKeyVersion) &&
@@ -99,10 +105,7 @@ public bool Equals(SAMKeyStoreProperties? p)
  {
  if (lhs is null)
  {
- if (rhs is null)
- return true;
-
- return false;
+ return rhs is null;
  }
 
  return lhs.Equals(rhs);