Merge pull request #35 from mattosaurus/development

Aysnc updates and large file handling
mattosaurus · Aug 28, 2019 · 0ff8aab · 0ff8aab
2 parents dc7f769 + 5f015c8
commit 0ff8aab
Show file tree

Hide file tree

Showing 6 changed files with 320 additions and 120 deletions.
diff --git a/PgpCore.Tests/PgpCore.Tests.csproj b/PgpCore.Tests/PgpCore.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
@@ -7,9 +7,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
-    <PackageReference Include="xunit" Version="2.4.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/PgpCore.Tests/UnitTests.cs b/PgpCore.Tests/UnitTests.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Security.Cryptography;
 using Org.BouncyCastle.Bcpg.OpenPgp;
 using Xunit;
 
@@ -924,14 +925,16 @@ private void CreateRandomFile(string filePath, int sizeInMb)
             const int blocksPerMb = (1024 * 1024) / blockSize;
 
             byte[] data = new byte[blockSize];
-            Random rng = new Random();
-            using (FileStream stream = File.OpenWrite(filePath))
+
+            using (RNGCryptoServiceProvider crypto = new RNGCryptoServiceProvider())
             {
-                // There 
-                for (int i = 0; i < sizeInMb * blocksPerMb; i++)
+                using (FileStream stream = File.OpenWrite(filePath))
                 {
-                    rng.NextBytes(data);
-                    stream.Write(data, 0, data.Length);
+                    for (int i = 0; i < sizeInMb * blocksPerMb; i++)
+                    {
+                        crypto.GetBytes(data);
+                        stream.Write(data, 0, data.Length);
+                    }
                 }
             }
         }