From e495a1c2e7dd4b922afe77d7a5d1c6f9dd1afb0b Mon Sep 17 00:00:00 2001
From: Geoffroy Bonneville <geogeob@hotmail.com>
Date: Fri, 3 Nov 2017 15:48:55 +0100
Subject: [PATCH] Key file implemented! Key Derivation setting added More unit
 tests created Some cleanup in lib WIP Argon2 save

---
 ModernKeePass/Common/DatabaseHelper.cs        |  15 +-
 .../Controls/OpenDatabaseUserControl.xaml     | 358 ++----------------
 .../Controls/OpenDatabaseUserControl.xaml.cs  |  21 +-
 .../SettingsDatabasePage.xaml                 |   3 +
 .../ViewModels/SettingsDatabaseVm.cs          |   8 +
 .../Cryptography/Hash/HmacTests.cs            |  35 ++
 .../ModernKeePassLib.Test.csproj              |   1 +
 ModernKeePassLib.Test/Utility/MemUtilTests.cs |  89 +++++
 ModernKeePassLib.Test/app.config              |   2 +-
 .../Serialization/BinaryReaderEx.cs           |   2 +-
 ModernKeePassLib/Utility/MemUtil.cs           |   4 +-
 ModernKeePassLib/Utility/StrUtil.cs           |   7 +-
 12 files changed, 200 insertions(+), 345 deletions(-)
 create mode 100644 ModernKeePassLib.Test/Utility/MemUtilTests.cs

diff --git a/ModernKeePass/Common/DatabaseHelper.cs b/ModernKeePass/Common/DatabaseHelper.cs
index afa5d44..c4b8c19 100644
--- a/ModernKeePass/Common/DatabaseHelper.cs
+++ b/ModernKeePass/Common/DatabaseHelper.cs
@@ -54,10 +54,12 @@ namespace ModernKeePass.Common
             }
         }
 
+        public StorageFile KeyFile { get; set; }
+
         public PwUuid DataCipher
         {
             get { return _pwDatabase.DataCipherUuid; }
-            internal set { _pwDatabase.DataCipherUuid = value; }
+            set { _pwDatabase.DataCipherUuid = value; }
         }
 
         public PwCompressionAlgorithm CompressionAlgorithm
@@ -66,6 +68,12 @@ namespace ModernKeePass.Common
             set { _pwDatabase.Compression = value; }
         }
 
+        public KdfParameters KeyDerivation
+        {
+            get { return _pwDatabase.KdfParameters; }
+            set { _pwDatabase.KdfParameters = value; }
+        }
+
         /// <summary>
         /// Open a KeePass database
         /// </summary>
@@ -77,7 +85,8 @@ namespace ModernKeePass.Common
             var key = new CompositeKey();
             try
             {
-                key.AddUserKey(new KcpPassword(password));
+                if (password != null) key.AddUserKey(new KcpPassword(password));
+                if (KeyFile != null) key.AddUserKey(new KcpKeyFile(IOConnectionInfo.FromFile(KeyFile)));
                 var ioConnection = IOConnectionInfo.FromFile(DatabaseFile);
                 if (createNew) _pwDatabase.New(ioConnection, key);
                 else _pwDatabase.Open(ioConnection, key, new NullStatusLogger());
@@ -120,7 +129,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(_pwDatabase.KdfParameters.KdfUuid) is Argon2Kdf*/) return;
+            if (_pwDatabase == null || !_pwDatabase.IsOpen || KdfPool.Get(_pwDatabase.KdfParameters.KdfUuid) is Argon2Kdf) return;
             _pwDatabase.Save(new NullStatusLogger());
         }
 
diff --git a/ModernKeePass/Controls/OpenDatabaseUserControl.xaml b/ModernKeePass/Controls/OpenDatabaseUserControl.xaml
index 3967b25..c6d2ee5 100644
--- a/ModernKeePass/Controls/OpenDatabaseUserControl.xaml
+++ b/ModernKeePass/Controls/OpenDatabaseUserControl.xaml
@@ -8,342 +8,32 @@
     xmlns:core="using:Microsoft.Xaml.Interactions.Core"
     xmlns:actions="using:ModernKeePass.Actions"
     mc:Ignorable="d"
-    d:DesignHeight="60"
+    d:DesignHeight="120"
     d:DesignWidth="550" >
     <UserControl.Resources>
         <SolidColorBrush x:Key="ErrorColorBrush" Color="Red"/>
