Skip to content

SymmetricBlock encryption for files implementation #681

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 9, 2022
Merged

SymmetricBlock encryption for files implementation #681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
204 changes: 180 additions & 24 deletions .../SecurityAPI/dotnet/dotnetframework/GeneXusCryptography/Symmetric/SymmetricBlockCipher.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
using GeneXusCryptography.SymmetricUtils;
using SecurityAPICommons.Config;
using SecurityAPICommons.Utils;
using System.IO;

namespace GeneXusCryptography.Symmetric
{
Expand Down Expand Up @@ -67,7 +68,7 @@ public string DoAEADEncrypt(string symmetricBlockAlgorithm, string symmetricBloc
if (eu.HasError()) { this.error = eu.GetError(); }
if (this.HasError()) { return ""; }

byte[] encryptedBytes = setUp(symmetricBlockAlgorithm, symmetricBlockMode, null, nonce, key, txtBytes, macSize, true, true);
byte[] encryptedBytes = SetUp(symmetricBlockAlgorithm, symmetricBlockMode, null, nonce, key, txtBytes, macSize, true, true, false, null, null);
if (this.HasError()) { return ""; }

return Base64.ToBase64String(encryptedBytes);
Expand Down Expand Up @@ -108,7 +109,7 @@ public string DoAEADDecrypt(string symmetricBlockAlgorithm, string symmetricBloc
return "";
}

byte[] decryptedBytes = setUp(symmetricBlockAlgorithm, symmetricBlockMode, null, nonce, key, input, macSize, false, true);
byte[] decryptedBytes = SetUp(symmetricBlockAlgorithm, symmetricBlockMode, null, nonce, key, input, macSize, false, true, false, null, null);
if (this.HasError()) { return ""; }

EncodingUtil eu = new EncodingUtil();
Expand Down Expand Up @@ -155,7 +156,7 @@ public string DoEncrypt(string symmetricBlockAlgorithm, string symmetricBlockMod
return "";
}

byte[] encryptedBytes = setUp(symmetricBlockAlgorithm, symmetricBlockMode, symmetricBlockPadding, IV, key, inputBytes, 0, true, false);
byte[] encryptedBytes = SetUp(symmetricBlockAlgorithm, symmetricBlockMode, symmetricBlockPadding, IV, key, inputBytes, 0, true, false, false, null, null);
if (this.HasError()) { return ""; }

return Base64.ToBase64String(encryptedBytes);
Expand Down Expand Up @@ -197,7 +198,7 @@ public string DoDecrypt(string symmetricBlockAlgorithm, string symmetricBlockMod
return "";
}

byte[] decryptedBytes = setUp(symmetricBlockAlgorithm, symmetricBlockMode, symmetricBlockPadding, IV, key, input, 0, false, false);
byte[] decryptedBytes = SetUp(symmetricBlockAlgorithm, symmetricBlockMode, symmetricBlockPadding, IV, key, input, 0, false, false, false, null, null);
if (this.HasError()) { return ""; }

EncodingUtil eu = new EncodingUtil();
Expand All @@ -210,6 +211,75 @@ public string DoDecrypt(string symmetricBlockAlgorithm, string symmetricBlockMod
return result.Trim();
}

[SecuritySafeCritical]
public bool DoAEADEncryptFile(String symmetricBlockAlgorithm, String symmetricBlockMode, String key, int macSize,
String nonce, String pathInputFile, String pathOutputFile)
{
this.error.cleanError();

/*******INPUT VERIFICATION - BEGIN*******/
SecurityUtils.validateStringInput("symmetricBlockAlgorithm", symmetricBlockAlgorithm, this.error);
SecurityUtils.validateStringInput("symmetricBlockMode", symmetricBlockMode, this.error);
SecurityUtils.validateStringInput("key", key, this.error);
SecurityUtils.validateStringInput("nonce", nonce, this.error);
if (this.HasError()) { return false; };
/*******INPUT VERIFICATION - END*******/

return SetUpFile(symmetricBlockAlgorithm, symmetricBlockMode, null, nonce, key, pathInputFile, pathOutputFile, macSize, true, true);
}

[SecuritySafeCritical]
public bool DoAEADDecryptFile(String symmetricBlockAlgorithm, String symmetricBlockMode, String key, int macSize,
String nonce, String pathInputFile, String pathOutputFile)
{
this.error.cleanError();

/*******INPUT VERIFICATION - BEGIN*******/
SecurityUtils.validateStringInput("symmetricBlockAlgorithm", symmetricBlockAlgorithm, this.error);
SecurityUtils.validateStringInput("symmetricBlockMode", symmetricBlockMode, this.error);
SecurityUtils.validateStringInput("key", key, this.error);
SecurityUtils.validateStringInput("nonce", nonce, this.error);
if (this.HasError()) { return false; };
/*******INPUT VERIFICATION - END*******/

return SetUpFile(symmetricBlockAlgorithm, symmetricBlockMode, null, nonce, key, pathInputFile, pathOutputFile, macSize, false, true);
}

[SecuritySafeCritical]
public bool DoEncryptFile(String symmetricBlockAlgorithm, String symmetricBlockMode, String symmetricBlockPadding,
String key, String IV, String pathInputFile, String pathOutputFile)
{
this.error.cleanError();

/*******INPUT VERIFICATION - BEGIN*******/
SecurityUtils.validateStringInput("symmetricBlockAlgorithm", symmetricBlockAlgorithm, this.error);
SecurityUtils.validateStringInput("symmetricBlockMode", symmetricBlockMode, this.error);
SecurityUtils.validateStringInput("symmetricBlockPadding", symmetricBlockPadding, this.error);
SecurityUtils.validateStringInput("key", key, this.error);
SecurityUtils.validateStringInput("IV", IV, this.error);
if (this.HasError()) { return false; };
/*******INPUT VERIFICATION - END*******/

return SetUpFile(symmetricBlockAlgorithm, symmetricBlockMode, symmetricBlockPadding, IV, key, pathInputFile, pathOutputFile, 0, true, false);
}

[SecuritySafeCritical]
public bool DoDecryptFile(String symmetricBlockAlgorithm, String symmetricBlockMode, String symmetricBlockPadding,
String key, String IV, String pathInputFile, String pathOutputFile)
{
this.error.cleanError();
/*******INPUT VERIFICATION - BEGIN*******/
SecurityUtils.validateStringInput("symmetricBlockAlgorithm", symmetricBlockAlgorithm, this.error);
SecurityUtils.validateStringInput("symmetricBlockMode", symmetricBlockMode, this.error);
SecurityUtils.validateStringInput("symmetricBlockPadding", symmetricBlockPadding, this.error);
SecurityUtils.validateStringInput("key", key, this.error);
SecurityUtils.validateStringInput("IV", IV, this.error);
if (this.HasError()) { return false; };
/*******INPUT VERIFICATION - END*******/

return SetUpFile(symmetricBlockAlgorithm, symmetricBlockMode, symmetricBlockPadding, IV, key, pathInputFile, pathOutputFile, 0, false, false);
}


/********EXTERNAL OBJECT PUBLIC METHODS - END ********/

Expand Down Expand Up @@ -491,7 +561,7 @@ private IBlockCipher getCipherMode(IBlockCipher blockCipher, SymmetricBlockMode
return bc;
}

private byte[] setUp(string symmetricBlockAlgorithm, string symmetricBlockMode, string symmetricBlockPadding, string nonce, string key, byte[] input, int macSize, bool toEncrypt, bool isAEAD)
private byte[] SetUp(string symmetricBlockAlgorithm, string symmetricBlockMode, string symmetricBlockPadding, string nonce, string key, byte[] input, int macSize, bool toEncrypt, bool isAEAD, bool isFile, string pathInput, string pathOutput)
{
SymmetricBlockAlgorithm algorithm = SymmetricBlockAlgorithmUtils.getSymmetricBlockAlgorithm(symmetricBlockAlgorithm,
this.error);
Expand All @@ -508,12 +578,12 @@ private byte[] setUp(string symmetricBlockAlgorithm, string symmetricBlockMode,

if (this.HasError()) { return null; }

return isAEAD ? encryptAEAD(algorithm, mode, keyBytes, nonceBytes, input, macSize, toEncrypt) : encrypt(algorithm, mode, padding, keyBytes, nonceBytes, input, toEncrypt);
return isAEAD ? encryptAEAD(algorithm, mode, keyBytes, nonceBytes, input, macSize, toEncrypt, isFile, pathInput, pathOutput) : encrypt(algorithm, mode, padding, keyBytes, nonceBytes, input, toEncrypt, isFile, pathInput, pathOutput);

}


private byte[] encryptAEAD(SymmetricBlockAlgorithm algorithm, SymmetricBlockMode mode, byte[] key, byte[] nonce, byte[] txt, int macSize, bool toEncrypt)
private byte[] encryptAEAD(SymmetricBlockAlgorithm algorithm, SymmetricBlockMode mode, byte[] key, byte[] nonce, byte[] txt, int macSize, bool toEncrypt, bool isFile, string pathInput, string pathOutput)
{
IBlockCipher engine = getCipherEngine(algorithm);
IAeadBlockCipher bbc = getAEADCipherMode(engine, mode);
Expand All @@ -531,25 +601,61 @@ private byte[] encryptAEAD(SymmetricBlockAlgorithm algorithm, SymmetricBlockMode
this.error.setError("SB007", e.Message);
return null;
}

byte[] outputBytes = new byte[bbc.GetOutputSize(txt.Length)];
try
byte[] outputBytes = null;
if (isFile)
{

int length = bbc.ProcessBytes(txt, 0, txt.Length, outputBytes, 0);
bbc.DoFinal(outputBytes, length);
try
{
byte[] inBuffer = new byte[1024];
byte[] outBuffer = new byte[bbc.GetOutputSize(1024)];
outBuffer = new byte[bbc.GetBlockSize() + bbc.GetOutputSize(inBuffer.Length)];
int inCount = 0;
int outCount = 0;
using (FileStream inputStream = new FileStream(pathInput, FileMode.Open, FileAccess.Read))
{
using (FileStream outputStream = new FileStream(pathOutput, FileMode.Create, FileAccess.Write))
{
while ((inCount = inputStream.Read(inBuffer, 0, inBuffer.Length)) > 0)
{
outCount = bbc.ProcessBytes(inBuffer, 0, inCount, outBuffer, 0);
outputStream.Write(outBuffer, 0, outCount);
}
outCount = bbc.DoFinal(outBuffer, 0);

outputStream.Write(outBuffer, 0, outCount);
}
}
}
catch (Exception e)
{
this.error.setError("SB011", e.Message);
return null;
}
outputBytes = new byte[1];
}
catch (Exception e)
else
{
this.error.setError("SB008", e.Message);
return null;
outputBytes = new byte[bbc.GetOutputSize(txt.Length)];
try
{

int length = bbc.ProcessBytes(txt, 0, txt.Length, outputBytes, 0);
bbc.DoFinal(outputBytes, length);
}
catch (Exception e)
{
this.error.setError("SB008", e.Message);
return null;
}

}
return outputBytes;

}



private byte[] encrypt(SymmetricBlockAlgorithm algorithm, SymmetricBlockMode mode, SymmetricBlockPadding padding, byte[] key, byte[] iv, byte[] input, bool toEncrypt)
private byte[] encrypt(SymmetricBlockAlgorithm algorithm, SymmetricBlockMode mode, SymmetricBlockPadding padding, byte[] key, byte[] iv, byte[] input, bool toEncrypt, bool isFile, string pathInput, string pathOutput)
{

BufferedBlockCipher bbc = getCipher(algorithm, mode, padding);
Expand All @@ -573,19 +679,69 @@ private byte[] encrypt(SymmetricBlockAlgorithm algorithm, SymmetricBlockMode mod
this.error.setError("SB009", e.Message);
return null;
}
byte[] outputBytes = new byte[bbc.GetOutputSize(input.Length)];
try
byte[] outputBytes = null;
if (isFile)
{
int length = bbc.ProcessBytes(input, 0, input.Length, outputBytes, 0);
bbc.DoFinal(outputBytes, length);
try
{
byte[] inBuffer = new byte[1024];
byte[] outBuffer = new byte[bbc.GetOutputSize(1024)];
outBuffer = new byte[bbc.GetBlockSize() + bbc.GetOutputSize(inBuffer.Length)];
int inCount = 0;
int outCount = 0;
using (FileStream inputStream = new FileStream(pathInput, FileMode.Open, FileAccess.Read))
{
using (FileStream outputStream = new FileStream(pathOutput, FileMode.Create, FileAccess.Write))
{
while ((inCount = inputStream.Read(inBuffer, 0, inBuffer.Length)) > 0)
{
outCount = bbc.ProcessBytes(inBuffer, 0, inCount, outBuffer, 0);
outputStream.Write(outBuffer, 0, outCount);
}
outCount = bbc.DoFinal(outBuffer, 0);

outputStream.Write(outBuffer, 0, outCount);
}
}
}
catch (Exception e)
{
this.error.setError("SB012", e.Message);
return null;
}
outputBytes = new byte[1];

}
catch (Exception e)
else
{
this.error.setError("SB010", e.Message);
return null;
outputBytes = new byte[bbc.GetOutputSize(input.Length)];
try
{

int length = bbc.ProcessBytes(input, 0, input.Length, outputBytes, 0);
int length2 = bbc.DoFinal(outputBytes, length);

}
catch (Exception e)
{
this.error.setError("SB010", e.Message);
return null;
}
}
return outputBytes;
}



private bool SetUpFile(string symmetricBlockAlgorithm, string symmetricBlockMode, string symmetricBlockPadding, string nonce, string key, string pathInput, string pathOutput, int macSize, bool toEncrypt, bool isAEAD)
{
/*******INPUT VERIFICATION - BEGIN*******/
SecurityUtils.validateStringInput("pathInputFile", pathInput, this.error);
SecurityUtils.validateStringInput("pathOutputFile", pathOutput, this.error);
if (this.HasError()) { return false; };
/*******INPUT VERIFICATION - END*******/
byte[] output = SetUp(symmetricBlockAlgorithm, symmetricBlockMode, symmetricBlockPadding, nonce, key, null, macSize, toEncrypt, isAEAD, true, pathInput, pathOutput);
return output == null ? false : true;
}
}
}
1 change: 1 addition & 0 deletions ...tensions/SecurityAPI/test/dotnetcore/SecurityAPITestNetCore/SecurityAPITestNetCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
<Compile Include="..\..\dotnetframework\SecurityAPITest\Cryptography\Mac\TestHmac.cs" Link="Cryptography\Mac\TestHmac.cs" />
<Compile Include="..\..\dotnetframework\SecurityAPITest\Cryptography\PasswordDerivation\TestPasswordDerivation.cs" Link="Cryptography\PasswordDerivation\TestPasswordDerivation.cs" />
<Compile Include="..\..\dotnetframework\SecurityAPITest\Cryptography\Symmetric\TestBlockEncryption.cs" Link="Cryptography\Symmetric\TestBlockEncryption.cs" />
<Compile Include="..\..\dotnetframework\SecurityAPITest\Cryptography\Symmetric\TestBlockEncryptionFiles.cs" Link="Cryptography\Symmetric\TestBlockEncryptionFiles.cs" />
<Compile Include="..\..\dotnetframework\SecurityAPITest\Cryptography\Symmetric\TestStreamEncryption.cs" Link="Cryptography\Symmetric\TestStreamEncryption.cs" />
<Compile Include="..\..\dotnetframework\SecurityAPITest\Cryptography\Symmetric\TestSymmetricDomainSpaces.cs" Link="Cryptography\Symmetric\TestSymmetricDomainSpaces.cs" />
<Compile Include="..\..\dotnetframework\SecurityAPITest\Ftps\TestFtps.cs" Link="Ftps\TestFtps.cs" />
Expand Down
2 changes: 1 addition & 1 deletion ...ityAPI/test/dotnetframework/SecurityAPITest/Cryptography/Symmetric/TestBlockEncryption.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ protected virtual void SetUp()
arrayTagsCCM = new int[] { 64, 128 };
arrayMacsEAX = new int[] { 8, 16, 64, 128 };
arrayNonces = new string[] { IV64, IV128, IV192, IV256 };
arrayModes_160_224 = new string[] { "ECB"/*, "CBC", "CTR", "CTS", "OPENPGPCFB" */}; //CFB mode does not work on 160 and 224 block sizes
arrayModes_160_224 = new string[] { "ECB", "CBC", "CTR", "CTS", "OPENPGPCFB" }; //CFB mode does not work on 160 and 224 block sizes

encodings = new string[] { "UTF_8", "UTF_16", "UTF_16BE", "UTF_16LE", "UTF_32", "UTF_32BE", "UTF_32LE", "SJIS",
"GB2312" };
Expand Down
Loading