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

Resolved issue with the password prompt box not appearing when trying to decrypt with custom password. Class needs to be cleaned up.

Browse Source
This commit is contained in:
David Sparer
2016-10-13 09:13:02 -06:00
parent 990605948b
commit f8968f2eb1
1 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
mRemoteV1/Config/Connections/ConnectionsDecryptor.cs
View File

@@ -3,6 +3,7 @@ using mRemoteNG.App;
using mRemoteNG.Security;
using mRemoteNG.Security.SymmetricEncryption;
using mRemoteNG.Tree.Root;
using Org.BouncyCastle.Security;
namespace mRemoteNG.Config.Connections
@@ -23,7 +24,7 @@ namespace mRemoteNG.Config.Connections
public string Decrypt(string plainText)
{
return _cryptographyProvider.Decrypt(plainText, Runtime.EncryptionKey);
return plainText == "" ? "" : _cryptographyProvider.Decrypt(plainText, Runtime.EncryptionKey);
}
public string LegacyFullFileDecrypt(string xml)
@@ -65,7 +66,14 @@ namespace mRemoteNG.Config.Connections
public bool ConnectionsFileIsAuthentic(string protectedString, RootNodeInfo rootInfo)
{
var connectionsFileIsNotEncrypted = _cryptographyProvider.Decrypt(protectedString, Runtime.EncryptionKey) == "ThisIsNotProtected";
var connectionsFileIsNotEncrypted = false;
try
{
connectionsFileIsNotEncrypted = _cryptographyProvider.Decrypt(protectedString, Runtime.EncryptionKey) == "ThisIsNotProtected";
}
catch (EncryptionException)
{
}
return connectionsFileIsNotEncrypted || Authenticate(protectedString, false, rootInfo);
}
@@ -74,22 +82,35 @@ namespace mRemoteNG.Config.Connections
var passwordName = "";
//passwordName = Path.GetFileName(ConnectionFileName);
var stillEncrypted = true;
if (compareToOriginalValue)
{
while (_cryptographyProvider.Decrypt(value, Runtime.EncryptionKey) == value)
while (stillEncrypted)
{
Runtime.EncryptionKey = Tools.MiscTools.PasswordDialog(passwordName, false);
if (Runtime.EncryptionKey.Length == 0)
return false;
try
{
stillEncrypted = _cryptographyProvider.Decrypt(value, Runtime.EncryptionKey) == value;
}
catch(EncryptionException) { }
}
}
else
{
while (_cryptographyProvider.Decrypt(value, Runtime.EncryptionKey) != "ThisIsProtected")
while (stillEncrypted)
{
Runtime.EncryptionKey = Tools.MiscTools.PasswordDialog(passwordName, false);
if (Runtime.EncryptionKey.Length == 0)
return false;
try
{
stillEncrypted = _cryptographyProvider.Decrypt(value, Runtime.EncryptionKey) != "ThisIsProtected";
}
catch (EncryptionException) { }
}
if (rootInfo == null) return true;