-        <Style TargetType="PasswordBox" x:Name="PasswordBoxWithButtonStyle">
-            <Setter Property="MinWidth" Value="{ThemeResource TextControlThemeMinWidth}" />
-            <Setter Property="MinHeight" Value="{ThemeResource TextControlThemeMinHeight}" />
-            <Setter Property="Foreground" Value="{ThemeResource TextBoxForegroundThemeBrush}" />
-            <Setter Property="Background" Value="{ThemeResource TextBoxBackgroundThemeBrush}" />
-            <Setter Property="SelectionHighlightColor" Value="{ThemeResource TextSelectionHighlightColorThemeBrush}" />
-            <Setter Property="BorderBrush" Value="{ThemeResource TextBoxBorderThemeBrush}" />
-            <Setter Property="BorderThickness" Value="{ThemeResource TextControlBorderThemeThickness}" />
-            <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
-            <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
-            <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Hidden" />
-            <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Hidden" />
-            <Setter Property="Padding" Value="{ThemeResource TextControlThemePadding}"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="PasswordBox">
-                        <Grid>
-                            <Grid.Resources>
-                                <Style x:Name="RevealButtonStyle" TargetType="Button">
-                                    <Setter Property="Template">
-                                        <Setter.Value>
-                                            <ControlTemplate TargetType="Button">
-                                                <Grid>
-                                                    <VisualStateManager.VisualStateGroups>
-                                                        <VisualStateGroup x:Name="CommonStates">
-                                                            <VisualState x:Name="Normal" />
-                                                            <VisualState x:Name="PointerOver">
-                                                                <Storyboard>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement"
-                                                                                               Storyboard.TargetProperty="BorderBrush">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxButtonPointerOverBorderThemeBrush}" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="GlyphElement"
-                                                                                               Storyboard.TargetProperty="Foreground">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxButtonPointerOverBackgroundThemeBrush}" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                </Storyboard>
-                                                            </VisualState>
-                                                            <VisualState x:Name="Pressed">
-                                                                <Storyboard>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement"
-                                                                                                   Storyboard.TargetProperty="BorderBrush">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxButtonPressedBorderThemeBrush}" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="GlyphElement"
-                                                                                                   Storyboard.TargetProperty="Foreground">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxButtonPointerOverForegroundThemeBrush}" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                </Storyboard>
-                                                            </VisualState>
-                                                            <VisualState x:Name="Disabled">
-                                                                <Storyboard>
-                                                                    <DoubleAnimation Storyboard.TargetName="BackgroundElement"
-                                                                                 Storyboard.TargetProperty="Opacity"
-                                                                                 To="0"
-                                                                                 Duration="0" />
-                                                                    <DoubleAnimation Storyboard.TargetName="BorderElement"
-                                                                                 Storyboard.TargetProperty="Opacity"
-                                                                                 To="0"
-                                                                                 Duration="0" />
-                                                                </Storyboard>
-                                                            </VisualState>
-                                                        </VisualStateGroup>
-                                                    </VisualStateManager.VisualStateGroups>
-                                                    <Border x:Name="BorderElement"
-                                                        BorderBrush="{ThemeResource TextBoxButtonBorderThemeBrush}"
-                                                        BorderThickness="{TemplateBinding BorderThickness}"/>
-                                                    <Border x:Name="BackgroundElement"
-                                                        Background="{ThemeResource TextBoxButtonBackgroundThemeBrush}"
-                                                        Margin="{TemplateBinding BorderThickness}">
-                                                        <TextBlock x:Name="GlyphElement"
-                                                               Foreground="{ThemeResource TextBoxButtonForegroundThemeBrush}"
-                                                               VerticalAlignment="Center"
-                                                               HorizontalAlignment="Center"
-                                                               FontStyle="Normal"
-                                                               Text="&#xE052;"
-                                                               FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                                                               AutomationProperties.AccessibilityView="Raw"/>
-                                                    </Border>
-                                                </Grid>
-                                            </ControlTemplate>
-                                        </Setter.Value>
-                                    </Setter>
-                                </Style>
-
-                                <Style x:Name="GotoButtonStyle" TargetType="Button">
-                                    <Setter Property="Template">
-                                        <Setter.Value>
-                                            <ControlTemplate TargetType="Button">
-                                                <Grid>
-                                                    <VisualStateManager.VisualStateGroups>
-                                                        <VisualStateGroup x:Name="CommonStates">
-                                                            <VisualState x:Name="Normal" >
-                                                                <Storyboard>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundElement"
-                                                                                               Storyboard.TargetProperty="Background">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxButtonPressedBackgroundThemeBrush}" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement"
-                                                                                               Storyboard.TargetProperty="BorderBrush">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxButtonPressedBorderThemeBrush}" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="GlyphElement"
-                                                                                               Storyboard.TargetProperty="Foreground">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxButtonPressedForegroundThemeBrush}" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                </Storyboard>
-                                                            </VisualState>
-                                                            <VisualState x:Name="PointerOver">
-                                                                <Storyboard>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundElement"
-                                                                                               Storyboard.TargetProperty="Background">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxButtonPointerOverBackgroundThemeBrush}" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement"
-                                                                                               Storyboard.TargetProperty="BorderBrush">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxButtonPointerOverBorderThemeBrush}" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="GlyphElement"
-                                                                                               Storyboard.TargetProperty="Foreground">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxButtonPointerOverForegroundThemeBrush}" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                </Storyboard>
-                                                            </VisualState>
-                                                            <VisualState x:Name="Pressed">
-                                                                <Storyboard>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundElement"
-                                                                                               Storyboard.TargetProperty="Background">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxButtonPressedBackgroundThemeBrush}" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement"
-                                                                                               Storyboard.TargetProperty="BorderBrush">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxButtonPressedBorderThemeBrush}" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="GlyphElement"
-                                                                                               Storyboard.TargetProperty="Foreground">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxButtonPressedForegroundThemeBrush}" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                </Storyboard>
-                                                            </VisualState>
-                                                            <VisualState x:Name="Disabled">
-                                                                <Storyboard>
-                                                                    <DoubleAnimation Storyboard.TargetName="BackgroundElement"
-                                                                                 Storyboard.TargetProperty="Opacity"
-                                                                                 To="0"
-                                                                                 Duration="0" />
-                                                                    <DoubleAnimation Storyboard.TargetName="BorderElement"
-                                                                                 Storyboard.TargetProperty="Opacity"
-                                                                                 To="0"
-                                                                                 Duration="0" />
-                                                                </Storyboard>
-                                                            </VisualState>
-                                                        </VisualStateGroup>
-                                                    </VisualStateManager.VisualStateGroups>
-                                                    <Border x:Name="BorderElement"
-                                                        BorderBrush="{ThemeResource TextBoxButtonBorderThemeBrush}"
-                                                        BorderThickness="{TemplateBinding BorderThickness}"/>
-                                                    <Border x:Name="BackgroundElement"
-                                                        Background="{ThemeResource TextBoxButtonBackgroundThemeBrush}"
-                                                        Margin="{TemplateBinding BorderThickness}">
-                                                        <TextBlock x:Name="GlyphElement"
-                                                               Foreground="{ThemeResource TextBoxButtonForegroundThemeBrush}"
-                                                               VerticalAlignment="Center"
-                                                               HorizontalAlignment="Center"
-                                                               FontStyle="Normal"
-                                                               Text="&#xE111;"
-                                                               Padding="4,0,4,0"
-                                                               FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                                                               AutomationProperties.AccessibilityView="Raw"/>
-                                                    </Border>
-                                                </Grid>
-                                            </ControlTemplate>
-                                        </Setter.Value>
-                                    </Setter>
-                                </Style>
-                            </Grid.Resources>
-                            <VisualStateManager.VisualStateGroups>
-                                <VisualStateGroup x:Name="CommonStates">
-                                    <VisualState x:Name="Disabled">
-                                        <Storyboard>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundElement"
-                                                                       Storyboard.TargetProperty="Background">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxDisabledBackgroundThemeBrush}" />
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement"
-                                                                       Storyboard.TargetProperty="BorderBrush">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxDisabledBorderThemeBrush}" />
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentElement"
-                                                                       Storyboard.TargetProperty="Foreground">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxDisabledForegroundThemeBrush}" />
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PlaceholderTextContentPresenter"
-                                                                       Storyboard.TargetProperty="Foreground">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxDisabledForegroundThemeBrush}" />
-                                            </ObjectAnimationUsingKeyFrames>
-                                        </Storyboard>
-                                    </VisualState>
-                                    <VisualState x:Name="Normal">
-                                        <Storyboard>
-                                            <DoubleAnimation Storyboard.TargetName="BackgroundElement"
-                                                         Storyboard.TargetProperty="Opacity"
-                                                         Duration="0"
-                                                         To="{ThemeResource TextControlBackgroundThemeOpacity}" />
-                                            <DoubleAnimation Storyboard.TargetName="BorderElement"
-                                                         Storyboard.TargetProperty="Opacity"
-                                                         Duration="0"
-                                                         To="{ThemeResource TextControlBorderThemeOpacity}" />
-                                        </Storyboard>
-                                    </VisualState>
-                                    <VisualState x:Name="PointerOver">
-                                        <Storyboard>
-                                            <DoubleAnimation Storyboard.TargetName="BackgroundElement"
-                                                         Storyboard.TargetProperty="Opacity"
-                                                         Duration="0"
-                                                         To="{ThemeResource TextControlPointerOverBackgroundThemeOpacity}" />
-                                            <DoubleAnimation Storyboard.TargetName="BorderElement"
-                                                         Storyboard.TargetProperty="Opacity"
-                                                         Duration="0"
-                                                         To="{ThemeResource TextControlPointerOverBorderThemeOpacity}" />
-                                        </Storyboard>
-                                    </VisualState>
-                                    <VisualState x:Name="Error">
-                                        <Storyboard>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement"
-                                                                           Storyboard.TargetProperty="BorderBrush">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ErrorColorBrush}" />
-                                            </ObjectAnimationUsingKeyFrames>
-                                        </Storyboard>
-                                    </VisualState>
-                                    <VisualState x:Name="Focused" />
-                                </VisualStateGroup>
-                                <VisualStateGroup x:Name="ButtonStates">
-                                    <VisualState x:Name="ButtonVisible">
-                                        <Storyboard>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RevealButton"
-                                                                       Storyboard.TargetProperty="Visibility">
-                                                <DiscreteObjectKeyFrame KeyTime="0">
-                                                    <DiscreteObjectKeyFrame.Value>
-                                                        <Visibility>Visible</Visibility>
-                                                    </DiscreteObjectKeyFrame.Value>
-                                                </DiscreteObjectKeyFrame>
-                                            </ObjectAnimationUsingKeyFrames>
-                                        </Storyboard>
-                                    </VisualState>
-                                    <VisualState x:Name="ButtonCollapsed" />
-                                </VisualStateGroup>
-                            </VisualStateManager.VisualStateGroups>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="*" />
-                            </Grid.RowDefinitions>
-                            <Border x:Name="BackgroundElement"
-                                Grid.Row="1"
-                                Background="{TemplateBinding Background}"
-                                Margin="{TemplateBinding BorderThickness}"
-                                Grid.ColumnSpan="3"
-                                Grid.RowSpan="1"/>
-                            <Border x:Name="BorderElement"
-                                Grid.Row="1"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                Grid.ColumnSpan="3"
-                                Grid.RowSpan="1"/>
-                            <ContentPresenter x:Name="HeaderContentPresenter"
-                                          Grid.Row="0"
-                                          Foreground="{ThemeResource TextBoxForegroundHeaderThemeBrush}"
-                                          Margin="0,4,0,4"
-                                          Grid.ColumnSpan="3"
-                                          Content="{TemplateBinding Header}"
-                                          ContentTemplate="{TemplateBinding HeaderTemplate}"
-                                          FontWeight="Semilight" />
-                            <ScrollViewer x:Name="ContentElement"
-                                Grid.Row="1"
-                                      HorizontalScrollMode="{TemplateBinding ScrollViewer.HorizontalScrollMode}"
-                                      HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
-                                      VerticalScrollMode="{TemplateBinding ScrollViewer.VerticalScrollMode}"
-                                      VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}"
-                                      IsHorizontalRailEnabled="{TemplateBinding ScrollViewer.IsHorizontalRailEnabled}"
-                                      IsVerticalRailEnabled="{TemplateBinding ScrollViewer.IsVerticalRailEnabled}"
-                                      Margin="{TemplateBinding BorderThickness}"
-                                      Padding="{TemplateBinding Padding}"
-                                      IsTabStop="False"
-                                      ZoomMode="Disabled"
-                                      AutomationProperties.AccessibilityView="Raw"/>
-                            <ContentControl x:Name="PlaceholderTextContentPresenter"
-                                      Grid.Row="1"
-                                      Foreground="{ThemeResource TextBoxPlaceholderTextThemeBrush}"
-                                      Margin="{TemplateBinding BorderThickness}"
-                                      Padding="{TemplateBinding Padding}"
-                                      IsTabStop="False"
-                                      Grid.ColumnSpan="3"
-                                      Content="{TemplateBinding PlaceholderText}" 
-                                      IsHitTestVisible="False"/>
-                            <Button x:Name="RevealButton"
-                                Grid.Row="1"
-                                Style="{StaticResource RevealButtonStyle}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                IsTabStop="False"
-                                Grid.Column="1"
-                                Visibility="Collapsed"
-                                FontSize="{TemplateBinding FontSize}"
-                                VerticalAlignment="Stretch"/>
-                            <Button x:Name="GotoButton"
-                                Grid.Row="1"
-                                Style="{StaticResource GotoButtonStyle}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                IsTabStop="False"
-                                Grid.Column="2"
-                                Visibility="Visible"
-                                FontSize="{TemplateBinding FontSize}"
-                                VerticalAlignment="Stretch"
-                                Click="OpenButton_OnClick" />
-                        </Grid>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
     </UserControl.Resources>
