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

Little cleanup on decryption. Now uses the new key derivation class

Browse Source
This commit is contained in:
David Sparer
2016-10-13 17:23:55 -06:00
parent f6c490fc62
commit 58c4b541b0
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,6 +10,7 @@ using System;
using System.IO;
using System.Security;
using System.Text;
using mRemoteNG.Security.KeyDerivation;
using Org.BouncyCastle.Crypto;
using Org.BouncyCastle.Crypto.Engines;
using Org.BouncyCastle.Crypto.Generators;
@@ -100,26 +101,19 @@ namespace mRemoteNG.Security.SymmetricEncryption
if (secretMessage == null || secretMessage.Length == 0)
throw new ArgumentException(@"Secret Message Required!", nameof(secretMessage));
var generator = new Pkcs5S2ParametersGenerator();
//Use Random Salt to minimize pre-generated weak password attacks.
var salt = new byte[SaltBitSize / 8];
_random.NextBytes(salt);
generator.Init(
PbeParametersGenerator.Pkcs5PasswordToBytes(password.ToCharArray()),
salt,
Iterations);
var salt = GenerateSalt();
//Generate Key
var key = (KeyParameter)generator.GenerateDerivedMacParameters(KeyBitSize);
var keyDerivationFunction = new Pkcs5S2KeyGenerator(KeyBitSize, Iterations);
var key = keyDerivationFunction.DeriveKey(password, salt);
//Create Full Non Secret Payload
var payload = new byte[salt.Length + nonSecretPayload.Length];
Array.Copy(nonSecretPayload, payload, nonSecretPayload.Length);
Array.Copy(salt, 0, payload, nonSecretPayload.Length, salt.Length);
return SimpleEncrypt(secretMessage, key.GetKey(), payload);
return SimpleEncrypt(secretMessage, key, payload);
}
private byte[] SimpleEncrypt(byte[] secretMessage, byte[] key, byte[] nonSecretPayload = null)
@@ -243,5 +237,12 @@ namespace mRemoteNG.Security.SymmetricEncryption
return plainText;
}
}
private byte[] GenerateSalt()
{
var salt = new byte[SaltBitSize / 8];
_random.NextBytes(salt);
return salt;
}
}
}