Version 1.7 - only difference with 1.6 is Argon2Kdf fully working

.gitignore

@@ -36,4 +36,6 @@ Translation/TrlUtil.vshost.exe.manifest
 /UpgradeLog*.htm
 packages/
 project.lock.json
-AppPackages/
+AppPackages/
+BundleArtifacts/
+*.DotSettings

ModernKeePass/BundleArtifacts/neutral.txt

@@ -1,4 +0,0 @@
-MainPackage=C:\Users\GBE\Source\Repos\ModernKeePass\ModernKeePass\bin\Release\ModernKeePassApp_1.6.0.27_AnyCPU.appx
-SymbolPackage=C:\Users\GBE\Source\Repos\ModernKeePass\ModernKeePass\AppPackages\ModernKeePassApp_1.6.0.27_Test\ModernKeePassApp_1.6.0.27_AnyCPU.appxsym
-ResourcePack=C:\Users\GBE\Source\Repos\ModernKeePass\ModernKeePass\bin\Release\ModernKeePassApp_1.6.0.27_scale-140.appx
-ResourcePack=C:\Users\GBE\Source\Repos\ModernKeePass\ModernKeePass\bin\Release\ModernKeePassApp_1.6.0.27_scale-180.appx

ModernKeePass/Common/DatabaseHelper.cs

@@ -124,7 +124,7 @@ namespace ModernKeePass.Common
         public void Save()
         {
             // TODO: Save is disabled for now for Argon2Kdf because it corrupts DB (read works)
-            if (_pwDatabase == null || !_pwDatabase.IsOpen || KdfPool.Get(KeyDerivation.KdfUuid) is Argon2Kdf) return;
+            if (_pwDatabase == null || !_pwDatabase.IsOpen /*|| KdfPool.Get(KeyDerivation.KdfUuid) is Argon2Kdf*/) return;
             _pwDatabase.Save(new NullStatusLogger());
         }
 

ModernKeePass/ModernKeePass.csproj.DotSettings

@@ -1,3 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp70</s:String>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=viewmodels_005Citems/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

ModernKeePass/ModernKeePassApp.csproj

@@ -297,7 +297,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="ModernKeePassLib, Version=2.37.0.2000, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ModernKeePassLib.2.37.5000\lib\netstandard1.2\ModernKeePassLib.dll</HintPath>
+      <HintPath>..\packages\ModernKeePassLib.2.37.6000\lib\netstandard1.2\ModernKeePassLib.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Splat, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">

ModernKeePass/ModernKeePassApp.csproj.DotSettings

@@ -1,3 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp70</s:String>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=viewmodels_005Citems/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

ModernKeePass/Package.appxmanifest

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/2010/manifest" xmlns:m2="http://schemas.microsoft.com/appx/2013/manifest">
-  <Identity Name="wismna.ModernKeePass" Publisher="CN=0719A91A-C322-4EE0-A257-E60733EECF06" Version="1.6.0.27" />
+  <Identity Name="wismna.ModernKeePass" Publisher="CN=0719A91A-C322-4EE0-A257-E60733EECF06" Version="1.7.0.28" />
   <Properties>
     <DisplayName>ModernKeePass</DisplayName>
     <PublisherDisplayName>wismna</PublisherDisplayName>

ModernKeePass/Pages/SettingsPageFrames/SettingsDatabasePage.xaml

@@ -24,6 +24,6 @@
         <TextBlock Text="Compression Algorithm" FontSize="14" Margin="5,20,0,10" />
         <ComboBox ItemsSource="{Binding Source={StaticResource Compressions}}" SelectedItem="{Binding CompressionName, Mode=TwoWay}" />
         <TextBlock Text="Key Derivation Algorithm" FontSize="14" Margin="5,20,0,10" />
-        <ComboBox ItemsSource="{Binding Source={StaticResource KeyDerivations}}" SelectedItem="{Binding KeyDerivationName, Mode=TwoWay}" IsEnabled="False" />
+        <ComboBox ItemsSource="{Binding Source={StaticResource KeyDerivations}}" SelectedItem="{Binding KeyDerivationName, Mode=TwoWay}" />
     </StackPanel>
 </Page>

ModernKeePass/Properties/AssemblyInfo.cs

@@ -24,6 +24,6 @@ using System.Runtime.InteropServices;
 // 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("1.6.0.0")]
+[assembly: AssemblyVersion("1.7.0.0")]
-[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyFileVersion("1.7.0.0")]
 [assembly: ComVisible(false)]

ModernKeePass/packages.config

@@ -4,7 +4,7 @@
   <package id="Microsoft.NETCore.Platforms" version="2.0.0" targetFramework="win81" />
   <package id="Microsoft.NETCore.Portable.Compatibility" version="1.0.2" targetFramework="win81" />
   <package id="Microsoft.Toolkit.Uwp.Notifications" version="2.0.0" targetFramework="win81" />