-    <StackPanel>
-        <PasswordBox x:Name="PasswordBox" Password="{Binding Password, ElementName=UserControl, Mode=TwoWay}" IsPasswordRevealButtonEnabled="True" KeyDown="PasswordBox_KeyDown" PlaceholderText="Password" Style="{StaticResource PasswordBoxWithButtonStyle}">
-            <interactivity:Interaction.Behaviors>
-                <core:DataTriggerBehavior Binding="{Binding Visibility, ElementName=UserControl}" Value="Visible">
-                    <actions:SetupFocusAction TargetObject="{Binding ElementName=PasswordBox}" />
-                </core:DataTriggerBehavior>
-            </interactivity:Interaction.Behaviors>
-        </PasswordBox>
-        <TextBlock x:Name="StatusTextBlock" Height="28" Foreground="{ThemeResource ErrorColorBrush}" FontSize="14" FontWeight="Light" TextWrapping="WrapWholeWords" />
-    </StackPanel>
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="50" />
+            <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="40" />
+            <RowDefinition Height="40" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+        <CheckBox x:Name="PasswordCheckBox" Grid.Row="0" Grid.Column="0" />
+            <PasswordBox Grid.Row="0" Grid.Column="1" x:Name="PasswordBox" Password="{Binding Password, ElementName=UserControl, Mode=TwoWay}" Height="30" IsEnabled="{Binding IsChecked, ElementName=PasswordCheckBox}" IsPasswordRevealButtonEnabled="True" KeyDown="PasswordBox_KeyDown" PlaceholderText="Password" >
+                <interactivity:Interaction.Behaviors>
+                    <core:DataTriggerBehavior Binding="{Binding Visibility, ElementName=UserControl}" Value="Visible">
+                        <actions:SetupFocusAction TargetObject="{Binding ElementName=PasswordBox}" />
+                    </core:DataTriggerBehavior>
+                </interactivity:Interaction.Behaviors>
+            </PasswordBox>
+        <CheckBox x:Name="KeyFileCheckBox" Grid.Row="1" Grid.Column="0" />
+        <HyperlinkButton Grid.Row="1" Grid.Column="1" Margin="-10,0,0,0" Content="Select key file from disk..." IsEnabled="{Binding IsChecked, ElementName=KeyFileCheckBox}" Click="KeyFileButton_Click" />
+        <Button Grid.Column="0" Grid.Row="2" Content="OK" Click="OpenButton_OnClick" />
+        <TextBlock Grid.Column="1" Grid.Row="2" x:Name="StatusTextBlock" Height="28" FontSize="14" FontWeight="Light" TextWrapping="WrapWholeWords" HorizontalAlignment="Right" />
+    </Grid>
 </UserControl>
