diff --git a/DigitalData.Core.Abstractions/Security/IRSAFactory.cs b/DigitalData.Core.Abstractions/Security/IRSAFactory.cs index 0dfea9d..7ff812e 100644 --- a/DigitalData.Core.Abstractions/Security/IRSAFactory.cs +++ b/DigitalData.Core.Abstractions/Security/IRSAFactory.cs @@ -12,7 +12,5 @@ namespace DigitalData.Core.Abstractions.Security PbeEncryptionAlgorithm? pbeEncryptionAlgorithm = null, HashAlgorithmName? hashAlgorithmName = null, int? iterationCount = null); - - Task ReadRSADecryptorAsync(string path, Version? version = null, CancellationToken cancellationToken = default); } } \ No newline at end of file diff --git a/DigitalData.Core.Security/Config/AsymCryptParams.cs b/DigitalData.Core.Security/Config/AsymCryptParams.cs index 0e167a8..edaa53b 100644 --- a/DigitalData.Core.Security/Config/AsymCryptParams.cs +++ b/DigitalData.Core.Security/Config/AsymCryptParams.cs @@ -1,4 +1,5 @@ using DigitalData.Core.Abstractions.Security; +using System.Text.Json.Serialization; namespace DigitalData.Core.Security.Config { diff --git a/DigitalData.Core.Security/Config/RSAFactoryParams.cs b/DigitalData.Core.Security/Config/RSAFactoryParams.cs index 7b1bd54..5ab57f2 100644 --- a/DigitalData.Core.Security/Config/RSAFactoryParams.cs +++ b/DigitalData.Core.Security/Config/RSAFactoryParams.cs @@ -22,6 +22,6 @@ namespace DigitalData.Core.Security.Config [JsonIgnore] public PbeParameters PbeParameters => _pbeParameters!; - public void OnDeserialized() => _pbeParameters = new PbeParameters(PbeEncryptionAlgorithm, PbeHashAlgorithmName, PbeIterationCount); + public virtual void OnDeserialized() => _pbeParameters = new PbeParameters(PbeEncryptionAlgorithm, PbeHashAlgorithmName, PbeIterationCount); } } \ No newline at end of file diff --git a/DigitalData.Core.Security/Cryptographer/RSAFactory.cs b/DigitalData.Core.Security/Cryptographer/RSAFactory.cs index ebdc603..ee4cca9 100644 --- a/DigitalData.Core.Security/Cryptographer/RSAFactory.cs +++ b/DigitalData.Core.Security/Cryptographer/RSAFactory.cs @@ -40,26 +40,5 @@ namespace DigitalData.Core.Security.Cryptographer return new string(pemChars); } - - public async Task ReadRSADecryptorAsync(string path, Version? version = null, CancellationToken cancellationToken = default) - { - var pem = await File.ReadAllTextAsync(path, cancellationToken); - - (string Value, Version Version)? versionedPassword = null; - - if (version is not null) - { - if (version != Secrets.Version) - throw new InvalidOperationException($"The provided version {version} does not match the expected version {Secrets.Version}."); - - versionedPassword = (Secrets.PBE_PASSWORD, Secrets.Version); - } - - return new RSADecryptor() - { - Pem = pem, - VersionedPassword = versionedPassword - }; - } } } \ No newline at end of file