Merge branch 'master' into fix-url-domain-retrieval

andrew-schofield · Apr 10, 2017 · fd249fa · fd249fa
2 parents 3eff8d9 + c65eb4d
commit fd249fa
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 6 deletions.
diff --git a/HaveIBeenPwned.plgx b/HaveIBeenPwned.plgx
diff --git a/HaveIBeenPwned/HaveIBeenPwned.csproj b/HaveIBeenPwned/HaveIBeenPwned.csproj
@@ -72,7 +72,8 @@
     <Compile Include="HaveIBeenPwnedExt.cs" />
     <Compile Include="IBreach.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="PwEntryExtension.cs" />
+    <Compile Include="ProtectedStringExtensions.cs" />
+    <Compile Include="PwEntryExtensions.cs" />
     <Compile Include="Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>

diff --git a/HaveIBeenPwned/Properties/AssemblyInfo.cs b/HaveIBeenPwned/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.2.8.1")]
-[assembly: AssemblyFileVersion("0.2.8.1")]
+[assembly: AssemblyVersion("0.2.9")]
+[assembly: AssemblyFileVersion("0.2.9")]
diff --git a/HaveIBeenPwned/ProtectedStringExtensions.cs b/HaveIBeenPwned/ProtectedStringExtensions.cs
@@ -0,0 +1,25 @@
+using KeePassLib.Security;
+using KeePassLib.Utility;
+
+namespace HaveIBeenPwned
+{
+    public static class ProtectedStringExtensions
+    {
+        public static bool Equals(this ProtectedString protectedString, ProtectedString compareWith)
+        {
+            // extract the unencrypted strings
+            byte[] string1 = protectedString.ReadUtf8();
+            byte[] string2 = compareWith.ReadUtf8();
+
+            // compare the results
+            var result = string1 == string2;
+
+            // clean up the byte arrays so we don't leak data
+            MemUtil.ZeroByteArray(string1);
+            MemUtil.ZeroByteArray(string2);
+
+            // finally return the result
+            return result;
+        }
+    }
+}
diff --git a/HaveIBeenPwned/PwEntryExtension.cs → HaveIBeenPwned/PwEntryExtensions.cs b/HaveIBeenPwned/PwEntryExtension.cs → HaveIBeenPwned/PwEntryExtensions.cs
@@ -5,7 +5,7 @@
 
 namespace HaveIBeenPwned
 {
-    public static class PwEntryExtension
+    public static class PwEntryExtensions
     {
         public static DateTime GetPasswordLastModified(this PwEntry entry)
         {
@@ -14,7 +14,7 @@ public static DateTime GetPasswordLastModified(this PwEntry entry)
                 var sortedEntries = entry.History.OrderByDescending(h => h.LastModificationTime);
                 foreach (var historyEntry in sortedEntries)
                 {
-                    if (entry.Strings.GetSafe(PwDefs.PasswordField).ReadString() != historyEntry.Strings.GetSafe(PwDefs.PasswordField).ReadString())
+                    if(!entry.Strings.GetSafe(PwDefs.PasswordField).Equals(historyEntry.Strings.GetSafe(PwDefs.PasswordField)))
                     {
                         return historyEntry.LastModificationTime;
                     }

diff --git a/VERSION b/VERSION
@@ -1,3 +1,3 @@
 :
-HaveIBeenPwned checker:0.2.8.1
+HaveIBeenPwned checker:0.2.9
 :
diff --git a/mono/HaveIBeenPwned.dll b/mono/HaveIBeenPwned.dll