diff --git a/ModernKeePass/Controls/OpenDatabaseUserControl.xaml.cs b/ModernKeePass/Controls/OpenDatabaseUserControl.xaml.cs
index c14b808..f4f6ed0 100644
--- a/ModernKeePass/Controls/OpenDatabaseUserControl.xaml.cs
+++ b/ModernKeePass/Controls/OpenDatabaseUserControl.xaml.cs
@@ -1,4 +1,5 @@
 using System;
+using Windows.Storage.Pickers;
 using Windows.System;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Input;
@@ -49,7 +50,7 @@ namespace ModernKeePass.Controls
         {
             ValidationChecking?.Invoke(this, new EventArgs());
             var app = (App)Application.Current;
-            StatusTextBlock.Text = app.Database.Open(PasswordBox.Password, CreateNew);
+            StatusTextBlock.Text = app.Database.Open(PasswordCheckBox.IsChecked.HasValue && PasswordCheckBox.IsChecked.Value ? PasswordBox.Password : null, CreateNew);
             if (app.Database.Status == DatabaseHelper.DatabaseStatus.Opened)
             {
                 ValidationChecked?.Invoke(this, new PasswordEventArgs(app.Database.RootGroup));
@@ -69,5 +70,23 @@ namespace ModernKeePass.Controls
                 StatusTextBlock.Text = string.Empty;
             }
         }
