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

Fixed a small issue with the CCM mode nonce size

Browse Source
This commit is contained in:
David Sparer
2016-10-10 14:48:32 -06:00
parent 963b483697
commit 333ee232ae
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,14 +26,15 @@ namespace mRemoteNG.Security.SymmetricEncryption
private readonly SecureRandom _random = new SecureRandom();
//Preconfigured Encryption Parameters
private readonly int NonceBitSize = 128;
private readonly int MacBitSize = 128;
private readonly int KeyBitSize = 256;
protected virtual int NonceBitSize { get; set; } = 128;
protected virtual int MacBitSize { get; set; } = 128;
protected virtual int KeyBitSize { get; set; } = 256;
//Preconfigured Password Key Derivation Parameters
private readonly int SaltBitSize = 128;
private readonly int Iterations = 10000;
private readonly int MinPasswordLength = 12;
protected virtual int SaltBitSize { get; set; } = 128;
protected virtual int Iterations { get; set; } = 10000;
protected virtual int MinPasswordLength { get; set; } = 1;
public int BlockSizeInBytes => _aeadBlockCipher.GetBlockSize();
@@ -55,14 +56,22 @@ namespace mRemoteNG.Security.SymmetricEncryption
{
_aeadBlockCipher = aeadBlockCipher;
_encoding = Encoding.UTF8;
SetNonceForCcm();
}
public AeadCryptographyProvider(IAeadBlockCipher aeadBlockCipher, Encoding encoding)
{
_aeadBlockCipher = aeadBlockCipher;
_encoding = encoding;
SetNonceForCcm();
}
private void SetNonceForCcm()
{
var ccm = _aeadBlockCipher as CcmBlockCipher;
if (ccm != null)
NonceBitSize = 104;
}
public string Encrypt(string plainText, SecureString encryptionKey)
{
@@ -73,7 +82,7 @@ namespace mRemoteNG.Security.SymmetricEncryption
private string SimpleEncryptWithPassword(string secretMessage, string password, byte[] nonSecretPayload = null)
{
if (string.IsNullOrEmpty(secretMessage))
throw new ArgumentException(@"Secret Message Required!", nameof(secretMessage));
return ""; //throw new ArgumentException(@"Secret Message Required!", nameof(secretMessage));
var plainText = _encoding.GetBytes(secretMessage);
var cipherText = SimpleEncryptWithPassword(plainText, password, nonSecretPayload);