diff --git a/DigitalData.Core.Abstractions/Security/ICryptFactory.cs b/DigitalData.Core.Abstractions/Security/IAsymCryptService.cs similarity index 98% rename from DigitalData.Core.Abstractions/Security/ICryptFactory.cs rename to DigitalData.Core.Abstractions/Security/IAsymCryptService.cs index 94c3109..e4bfc5a 100644 --- a/DigitalData.Core.Abstractions/Security/ICryptFactory.cs +++ b/DigitalData.Core.Abstractions/Security/IAsymCryptService.cs @@ -2,7 +2,7 @@ namespace DigitalData.Core.Abstractions.Security { - public interface ICryptFactory + public interface IAsymCryptService { int KeySizeInBits { get; init; } diff --git a/DigitalData.Core.Security.Extensions/RSAExtensions.cs b/DigitalData.Core.Security.Extensions/RSAExtensions.cs index 0599cfa..be2ef74 100644 --- a/DigitalData.Core.Security.Extensions/RSAExtensions.cs +++ b/DigitalData.Core.Security.Extensions/RSAExtensions.cs @@ -13,10 +13,10 @@ namespace DigitalData.Core.Security.Extensions return rsa; } - public static IRSADecryptor GetRSADecryptor(this ICryptFactory factory, string issuer, string audience, Version? version = null, string? seperator = null) + public static IRSADecryptor GetRSADecryptor(this IAsymCryptService factory, string issuer, string audience, Version? version = null, string? seperator = null) => factory[factory.RSAKeyNameFormatter(issuer, audience, true, version, seperator)]; - public static bool TryGetRSADecryptor(this ICryptFactory factory, string issuer, string audience, out IRSADecryptor? decryptor, Version? version = null, string? seperator = null) + public static bool TryGetRSADecryptor(this IAsymCryptService factory, string issuer, string audience, out IRSADecryptor? decryptor, Version? version = null, string? seperator = null) => factory.TryGetRSADecryptor(factory.RSAKeyNameFormatter(issuer, audience, true, version, seperator), out decryptor); private static string CreatePath(string filename, string? directory = null) diff --git a/DigitalData.Core.Security/CryptFactory.cs b/DigitalData.Core.Security/AsymCryptService.cs similarity index 76% rename from DigitalData.Core.Security/CryptFactory.cs rename to DigitalData.Core.Security/AsymCryptService.cs index 0549cd2..c2bc1ea 100644 --- a/DigitalData.Core.Security/CryptFactory.cs +++ b/DigitalData.Core.Security/AsymCryptService.cs @@ -3,7 +3,7 @@ using Microsoft.Extensions.Logging; namespace DigitalData.Core.Security { - public class CryptFactory : RSAFactory, ICryptFactory + public class AsymCryptService : RSAFactory, IAsymCryptService { private readonly IDictionary _decryptors; @@ -11,7 +11,7 @@ namespace DigitalData.Core.Security public Func RSAKeyNameFormatter { get; } - public CryptFactory(ILogger logger, IDictionary decryptors, Func rsaKeyNameFormatter) : base() + public AsymCryptService(ILogger logger, IDictionary decryptors, Func rsaKeyNameFormatter) : base() { _decryptors = decryptors ?? new Dictionary(); diff --git a/DigitalData.Core.Security/DIExtensions.cs b/DigitalData.Core.Security/DIExtensions.cs index 699f1c6..012ff26 100644 --- a/DigitalData.Core.Security/DIExtensions.cs +++ b/DigitalData.Core.Security/DIExtensions.cs @@ -8,7 +8,7 @@ namespace DigitalData.Core.Security { public static IServiceCollection AddSecurity(this IServiceCollection services) { - services.TryAddScoped(); + services.TryAddScoped(); return services; }