Learning/mRemoteNG
1
0
Fork 0
mirror of https://github.com/mRemoteNG/mRemoteNG.git synced 2026-02-26 03:49:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug where we were not using the correct encryption key during serialization

Browse Source
This commit is contained in:
David Sparer
2016-10-24 15:39:50 -06:00
parent e9ead72e79
commit bd30103758
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mRemoteV1/Config/Serializers/XmlConnectionsDocumentCompiler.cs
View File

@@ -13,6 +13,7 @@ namespace mRemoteNG.Config.Serializers
public class XmlConnectionsDocumentCompiler
{
private readonly ICryptographyProvider _cryptographyProvider;
private SecureString _encryptionKey;
public XmlConnectionsDocumentCompiler(ICryptographyProvider cryptographyProvider)
{
@@ -28,13 +29,14 @@ namespace mRemoteNG.Config.Serializers
public XDocument CompileDocument(ConnectionInfo serializationTarget, bool fullFileEncryption, bool export)
{
var rootNodeInfo = GetRootNodeFromConnectionInfo(serializationTarget);
_encryptionKey = rootNodeInfo.PasswordString.ConvertToSecureString();
var rootElement = CompileRootNode(rootNodeInfo, fullFileEncryption, export);
CompileRecursive(serializationTarget, rootElement);
var xmlDeclaration = new XDeclaration("1.0", "utf-8", "");
var xmlDeclaration = new XDeclaration("1.0", "utf-8", null);
var xmlDocument = new XDocument(xmlDeclaration, rootElement);
if (fullFileEncryption)
xmlDocument = new XmlConnectionsDocumentEncryptor(_cryptographyProvider).EncryptDocument(xmlDocument, rootNodeInfo.PasswordString.ConvertToSecureString());
xmlDocument = new XmlConnectionsDocumentEncryptor(_cryptographyProvider).EncryptDocument(xmlDocument, _encryptionKey);
return xmlDocument;
}
@@ -75,7 +77,7 @@ namespace mRemoteNG.Config.Serializers
private XElement CompileConnectionInfoNode(ConnectionInfo connectionInfo)
{
var connectionSerializer = new XmlConnectionNodeSerializer(_cryptographyProvider, new SecureString());
var connectionSerializer = new XmlConnectionNodeSerializer(_cryptographyProvider, _encryptionKey);
return connectionSerializer.SerializeConnectionInfo(connectionInfo);
}
}