Fixing cryptsharp version issues

build.fsx

@@ -10,8 +10,8 @@ let buildDir = "./build/"
 let testDir  = "./test/"
 let nugetDir = "./nuget/output/"
 let packagingDir = "./nuget/working/"
-let packageVersion = environVarOrDefault "PACKAGEVERSION" "1.0.2"
-let version = environVarOrDefault "VERSION" "1.0.2.0"
+let packageVersion = environVarOrDefault "PACKAGEVERSION" "1.0.3"
+let version = environVarOrDefault "VERSION" "1.0.3.0"
 let projectDescription = "IPasswordHasher implementation for Asp.Net Identity"
 let projectName = "Malt.PasswordHasher"
 

src/Malt.PasswordHasher/Crypto.cs

@@ -43,11 +43,9 @@ public static string HashPassword<T>(string password, int iterations) where T :
         public static byte[] HashWithPbkdf2<T>(string password, byte[] saltBytes, int iterations) where T : KeyedHashAlgorithm, new()
         {
             var passwordBytes = Encoding.UTF8.GetBytes(password);
-
-            var hashSize = new T().HashSize/8;
-            var hashedPassword = new byte[hashSize];
-
-            Pbkdf2.ComputeKey(passwordBytes, saltBytes, iterations, Pbkdf2.CallbackFromHmac<T>(), hashSize, hashedPassword);
+            var algorithm = new T() {Key = passwordBytes};
+            var hashSize = algorithm.HashSize / 8;
+            var hashedPassword = Pbkdf2.ComputeDerivedKey(algorithm, saltBytes, iterations, hashSize);
             return hashedPassword;
         }
 

src/Malt.PasswordHasher/Malt.PasswordHasher.csproj

@@ -34,7 +34,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="CryptSharp">
-      <HintPath>..\packages\CryptSharp.1.2.0.1\lib\net35\CryptSharp.dll</HintPath>
+      <HintPath>..\packages\CryptSharpOfficial.2.0.0.0\lib\CryptSharp.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.AspNet.Identity.Core">
       <HintPath>..\packages\Microsoft.AspNet.Identity.Core.2.0.1\lib\net45\Microsoft.AspNet.Identity.Core.dll</HintPath>

src/Malt.PasswordHasher/Properties/AssemblyInfo.cs

@@ -4,10 +4,10 @@
 [assembly: AssemblyTitleAttribute("Malt.PasswordHasher")]
 [assembly: AssemblyDescriptionAttribute("IPasswordHasher implementation for Asp.Net Identity")]
 [assembly: AssemblyProductAttribute("PasswordHasher")]
-[assembly: AssemblyVersionAttribute("1.0.2.0")]
-[assembly: AssemblyFileVersionAttribute("1.0.2.0")]
+[assembly: AssemblyVersionAttribute("1.0.3.0")]
+[assembly: AssemblyFileVersionAttribute("1.0.3.0")]
 namespace System {
     internal static class AssemblyVersionInformation {
-        internal const string Version = "1.0.2.0";
+        internal const string Version = "1.0.3.0";
     }
 }

src/Malt.PasswordHasher/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="CryptSharpOfficial" version="2.0.0.0" targetFramework="net451" />
   <package id="Microsoft.AspNet.Identity.Core" version="2.0.1" targetFramework="net451" />
-  <package id="CryptSharpOfficial" version="2.0.0" targetFramework="net451" />
 </packages>