Merge pull request #6 from Structum/dev

ComputeHash string representation change.

Author: aespinoza

README.md

@@ -6,10 +6,10 @@ Elements is a set of reusable components commonly used in applications.
 
 | Package | description  | nuget Stable |
 | ------- | ------------ | -------------|
-| [Structum.Elements](https://www.nuget.org/packages/Structum.Elements/) | Common classes and Type extensions | [![nuget](https://img.shields.io/badge/nuget-v1.2.0.5-blue.svg)](https://www.nuget.org/packages/Structum.Elements) |
-| [Structum.Elements.Web](https://www.nuget.org/packages/Structum.Elements.Web/) | Lightweight Rest Requests and URL parser. | [![nuget](https://img.shields.io/badge/nuget-v1.2.0.5-blue.svg)](https://www.nuget.org/packages/Structum.Elements.Web) |
-| [Structum.Elements.Security](https://www.nuget.org/packages/Structum.Elements.Security/) | Common Encryption, Hashing and Password protection classes. | [![nuget](https://img.shields.io/badge/nuget-v1.2.0.5-blue.svg)](https://www.nuget.org/packages/Structum.Elements.Security) |
-| [Structum.Elements.Data](https://www.nuget.org/packages/Structum.Elements.Data/) | Data Structures and Hash Functions. | [![nuget](https://img.shields.io/badge/nuget-v1.2.0.5-blue.svg)](https://www.nuget.org/packages/Structum.Elements.Data) |
+| [Structum.Elements](https://www.nuget.org/packages/Structum.Elements/) | Common classes and Type extensions | [![nuget](https://img.shields.io/badge/nuget-v1.2.1.0-blue.svg)](https://www.nuget.org/packages/Structum.Elements) |
+| [Structum.Elements.Web](https://www.nuget.org/packages/Structum.Elements.Web/) | Lightweight Rest Requests and URL parser. | [![nuget](https://img.shields.io/badge/nuget-v1.2.1.0-blue.svg)](https://www.nuget.org/packages/Structum.Elements.Web) |
+| [Structum.Elements.Security](https://www.nuget.org/packages/Structum.Elements.Security/) | Common Encryption, Hashing and Password protection classes. | [![nuget](https://img.shields.io/badge/nuget-v1.2.1.0-blue.svg)](https://www.nuget.org/packages/Structum.Elements.Security) |
+| [Structum.Elements.Data](https://www.nuget.org/packages/Structum.Elements.Data/) | Data Structures and Hash Functions. | [![nuget](https://img.shields.io/badge/nuget-v1.2.1.0-blue.svg)](https://www.nuget.org/packages/Structum.Elements.Data) |
 
 ## Getting Started
 

src/Elements.Security/Encryption/Hasher.cs

@@ -55,7 +55,12 @@ public string ComputeHash(string plainText)
 
                 hashBytes = hasher.ComputeHash(hashBytes);
 
-                return Convert.ToBase64String(hashBytes);
+                StringBuilder result = new StringBuilder(hashBytes.Length*2);
+                foreach(var b in hashBytes) {
+                    result.Append(b.ToString("x2"));
+                }
+
+                return result.ToString();
             }
         }
 

tests/Elements.Security.Tests/Encryption/HasherTest.cs

@@ -16,7 +16,7 @@ public void DefaultComputeHashTest()
         {
             var hasher = new Hasher();
             string hash = hasher.ComputeHash("MyC0013ncrypti0nP@$$w0rd!");
-            Assert.Equal(44, hash.Length);
+            Assert.Equal(64, hash.Length);
         }
 
         /// <summary>
@@ -29,7 +29,7 @@ public void Md5ComputeHashTest()
                 HashingAlgorithm = CryptographicHashAlgorithmType.Md5
             };
             string hash = hasher.ComputeHash("MyC0013ncrypti0nP@$$w0rd!");
-            Assert.Equal(24, hash.Length);
+            Assert.Equal(32, hash.Length);
         }
 
         /// <summary>
@@ -42,7 +42,7 @@ public void Sha1ComputeHashTest()
                 HashingAlgorithm = CryptographicHashAlgorithmType.Sha1
             };
             string hash = hasher.ComputeHash("MyC0013ncrypti0nP@$$w0rd!");
-            Assert.Equal(28, hash.Length);
+            Assert.Equal(40, hash.Length);
         }
 
         /// <summary>
@@ -55,7 +55,7 @@ public void Sha256ComputeHashTest()
                 HashingAlgorithm = CryptographicHashAlgorithmType.Sha256
             };
             string hash = hasher.ComputeHash("MyC0013ncrypti0nP@$$w0rd!");
-            Assert.Equal(44, hash.Length);
+            Assert.Equal(64, hash.Length);
         }
     }
 }

tests/Elements.Security.Tests/Passwords/PasswordProtectorTest.cs

@@ -21,8 +21,8 @@ public void RandomProtectAndCompareTest()
 
                 Assert.NotNull(protectedPassword.Password);
 
-                Assert.True(protectedPassword.Password.Length <= 44); // The Size of SHA-256
-                Assert.True(protectedPassword.Password.Length >= 24); // The Size of MD5
+                Assert.True(protectedPassword.Password.Length <= 64); // The Size of SHA-256
+                Assert.True(protectedPassword.Password.Length >= 32); // The Size of MD5
 
                 Assert.NotNull(protectedPassword.Salt);
                 Assert.True(protectedPassword.IterationCount > 0);