+
+        private async void KeyFileButton_Click(object sender, RoutedEventArgs e)
+        {
+            var picker =
+                new FileOpenPicker
+                {
+                    ViewMode = PickerViewMode.List,
+                    SuggestedStartLocation = PickerLocationId.DocumentsLibrary
+                };
+            picker.FileTypeFilter.Add(".key");
+
+            // Application now has read/write access to the picked file
+            var file = await picker.PickSingleFileAsync();
+            if (file == null) return;
+            var app = (App)Application.Current;
+            app.Database.KeyFile = file;
+            StatusTextBlock.Text = $"Key file: {file.Name}";
+        }
     }
 }
diff --git a/ModernKeePass/Pages/SettingsPageFrames/SettingsDatabasePage.xaml b/ModernKeePass/Pages/SettingsPageFrames/SettingsDatabasePage.xaml
index 7087abc..27797de 100644
--- a/ModernKeePass/Pages/SettingsPageFrames/SettingsDatabasePage.xaml
+++ b/ModernKeePass/Pages/SettingsPageFrames/SettingsDatabasePage.xaml
@@ -10,6 +10,7 @@
         <CollectionViewSource x:Name="RecycleBinGroups" Source="{Binding Groups}" />
         <CollectionViewSource x:Name="Ciphers" Source="{Binding Ciphers}" />
         <CollectionViewSource x:Name="Compressions" Source="{Binding Compressions}" />
