- updated newtonsofttags/3.0.0
@@ -168,7 +168,7 @@ namespace ServerMaint | |||
byte[] keyBytes = Encoding.UTF8.GetBytes(upload.Key); | |||
byte[] ivBytes = Encoding.UTF8.GetBytes(upload.IV); | |||
FileStream fs = new FileStream(filePath, FileMode.Open, FileAccess.Read); | |||
AESCryptoStream aesStream = new AESCryptoStream(fs, false, keyBytes, ivBytes, "CTR", "NoPadding"); | |||
AESCryptoStream aesStream = new AESCryptoStream(fs, false, keyBytes, ivBytes, "CTR", "NoPadding", 0); | |||
// We have the data, let's scan it | |||
ClamScanResult scanResult = clam.SendAndScanFile(aesStream); |
@@ -80,8 +80,8 @@ | |||
<HintPath>..\packages\nClam.2.0.6.0\lib\net40-Client\nClam.dll</HintPath> | |||
<Private>True</Private> | |||
</Reference> | |||
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> | |||
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath> | |||
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> | |||
<HintPath>..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath> | |||
<Private>True</Private> | |||
</Reference> | |||
<Reference Include="SecurityDriven.Inferno, Version=1.4.0.0, Culture=neutral, processorArchitecture=MSIL"> | |||
@@ -117,7 +117,9 @@ | |||
</ProjectReference> | |||
</ItemGroup> | |||
<ItemGroup> | |||
<None Include="app.config" /> | |||
<None Include="app.config"> | |||
<SubType>Designer</SubType> | |||
</None> | |||
<None Include="packages.config" /> | |||
</ItemGroup> | |||
<ItemGroup> |
@@ -26,7 +26,7 @@ | |||
</dependentAssembly> | |||
<dependentAssembly> | |||
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" /> | |||
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" /> | |||
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" /> | |||
</dependentAssembly> | |||
<dependentAssembly> | |||
<assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" /> |
@@ -8,5 +8,5 @@ | |||
<package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net452" /> | |||
<package id="Microsoft.AspNet.Identity.EntityFramework" version="2.2.1" targetFramework="net452" /> | |||
<package id="nClam" version="2.0.6.0" targetFramework="net462" /> | |||
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net452" /> | |||
<package id="Newtonsoft.Json" version="10.0.2" targetFramework="net462" /> | |||
</packages> |
@@ -292,9 +292,12 @@ namespace Teknik.Areas.Upload.Controllers | |||
byte[] keyBytes = Encoding.UTF8.GetBytes(key); | |||
byte[] ivBytes = Encoding.UTF8.GetBytes(iv); | |||
// Calculate the block offset needed for the counter | |||
int counterOffset = (int)Math.Floor(startByte / 16.0); | |||
return new FileGenerateResult(url, | |||
contentType, | |||
(response) => ResponseHelper.StreamToOutput(response, true, new AESCryptoStream(fs, false, keyBytes, ivBytes, "CTR", "NoPadding"), (int)length, Config.UploadConfig.ChunkSize), | |||
(response) => ResponseHelper.StreamToOutput(response, true, new AESCryptoStream(fs, false, keyBytes, ivBytes, "CTR", "NoPadding", counterOffset), (int)length, Config.UploadConfig.ChunkSize), | |||
false); | |||
} | |||
else // Otherwise just send it |
@@ -10,7 +10,7 @@ using System.Runtime.InteropServices; | |||
[assembly: AssemblyConfiguration("")] | |||
[assembly: AssemblyCompany("Teknik")] | |||
[assembly: AssemblyProduct("Teknik")] | |||
[assembly: AssemblyCopyright("Copyright © 2015 - 2016")] | |||
[assembly: AssemblyCopyright("Copyright © 2015 - 2017")] | |||
[assembly: AssemblyTrademark("")] | |||
[assembly: AssemblyCulture("")] | |||
@@ -116,7 +116,7 @@ | |||
<Private>True</Private> | |||
</Reference> | |||
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> | |||
<HintPath>..\packages\Newtonsoft.Json.10.0.1\lib\net45\Newtonsoft.Json.dll</HintPath> | |||
<HintPath>..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath> | |||
<Private>True</Private> | |||
</Reference> | |||
<Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL"> | |||
@@ -843,7 +843,7 @@ | |||
<AutoAssignPort>True</AutoAssignPort> | |||
<DevelopmentServerPort>65244</DevelopmentServerPort> | |||
<DevelopmentServerVPath>/</DevelopmentServerVPath> | |||
<IISUrl>https://localhost:44300/</IISUrl> | |||
<IISUrl>https://localhost:52300/</IISUrl> | |||
<NTLMAuthentication>False</NTLMAuthentication> | |||
<UseCustomServer>False</UseCustomServer> | |||
<CustomServerUrl> |
@@ -35,7 +35,7 @@ | |||
<package id="MySql.Data" version="6.9.9" targetFramework="net452" /> | |||
<package id="NBitcoin" version="3.0.2.10" targetFramework="net462" /> | |||
<package id="nClam" version="2.0.6.0" targetFramework="net462" /> | |||
<package id="Newtonsoft.Json" version="10.0.1" targetFramework="net462" userInstalled="true" /> | |||
<package id="Newtonsoft.Json" version="10.0.2" targetFramework="net462" userInstalled="true" /> | |||
<package id="Owin" version="1.0" targetFramework="net462" /> | |||
<package id="Piwik.Tracker" version="2.16.0.0" targetFramework="net452" /> | |||
<package id="QRCoder" version="1.2.3" targetFramework="net462" /> |
@@ -32,8 +32,8 @@ | |||
<WarningLevel>4</WarningLevel> | |||
</PropertyGroup> | |||
<ItemGroup> | |||
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> | |||
<HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath> | |||
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> | |||
<HintPath>..\..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath> | |||
<Private>True</Private> | |||
</Reference> | |||
<Reference Include="System" /> | |||
@@ -74,7 +74,9 @@ | |||
</ProjectReference> | |||
</ItemGroup> | |||
<ItemGroup> | |||
<None Include="app.config" /> | |||
<None Include="app.config"> | |||
<SubType>Designer</SubType> | |||
</None> | |||
<None Include="packages.config" /> | |||
</ItemGroup> | |||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> |
@@ -12,7 +12,7 @@ | |||
</dependentAssembly> | |||
<dependentAssembly> | |||
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" /> | |||
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" /> | |||
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" /> | |||
</dependentAssembly> | |||
</assemblyBinding> | |||
</runtime> |
@@ -1,5 +1,5 @@ | |||
<?xml version="1.0" encoding="utf-8"?> | |||
<packages> | |||
<package id="GitVersionTask" version="3.6.5" targetFramework="net462" developmentDependency="true" /> | |||
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net462" /> | |||
<package id="Newtonsoft.Json" version="10.0.2" targetFramework="net462" /> | |||
</packages> |
@@ -49,6 +49,7 @@ | |||
<Compile Include="Properties\AssemblyInfo.cs" /> | |||
</ItemGroup> | |||
<ItemGroup> | |||
<None Include="app.config" /> | |||
<None Include="packages.config" /> | |||
</ItemGroup> | |||
<ItemGroup> |
@@ -0,0 +1,19 @@ | |||
<?xml version="1.0" encoding="utf-8"?> | |||
<configuration> | |||
<runtime> | |||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> | |||
<dependentAssembly> | |||
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" /> | |||
<bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930" /> | |||
</dependentAssembly> | |||
<dependentAssembly> | |||
<assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral" /> | |||
<bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" /> | |||
</dependentAssembly> | |||
<dependentAssembly> | |||
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" /> | |||
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" /> | |||
</dependentAssembly> | |||
</assemblyBinding> | |||
</runtime> | |||
</configuration> |
@@ -12,7 +12,7 @@ | |||
</dependentAssembly> | |||
<dependentAssembly> | |||
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" /> | |||
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" /> | |||
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" /> | |||
</dependentAssembly> | |||
</assemblyBinding> | |||
</runtime> |
@@ -271,14 +271,14 @@ namespace Teknik.Utilities | |||
public static int ProcessCipherBlock(IBufferedCipher cipher, Stream input, int inputOffset, int chunkSize, byte[] output, int outputOffset, out int bytesRead) | |||
{ | |||
// Initialize buffer | |||
byte[] buffer = new byte[chunkSize + inputOffset]; | |||
byte[] buffer = new byte[chunkSize]; | |||
// Read the next block of data | |||
bytesRead = input.Read(buffer, 0, chunkSize + inputOffset); | |||
bytesRead = input.Read(buffer, 0, chunkSize); | |||
if (bytesRead > 0) | |||
{ | |||
// process the cipher for the read block and add it to the output | |||
return cipher.ProcessBytes(buffer, inputOffset, bytesRead - inputOffset, output, outputOffset); | |||
return cipher.ProcessBytes(buffer, inputOffset, bytesRead, output, outputOffset); | |||
} | |||
return 0; |
@@ -77,82 +77,5 @@ namespace Teknik.Utilities | |||
} | |||
} | |||
} | |||
public static void DecryptStreamToOutput(HttpResponseBase response, bool flush, Stream stream, int length, byte[] key, byte[] iv, string mode, string padding, int chunkSize) | |||
{ | |||
try | |||
{ | |||
if (flush) | |||
{ | |||
response.Flush(); | |||
} | |||
IBufferedCipher cipher = AES.CreateCipher(false, key, iv, mode, padding); | |||
int curByte = 0; | |||
int processedBytes = 0; | |||
byte[] buffer = new byte[chunkSize]; | |||
int bytesRemaining = length; | |||
int bytesToRead = chunkSize; | |||
int bytesRead = 0; | |||
do | |||
{ | |||
if (chunkSize > bytesRemaining) | |||
{ | |||
bytesToRead = bytesRemaining; | |||
} | |||
processedBytes = AES.ProcessCipherBlock(cipher, stream, 0, bytesToRead, buffer, 0, out bytesRead); | |||
if (processedBytes > 0) | |||
{ | |||
response.OutputStream.Write(buffer, 0, processedBytes); | |||
if (flush) | |||
{ | |||
response.Flush(); | |||
} | |||
// Clear the buffer | |||
Array.Clear(buffer, 0, chunkSize); | |||
} | |||
curByte += bytesRead; | |||
bytesRemaining -= bytesRead; | |||
} | |||
while (bytesRemaining > 0); | |||
// Clear the buffer | |||
Array.Clear(buffer, 0, chunkSize); | |||
// Finalize processing of the cipher | |||
processedBytes = AES.FinalizeCipherBlock(cipher, buffer, 0); | |||
if (processedBytes > 0) | |||
{ | |||
// We have bytes, lets write them to the output | |||
response.OutputStream.Write(buffer, 0, processedBytes); | |||
if (flush) | |||
{ | |||
response.Flush(); | |||
} | |||
} | |||
} | |||
catch (HttpException httpEx) | |||
{ | |||
// If we lost connection, that's fine | |||
if (httpEx.ErrorCode == -2147023667) | |||
{ | |||
// do nothing | |||
} | |||
else | |||
{ | |||
//throw httpEx; | |||
} | |||
} | |||
catch (Exception ex) | |||
{ | |||
throw ex; | |||
} | |||
finally | |||
{ | |||
// dispose of file stream | |||
stream.Dispose(); | |||
} | |||
} | |||
} | |||
} |
@@ -13,10 +13,19 @@ namespace Teknik.Utilities | |||
private Stream _Inner; | |||
private IBufferedCipher _Cipher; | |||
public AESCryptoStream(Stream stream, bool encrypt, byte[] key, byte[] iv, string mode, string padding) | |||
public AESCryptoStream(Stream stream, bool encrypt, byte[] key, byte[] iv, string mode, string padding, int initCounter) | |||
{ | |||
_Inner = stream; | |||
_Cipher = AES.CreateCipher(encrypt, key, iv, mode, padding); | |||
// Pre-process the cipher to increase the counts | |||
// There has to be a better way of doing this... | |||
byte[] buf = new byte[16]; | |||
for (int i = 0; i < initCounter; i++) | |||
{ | |||
_Cipher.ProcessBytes(buf); | |||
} | |||
_Cipher.DoFinal(); | |||
} | |||
public override int Read(byte[] buffer, int offset, int count) | |||
@@ -32,14 +41,14 @@ namespace Teknik.Utilities | |||
if (blockOffset != 0) | |||
{ | |||
// We are not a multiple of the block size, so let's backup to get the current block | |||
_Inner.Seek(startPosition - blockOffset, SeekOrigin.Begin); | |||
//_Inner.Seek(startPosition - blockOffset, SeekOrigin.Begin); | |||
} | |||
// Process the cipher | |||
int processed = AES.ProcessCipherBlock(_Cipher, _Inner, 0, count + (int)blockOffset, buffer, offset, out bytesRead); | |||
int processed = AES.ProcessCipherBlock(_Cipher, _Inner, 0, count, buffer, offset, out bytesRead); | |||
// Adjust bytes read by the block offset | |||
bytesRead -= (int)blockOffset; | |||
//bytesRead -= (int)blockOffset; | |||
if (processed < bytesRead) | |||
{ |
@@ -52,8 +52,8 @@ | |||
<HintPath>..\..\packages\MySql.Data.6.9.9\lib\net45\MySql.Data.dll</HintPath> | |||
<Private>True</Private> | |||
</Reference> | |||
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> | |||
<HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath> | |||
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> | |||
<HintPath>..\..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath> | |||
<Private>True</Private> | |||
</Reference> | |||
<Reference Include="SecurityDriven.Inferno, Version=1.4.0.0, Culture=neutral, processorArchitecture=MSIL"> | |||
@@ -136,7 +136,9 @@ | |||
</Compile> | |||
</ItemGroup> | |||
<ItemGroup> | |||
<None Include="app.config" /> | |||
<None Include="app.config"> | |||
<SubType>Designer</SubType> | |||
</None> | |||
<None Include="packages.config" /> | |||
</ItemGroup> | |||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> |
@@ -12,7 +12,7 @@ | |||
</dependentAssembly> | |||
<dependentAssembly> | |||
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" /> | |||
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" /> | |||
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" /> | |||
</dependentAssembly> | |||
</assemblyBinding> | |||
</runtime> |
@@ -11,6 +11,6 @@ | |||
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net462" /> | |||
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net462" /> | |||
<package id="MySql.Data" version="6.9.9" targetFramework="net462" /> | |||
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net462" /> | |||
<package id="Newtonsoft.Json" version="10.0.2" targetFramework="net462" /> | |||
<package id="WebGrease" version="1.6.0" targetFramework="net462" /> | |||
</packages> |