Merge pull request #13 from PandaTechAM/development

overload removal
PandaTechAM · Feb 17, 2024 · 2aa2838 · 2aa2838
2 parents d771561 + 3109033
commit 2aa2838
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 28 deletions.
diff --git a/src/Pandatech.Crypto.Tests/Argon2IdTests.cs b/src/Pandatech.Crypto.Tests/Argon2IdTests.cs
@@ -23,17 +23,6 @@ public void HashVerify_ShouldBeValid()
         Assert.True(argon2Id.VerifyHash(password, hash));
     }
 
-    [Fact]
-    public void HashVerify_ShouldBeValid_2()
-    {
-        var argon2Id = new Argon2Id();
-
-        var password = Password.GenerateRandom(32, true, true, true, true);
-        var hash = argon2Id.HashPassword(password);
-
-        Assert.True(argon2Id.VerifyHash(hash, hash));
-    }
-
     [Fact]
     public void HashVerify_InvalidPassword_ShouldBeInvalid()
     {

diff --git a/src/Pandatech.Crypto/Argon2Id.cs b/src/Pandatech.Crypto/Argon2Id.cs
@@ -46,27 +46,17 @@ private byte[] HashPassword(string password, byte[] salt)
         return result;
     }
 
-    public bool VerifyHash(string password, byte[] hash)
+    public bool VerifyHash(string password, byte[] passwordHash)
     {
-        if (hash == null || hash.Length <= _options.SaltSize)
+        if (passwordHash == null || passwordHash.Length <= _options.SaltSize)
         {
-            throw new ArgumentException($"Hash must be at least {SaltSize} bytes.", nameof(hash));
+            throw new ArgumentException($"Hash must be at least {SaltSize} bytes.", nameof(passwordHash));
         }
 
-        var salt = hash.Take(_options.SaltSize).ToArray();
+        var salt = passwordHash.Take(_options.SaltSize).ToArray();
 
         var newHash = HashPassword(password, salt);
-        return ConstantTimeComparison(hash, newHash);
-    }
-
-    public bool VerifyHash(byte[] passwordHash, byte[] hash)
-    {
-        if (hash == null || hash.Length <= _options.SaltSize)
-        {
-            throw new ArgumentException($"Hash must be at least {SaltSize} bytes.", nameof(hash));
-        }
-
-        return ConstantTimeComparison(hash, passwordHash);
+        return ConstantTimeComparison(passwordHash, newHash);
     }
 
     private static bool ConstantTimeComparison(IReadOnlyList<byte> a, IReadOnlyList<byte> b)

diff --git a/src/Pandatech.Crypto/Pandatech.Crypto.csproj b/src/Pandatech.Crypto/Pandatech.Crypto.csproj
@@ -8,12 +8,12 @@
         <Copyright>MIT</Copyright>
         <PackageIcon>pandatech.png</PackageIcon>
         <PackageReadmeFile>Readme.md</PackageReadmeFile>
-        <Version>2.2.8</Version>
+        <Version>2.2.9</Version>
         <Title>Pandatech.Crypto</Title>
         <PackageTags>Pandatech, library, encryption, hash, algorythms, security</PackageTags>
         <Description>PandaTech.Crypto is a .NET library simplifying common cryptograhic functions.</Description>
         <RepositoryUrl>https://github.com/PandaTechAM/be-lib-pandatech-crypto</RepositoryUrl>
-        <PackageReleaseNotes>Overload for argon</PackageReleaseNotes>
+        <PackageReleaseNotes>Overload for argon removal</PackageReleaseNotes>
     </PropertyGroup>
 
     <ItemGroup>