+        <CollectionViewSource x:Name="KeyDerivations" Source="{Binding KeyDerivations}" />
     </Page.Resources>
     <Page.DataContext>
         <viewModels:SettingsDatabaseVm />
@@ -22,5 +23,7 @@
         <ComboBox ItemsSource="{Binding Source={StaticResource Ciphers}}" SelectedIndex="{Binding CipherIndex, Mode=TwoWay}" />
         <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}" />
     </StackPanel>
 </Page>
diff --git a/ModernKeePass/ViewModels/SettingsDatabaseVm.cs b/ModernKeePass/ViewModels/SettingsDatabaseVm.cs
index ff67b3b..3eabd6e 100644
--- a/ModernKeePass/ViewModels/SettingsDatabaseVm.cs
+++ b/ModernKeePass/ViewModels/SettingsDatabaseVm.cs
@@ -8,6 +8,7 @@ using ModernKeePass.Common;
 using ModernKeePass.Interfaces;
 using ModernKeePassLib;
 using ModernKeePassLib.Cryptography.Cipher;
+using ModernKeePassLib.Cryptography.KeyDerivation;
 
 namespace ModernKeePass.ViewModels
 {
@@ -60,6 +61,13 @@ namespace ModernKeePass.ViewModels
             get { return Enum.GetName(typeof(PwCompressionAlgorithm), _app.Database.CompressionAlgorithm); }
             set { _app.Database.CompressionAlgorithm = (PwCompressionAlgorithm)Enum.Parse(typeof(PwCompressionAlgorithm), value); }
         }
+        public IEnumerable<string> KeyDerivations => KdfPool.Engines.Select(e => e.Name);
+
+        public string KeyDerivationName
+        {
+            get { return KdfPool.Get(_app.Database.KeyDerivation.KdfUuid).Name; }
+            set { _app.Database.KeyDerivation = KdfPool.Engines.FirstOrDefault(e => e.Name == value)?.GetDefaultParameters(); } 
+        }
 
         public ISelectableModel SelectedItem
         {
diff --git a/ModernKeePassLib.Test/Cryptography/Hash/HmacTests.cs b/ModernKeePassLib.Test/Cryptography/Hash/HmacTests.cs
index ebcd198..52648c6 100644
--- a/ModernKeePassLib.Test/Cryptography/Hash/HmacTests.cs
+++ b/ModernKeePassLib.Test/Cryptography/Hash/HmacTests.cs
@@ -44,6 +44,41 @@ namespace ModernKeePassLib.Test.Cryptography.Hash
             HmacEval(pbKey, pbMsg, pbExpc);
         }
 
