Learning/mRemoteNG
1
0
Fork 0
mirror of https://github.com/mRemoteNG/mRemoteNG.git synced 2026-02-17 22:11:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Modified the ICryptographyProvider interface to require getters for the cipher engine and mode using their enum types

Browse Source
This commit is contained in:
David Sparer
2016-10-19 17:17:28 -06:00
parent 2df182c4c9
commit 550119a53a
4 changed files with 55 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
mRemoteNGTests/Security/AeadCryptographyProviderTests.cs
View File

@@ -81,5 +81,37 @@ namespace mRemoteNGTests.Security
ActualValueDelegate<string> decryptMethod = () => _cryptographyProvider.Decrypt(cipherText, "wrongKey".ConvertToSecureString());
Assert.That(decryptMethod, Throws.TypeOf<EncryptionException>());
}
[TestCaseSource(typeof(TestCaseSources), nameof(TestCaseSources.AllEngineAndModeCombos))]
public void GetCipherEngine(BlockCipherEngines engine, BlockCipherModes mode)
{
var cryptoProvider = new CryptographyProviderFactory().CreateAeadCryptographyProvider(engine, mode);
Assert.That(cryptoProvider.CipherEngine, Is.EqualTo(engine));
}
[TestCaseSource(typeof(TestCaseSources), nameof(TestCaseSources.AllEngineAndModeCombos))]
public void GetCipherMode(BlockCipherEngines engine, BlockCipherModes mode)
{
var cryptoProvider = new CryptographyProviderFactory().CreateAeadCryptographyProvider(engine, mode);
Assert.That(cryptoProvider.CipherMode, Is.EqualTo(mode));
}
private class TestCaseSources
{
public static IEnumerable AllEngineAndModeCombos
{
get
{
foreach (var engine in Enum.GetValues(typeof(BlockCipherEngines)))
{
foreach (var mode in Enum.GetValues(typeof(BlockCipherModes)))
{
yield return new TestCaseData(engine, mode);
}
}
}
}
}
}
}

4
mRemoteV1/Security/ICryptographyProvider.cs
View File

@@ -6,7 +6,9 @@ namespace mRemoteNG.Security
{
int BlockSizeInBytes { get; }
string CipherEngine { get; }
BlockCipherEngines CipherEngine { get; }
BlockCipherModes CipherMode { get; }
string Encrypt(string plainText, SecureString encryptionKey);

18
mRemoteV1/Security/SymmetricEncryption/AeadCryptographyProvider.cs
View File

@@ -38,7 +38,23 @@ namespace mRemoteNG.Security.SymmetricEncryption
public int BlockSizeInBytes => _aeadBlockCipher.GetBlockSize();
public string CipherEngine => _aeadBlockCipher.AlgorithmName;
public BlockCipherEngines CipherEngine
{
get
{
var cipherEngine = _aeadBlockCipher.AlgorithmName.Split('/')[0];
return (BlockCipherEngines)Enum.Parse(typeof(BlockCipherEngines), cipherEngine);
}
}
public BlockCipherModes CipherMode
{
get
{
var cipherMode = _aeadBlockCipher.AlgorithmName.Split('/')[1];
return (BlockCipherModes)Enum.Parse(typeof(BlockCipherModes), cipherMode);
}
}
public AeadCryptographyProvider()
{

5
mRemoteV1/Security/SymmetricEncryption/LegacyRijndaelCryptographyProvider.cs
View File

@@ -13,11 +13,12 @@ namespace mRemoteNG.Security.SymmetricEncryption
{
public int BlockSizeInBytes { get; }
public string CipherEngine { get; }
public BlockCipherEngines CipherEngine { get; }
public BlockCipherModes CipherMode { get; }
public LegacyRijndaelCryptographyProvider()
{
CipherEngine = "Rijndael";
BlockSizeInBytes = 16;
}