From fbfe664438479ef346019be23c2c51de430e7339 Mon Sep 17 00:00:00 2001 From: David Sparer Date: Tue, 14 Feb 2017 14:58:09 -0700 Subject: [PATCH] replaced duplicate code --- .../XmlCredentialRecordDeserializer.cs | 22 +------------------ 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/mRemoteV1/Config/Serializers/CredentialSerializer/XmlCredentialRecordDeserializer.cs b/mRemoteV1/Config/Serializers/CredentialSerializer/XmlCredentialRecordDeserializer.cs index 943d25200..6d0389e8f 100644 --- a/mRemoteV1/Config/Serializers/CredentialSerializer/XmlCredentialRecordDeserializer.cs +++ b/mRemoteV1/Config/Serializers/CredentialSerializer/XmlCredentialRecordDeserializer.cs @@ -20,7 +20,7 @@ namespace mRemoteNG.Config.Serializers var xdoc = XDocument.Parse(xml); var rootElement = xdoc.Root; ValidateSchemaVersion(rootElement); - var cryptographyProvider = BuildCryptoProvider(rootElement); + var cryptographyProvider = CryptographyProviderFactory.BuildFromXml(rootElement); Authenticate(rootElement, cryptographyProvider, decryptionKey); var credentials = from element in xdoc.Descendants("Credential") @@ -48,25 +48,5 @@ namespace mRemoteNG.Config.Serializers var authString = rootElement.Attribute("Auth")?.Value; cryptographyProvider.Decrypt(authString, key); } - - private ICryptographyProvider BuildCryptoProvider(XElement rootElement) - { - if (rootElement == null) - throw new ArgumentNullException(nameof(rootElement)); - - BlockCipherEngines engine; - Enum.TryParse(rootElement.Attribute("EncryptionEngine")?.Value, true, out engine); - - BlockCipherModes mode; - Enum.TryParse(rootElement.Attribute("BlockCipherMode")?.Value, true, out mode); - - int kdfIterations; - int.TryParse(rootElement.Attribute("KdfIterations")?.Value, out kdfIterations); - - var cryptoProvider = new CryptographyProviderFactory().CreateAeadCryptographyProvider(engine, mode); - cryptoProvider.KeyDerivationIterations = kdfIterations; - - return cryptoProvider; - } } } \ No newline at end of file