+        [Test]
+        public void TestHmacSha1ComputeHash()
+        {
+            var expectedHash = "AC2C2E614882CE7158F69B7E3B12114465945D01";
+            var message = StrUtil.Utf8.GetBytes("testing123");
+            var key = StrUtil.Utf8.GetBytes("hello");
+            using (var result = new HMACSHA1(key))
+            {
+                Assert.That(ByteToString(result.ComputeHash(message)), Is.EqualTo(expectedHash));
+            }
+        }
+
+        [Test]
+        public void TestHmacSha256ComputeHash()
+        {
+            var expectedHash = "09C1BD2DE4E5659C0EFAF9E6AE4723E9CF96B69609B4E562F6AFF1745D7BF4E0";
+            var message = StrUtil.Utf8.GetBytes("testing123");
+            var key = StrUtil.Utf8.GetBytes("hello");
+            using (var result = new HMACSHA256(key))
+            {
+                Assert.That(ByteToString(result.ComputeHash(message)), Is.EqualTo(expectedHash));
+            }
+        }
+
+        public static string ByteToString(byte[] buff)
+        {
+            string sbinary = "";
+
+            for (int i = 0; i < buff.Length; i++)
+            {
+                sbinary += buff[i].ToString("X2"); // hex format
+            }
+            return (sbinary);
+        }
+
         [Test]
         public void TestHmacOtp()
         {
diff --git a/ModernKeePassLib.Test/ModernKeePassLib.Test.csproj b/ModernKeePassLib.Test/ModernKeePassLib.Test.csproj
index 30b8dfe..ce8e718 100644
--- a/ModernKeePassLib.Test/ModernKeePassLib.Test.csproj
+++ b/ModernKeePassLib.Test/ModernKeePassLib.Test.csproj
@@ -72,6 +72,7 @@
     <Compile Include="Serialization\HashedBlockStreamTests.cs" />
     <Compile Include="Serialization\KdbxFileTests.cs" />
     <Compile Include="Utility\GfxUtilTests.cs" />
+    <Compile Include="Utility\MemUtilTests.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
diff --git a/ModernKeePassLib.Test/Utility/MemUtilTests.cs b/ModernKeePassLib.Test/Utility/MemUtilTests.cs
new file mode 100644
index 0000000..f57ee2c
--- /dev/null
+++ b/ModernKeePassLib.Test/Utility/MemUtilTests.cs
@@ -0,0 +1,89 @@
+using System.Text;
+using ModernKeePassLib.Cryptography;
+using ModernKeePassLib.Utility;
+using NUnit.Framework;
+
+namespace ModernKeePassLib.Test.Utility
+{
+    [TestFixture]
+    public class MemUtilTests
+    {
+        private byte[] _pb = CryptoRandom.Instance.GetRandomBytes((uint)CryptoRandom.NewWeakRandom().Next(0, 0x2FFFF));
+
+        [Test]
+        public void TestGzip()
+        {
+            var pbCompressed = MemUtil.Compress(_pb);
+            Assert.That(MemUtil.ArraysEqual(MemUtil.Decompress(pbCompressed), _pb), Is.True);
+        }
+
+        [Test]
+        public void TestMemUtil()
+        {
+            Encoding enc = StrUtil.Utf8;
+            _pb = enc.GetBytes("012345678901234567890a");
+            byte[] pbN = enc.GetBytes("9012");
+            Assert.That(MemUtil.IndexOf(_pb, pbN), Is.EqualTo(9));
+
+            pbN = enc.GetBytes("01234567890123");
+            Assert.That(MemUtil.IndexOf(_pb, pbN), Is.EqualTo(0));
+
+            pbN = enc.GetBytes("a");
+            Assert.That(MemUtil.IndexOf(_pb, pbN), Is.EqualTo(21));
+
+            pbN = enc.GetBytes("0a");
+            Assert.That(MemUtil.IndexOf(_pb, pbN), Is.EqualTo(20));
+
+            pbN = enc.GetBytes("1");
+            Assert.That(MemUtil.IndexOf(_pb, pbN), Is.EqualTo(1));
+
+            pbN = enc.GetBytes("b");
+            Assert.That(MemUtil.IndexOf(_pb, pbN), Is.LessThan(0));
+
+            pbN = enc.GetBytes("012b");
+            Assert.That(MemUtil.IndexOf(_pb, pbN), Is.LessThan(0));
+        }
+
+        [Test]
+        public void TestBase32()
+        {
+            byte[] pbRes = MemUtil.ParseBase32("MY======");
+            byte[] pbExp = Encoding.UTF8.GetBytes("f");
+            Assert.That(MemUtil.ArraysEqual(pbRes, pbExp), Is.True);
+
+            pbRes = MemUtil.ParseBase32("MZXQ====");
+            pbExp = Encoding.UTF8.GetBytes("fo");
+            Assert.That(MemUtil.ArraysEqual(pbRes, pbExp), Is.True);
+
+            pbRes = MemUtil.ParseBase32("MZXW6===");
+            pbExp = Encoding.UTF8.GetBytes("foo");
+            Assert.That(MemUtil.ArraysEqual(pbRes, pbExp), Is.True);
+
+            pbRes = MemUtil.ParseBase32("MZXW6YQ=");
+            pbExp = Encoding.UTF8.GetBytes("foob");
+            Assert.That(MemUtil.ArraysEqual(pbRes, pbExp), Is.True);
+
+            pbRes = MemUtil.ParseBase32("MZXW6YTB");
+            pbExp = Encoding.UTF8.GetBytes("fooba");
+            Assert.That(MemUtil.ArraysEqual(pbRes, pbExp), Is.True);
+
+            pbRes = MemUtil.ParseBase32("MZXW6YTBOI======");
+            pbExp = Encoding.UTF8.GetBytes("foobar");
+            Assert.That(MemUtil.ArraysEqual(pbRes, pbExp), Is.True);
+
+            pbRes = MemUtil.ParseBase32("JNSXSIDQOJXXM2LEMVZCAYTBONSWIIDPNYQG63TFFV2GS3LFEBYGC43TO5XXEZDTFY======");
+            pbExp = Encoding.UTF8.GetBytes("Key provider based on one-time passwords.");
+            Assert.That(MemUtil.ArraysEqual(pbRes, pbExp), Is.True);
+        }
+
+        [Test]
+        public void TestMemUtil2()
+        { 
+            var i = 0 - 0x10203040;
+            var pbRes = MemUtil.Int32ToBytes(i);
+            Assert.That(MemUtil.ByteArrayToHexString(pbRes), Is.EqualTo("C0CFDFEF"));
+            Assert.That(MemUtil.BytesToUInt32(pbRes), Is.EqualTo((uint)i));
+            Assert.That(MemUtil.BytesToInt32(pbRes), Is.EqualTo(i));
+        }
+    }
+}
\ No newline at end of file
diff --git a/ModernKeePassLib.Test/app.config b/ModernKeePassLib.Test/app.config
index 8f23061..9d20672 100644
--- a/ModernKeePassLib.Test/app.config
+++ b/ModernKeePassLib.Test/app.config
@@ -16,7 +16,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Runtime.WindowsRuntime" publicKeyToken="b77a5c561934e089" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.10.0" newVersion="4.0.10.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/ModernKeePassLib/Serialization/BinaryReaderEx.cs b/ModernKeePassLib/Serialization/BinaryReaderEx.cs
index deef447..757515a 100644
--- a/ModernKeePassLib/Serialization/BinaryReaderEx.cs
+++ b/ModernKeePassLib/Serialization/BinaryReaderEx.cs
@@ -75,7 +75,7 @@ namespace ModernKeePassLib.Serialization
 				if(m_sCopyTo != null) m_sCopyTo.Write(pb, 0, pb.Length);
 				return pb;
 			}
