error handling

PandaTechAM · Oct 31, 2023 · dda55f4 · dda55f4
1 parent eb082a6
commit dda55f4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/Pandatech.Crypto.Tests/Argon2IdTests.cs b/Pandatech.Crypto.Tests/Argon2IdTests.cs
@@ -5,7 +5,7 @@ public class Argon2IdTests
     [Fact]
     public void HashVerify_ShouldFailForDifferentArgonConfigs()
     {
-        var argon2Id = new Argon2Id(new Argon2IdOptions());
+        var argon2Id = new Argon2Id();
         var argon2Id2 = new Argon2Id(new Argon2IdOptions { SaltSize = 16, MemorySize = 128, DegreeOfParallelism = 1, Iterations = 1 });
         var password = RandomPassword.Generate(32, true, true, true, true);
         var hash = argon2Id.HashPassword(password);
@@ -15,7 +15,7 @@ public void HashVerify_ShouldFailForDifferentArgonConfigs()
     [Fact]
     public void HashVerify_ShouldBeValid()
     {
-        var argon2Id = new Argon2Id(new Argon2IdOptions());
+        var argon2Id = new Argon2Id();
 
         var password = RandomPassword.Generate(32, true, true, true, true);
         var hash = argon2Id.HashPassword(password);
@@ -26,15 +26,16 @@ public void HashVerify_ShouldBeValid()
     [Fact]
     public void HashVerify_InvalidPassword_ShouldBeInvalid()
     {
-        var argon2Id = new Argon2Id(new Argon2IdOptions());
+        var argon2Id = new Argon2Id();
         var password = RandomPassword.Generate(32, true, true, true, true);
         var hash = argon2Id.HashPassword(password);
+        Assert.False(argon2Id.VerifyHash("SomePassword", hash));
     }
 
     [Fact]
     public void DifferentPasswords_ShouldHaveDifferentHashes()
     {
-        var argon2Id = new Argon2Id(new Argon2IdOptions());
+        var argon2Id = new Argon2Id();
         var password1 = RandomPassword.Generate(32, true, true, true, true);
         var password2 = RandomPassword.Generate(32, true, true, true, true);
         var hash1 = argon2Id.HashPassword(password1);
@@ -46,14 +47,14 @@ public void DifferentPasswords_ShouldHaveDifferentHashes()
     [Fact]
     public void HashPassword_EmptyPassword_ShouldThrowException()
     {
-        var argon2Id = new Argon2Id(new Argon2IdOptions());
+        var argon2Id = new Argon2Id();
         Assert.Throws<ArgumentException>(() => argon2Id.HashPassword(""));
     }
 
     [Fact]
     public void VerifyHash_NullHash_ShouldThrowException()
     {
-        var argon2Id = new Argon2Id(new Argon2IdOptions());
+        var argon2Id = new Argon2Id();
         Assert.Throws<ArgumentException>(() => argon2Id.VerifyHash("password", null!));
     }
 }
diff --git a/Pandatech.Crypto/Argon2Id.cs b/Pandatech.Crypto/Argon2Id.cs
@@ -6,11 +6,11 @@ namespace Pandatech.Crypto;
 public class Argon2Id
 {
     private readonly Argon2IdOptions _options;
+
     public Argon2Id(Argon2IdOptions options)
     {
         _options = options;
     }
-
     public Argon2Id()
     {
         _options = new Argon2IdOptions();
@@ -25,6 +25,7 @@ public byte[] HashPassword(string password)
         {
             throw new ArgumentException("Password cannot be null or empty.", nameof(password));
         }
+
         var salt = Random.GenerateBytes(_options.SaltSize);
         return HashPassword(password, salt);
     }
@@ -50,7 +51,7 @@ public bool VerifyHash(string password, byte[] hash)
         {
             throw new ArgumentException($"Hash must be at least {SaltSize} bytes.", nameof(hash));
         }
-        
+
         var salt = hash.Take(_options.SaltSize).ToArray();
 
         var newHash = HashPassword(password, salt);

diff --git a/Pandatech.Crypto/Pandatech.Crypto.csproj b/Pandatech.Crypto/Pandatech.Crypto.csproj
@@ -4,7 +4,7 @@
         <TargetFramework>net7.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-        <Version>2.1.0</Version>
+        <Version>2.1.1</Version>
         <Title>Pandatech.Crypto</Title>
         <Authors>Pandatech</Authors>
         <PackageIcon>pandatech.png</PackageIcon>
@@ -26,7 +26,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="BouncyCastle.NetCore" Version="2.2.2" />
+      <PackageReference Include="BouncyCastle.NetCore" Version="2.2.1" />
       <PackageReference Include="Konscious.Security.Cryptography.Argon2" Version="1.3.0" />
       <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
     </ItemGroup>