-  <package id="ModernKeePassLib" version="2.37.5000" targetFramework="win81" />
+  <package id="ModernKeePassLib" version="2.37.6000" targetFramework="win81" />
   <package id="NETStandard.Library" version="2.0.1" targetFramework="win81" />
   <package id="Portable.BouncyCastle" version="1.8.1.3" targetFramework="win81" />
   <package id="Splat" version="2.0.0" targetFramework="win81" />

ModernKeePassLib/ModernKeePassLib.nuspec

@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>ModernKeePassLib</id>
-    <version>2.37.5000</version>
+    <version>2.37.6000</version>
     <title>ModernKeePassLib</title>
     <authors>Geoffroy Bonneville</authors>
     <owners>Geoffroy Bonneville</owners>
@@ -10,7 +10,7 @@
     <projectUrl>https://github.com/wismna/ModernKeePass</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Portable KeePass Password Management Library that targets .Net Standard and WinRT. Allows reading, editing and writing to KeePass 2.x databases.</description>
-    <releaseNotes>KDBX 4 file format supported</releaseNotes>
+    <releaseNotes>TBD</releaseNotes>
     <copyright>Copyright © 2017 Geoffroy Bonneville</copyright>
     <tags>KeePass KeePassLib Portable PCL NetStandard</tags>
     <dependencies>

ModernKeePassLib/Serialization/KdbxFile.Read.cs

@@ -26,11 +26,8 @@ using System.IO;
 using System.Security;
 using System.Text;
 using System.Xml;
-#if ModernKeePassLib
+
-using Windows.Security.Cryptography;
+#if !ModernKeePassLib && !KeePassUAP
-using Windows.Security.Cryptography.Core;
-using Windows.Storage.Streams;
-#else
 using System.Security.Cryptography;
 #endif
 
@@ -40,15 +37,15 @@ using System.IO.Compression;
 using KeePassLibSD;
 #endif
 
+using ModernKeePassLib.Collections;
 using ModernKeePassLib.Cryptography;
 using ModernKeePassLib.Cryptography.Cipher;
+using ModernKeePassLib.Cryptography.KeyDerivation;
 using ModernKeePassLib.Interfaces;
 using ModernKeePassLib.Keys;
 using ModernKeePassLib.Resources;
-using ModernKeePassLib.Utility;
-using ModernKeePassLib.Collections;
-using ModernKeePassLib.Cryptography.KeyDerivation;
 using ModernKeePassLib.Security;
+using ModernKeePassLib.Utility;
 
 namespace ModernKeePassLib.Serialization
 {

ModernKeePassLib/Serialization/KdbxFile.Write.cs

@@ -25,9 +25,8 @@ using System.IO;
 using System.Security;
 using System.Text;
 using System.Xml;
-#if ModernKeePassLib
+
-using Windows.Security.Cryptography;
+#if !ModernKeePassLib && !KeePassUAP
-#else
 using System.Drawing;
 using System.Security.Cryptography;
 #endif
@@ -41,15 +40,13 @@ using System.IO.Compression;
 using ModernKeePassLib.Collections;
 using ModernKeePassLib.Cryptography;
 using ModernKeePassLib.Cryptography.Cipher;
+using ModernKeePassLib.Cryptography.KeyDerivation;
 using ModernKeePassLib.Delegates;
 using ModernKeePassLib.Interfaces;
 using ModernKeePassLib.Keys;
 using ModernKeePassLib.Resources;
 using ModernKeePassLib.Security;
 using ModernKeePassLib.Utility;
-using Windows.Security.Cryptography.Core;
-using Windows.Storage.Streams;
-using ModernKeePassLib.Cryptography.KeyDerivation;
 
 namespace ModernKeePassLib.Serialization
 {
@@ -212,8 +209,13 @@ namespace ModernKeePassLib.Serialization
 				xws.Indent = true;
 				xws.IndentChars = "\t";
 				xws.NewLineOnAttributes = false;
+#if ModernKeePassLib
+                // This is needed for Argon2Kdf write
+                xws.Async = true;
+			    if (m_uFileVersion >= FileVersion32_4) xws.CloseOutput = true;
+#endif
 
-				XmlWriter xw = XmlWriter.Create(sXml, xws);
+                XmlWriter xw = XmlWriter.Create(sXml, xws);
 #else
 				XmlTextWriter xw = new XmlTextWriter(sXml, encNoBom);
 

ModernKeePassLib/Serialization/KdbxFile.cs

@@ -519,8 +519,8 @@ namespace ModernKeePassLib.Serialization
 			byte[] pbData = pb.ReadData();
             /*var file = FileSystem.Current.GetFileFromPathAsync(strPath).Result;
 			using (var stream = file.OpenAsync(FileAccess.ReadAndWrite).Result) {*/
-            var file = StorageFile.GetFileFromPathAsync(strPath).GetResults();
+            var file = StorageFile.GetFileFromPathAsync(strPath).GetAwaiter().GetResult();
-            using (var stream = file.OpenAsync(FileAccessMode.ReadWrite).GetResults().AsStream())
+            using (var stream = file.OpenAsync(FileAccessMode.ReadWrite).GetAwaiter().GetResult().AsStream())
             {
                 stream.Write (pbData, 0, pbData.Length);
 			}