-			catch(Exception)
+			catch(Exception ex)
 			{
 				if(!string.IsNullOrEmpty(m_strReadExcp))
 					throw new IOException(m_strReadExcp);
diff --git a/ModernKeePassLib/Utility/MemUtil.cs b/ModernKeePassLib/Utility/MemUtil.cs
index 18ea610..9883115 100644
--- a/ModernKeePassLib/Utility/MemUtil.cs
+++ b/ModernKeePassLib/Utility/MemUtil.cs
@@ -249,8 +249,8 @@ namespace ModernKeePassLib.Utility
 		/// <summary>
 		/// Set all bytes in a byte array to zero.
 		/// </summary>
-		/// <param name="pbArray">Input array. All bytes of this array will be set
-		/// to zero.</param>
+		/// <param name="pbArray">Input array. All bytes of this array
+		/// will be set to zero.</param>
 		public static void ZeroByteArray(byte[] pbArray)
 		{
 			Debug.Assert(pbArray != null);
diff --git a/ModernKeePassLib/Utility/StrUtil.cs b/ModernKeePassLib/Utility/StrUtil.cs
index a29cf4a..3d1216b 100644
--- a/ModernKeePassLib/Utility/StrUtil.cs
+++ b/ModernKeePassLib/Utility/StrUtil.cs
@@ -20,17 +20,18 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Text;
+using System.Diagnostics;
 using System.Drawing;
+using System.Globalization;
 using System.IO;
+using System.Text;
 using System.Text.RegularExpressions;
+
 #if ModernKeePassLib
 using Windows.Security.Cryptography;
 #else
 using System.Security.Cryptography;
 #endif
-using System.Globalization;
-using System.Diagnostics;
 
 using ModernKeePassLib.Collections;
 using ModernKeePassLib.Cryptography.PasswordGenerator;