diff --git a/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU.appxupload b/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU.appxupload new file mode 100644 index 0000000..56d375c Binary files /dev/null and b/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU.appxupload differ diff --git a/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/Add-AppDevPackage.ps1 b/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/Add-AppDevPackage.ps1 new file mode 100644 index 0000000..9b62097 Binary files /dev/null and b/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/Add-AppDevPackage.ps1 differ diff --git a/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/Add-AppDevPackage.resources/Add-AppDevPackage.psd1 b/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/Add-AppDevPackage.resources/Add-AppDevPackage.psd1 new file mode 100644 index 0000000..e2fe6f3 Binary files /dev/null and b/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/Add-AppDevPackage.resources/Add-AppDevPackage.psd1 differ diff --git a/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/Add-AppDevPackage.resources/cs-CZ/Add-AppDevPackage.psd1 b/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/Add-AppDevPackage.resources/cs-CZ/Add-AppDevPackage.psd1 new file mode 100644 index 0000000..d973be2 Binary files /dev/null and b/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/Add-AppDevPackage.resources/cs-CZ/Add-AppDevPackage.psd1 differ diff --git a/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/Add-AppDevPackage.resources/de-DE/Add-AppDevPackage.psd1 b/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/Add-AppDevPackage.resources/de-DE/Add-AppDevPackage.psd1 new file mode 100644 index 0000000..1923822 Binary files /dev/null and b/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/Add-AppDevPackage.resources/de-DE/Add-AppDevPackage.psd1 differ diff --git a/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/Add-AppDevPackage.resources/en-US/Add-AppDevPackage.psd1 b/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/Add-AppDevPackage.resources/en-US/Add-AppDevPackage.psd1 new file mode 100644 index 0000000..e2fe6f3 Binary files /dev/null and b/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/Add-AppDevPackage.resources/en-US/Add-AppDevPackage.psd1 differ diff --git a/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/Add-AppDevPackage.resources/es-ES/Add-AppDevPackage.psd1 b/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/Add-AppDevPackage.resources/es-ES/Add-AppDevPackage.psd1 new file mode 100644 index 0000000..aca49f4 Binary files /dev/null and b/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/Add-AppDevPackage.resources/es-ES/Add-AppDevPackage.psd1 differ diff --git a/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/Add-AppDevPackage.resources/fr-FR/Add-AppDevPackage.psd1 b/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/Add-AppDevPackage.resources/fr-FR/Add-AppDevPackage.psd1 new file mode 100644 index 0000000..41c39b8 Binary files /dev/null and b/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/Add-AppDevPackage.resources/fr-FR/Add-AppDevPackage.psd1 differ diff --git a/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/Add-AppDevPackage.resources/it-IT/Add-AppDevPackage.psd1 b/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/Add-AppDevPackage.resources/it-IT/Add-AppDevPackage.psd1 new file mode 100644 index 0000000..6098731 Binary files /dev/null and b/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/Add-AppDevPackage.resources/it-IT/Add-AppDevPackage.psd1 differ diff --git a/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/Add-AppDevPackage.resources/ja-JP/Add-AppDevPackage.psd1 b/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/Add-AppDevPackage.resources/ja-JP/Add-AppDevPackage.psd1 new file mode 100644 index 0000000..0fd1ae5 Binary files /dev/null and b/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/Add-AppDevPackage.resources/ja-JP/Add-AppDevPackage.psd1 differ diff --git a/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/Add-AppDevPackage.resources/ko-KR/Add-AppDevPackage.psd1 b/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/Add-AppDevPackage.resources/ko-KR/Add-AppDevPackage.psd1 new file mode 100644 index 0000000..ddf7140 Binary files /dev/null and b/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/Add-AppDevPackage.resources/ko-KR/Add-AppDevPackage.psd1 differ diff --git a/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/Add-AppDevPackage.resources/pl-PL/Add-AppDevPackage.psd1 b/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/Add-AppDevPackage.resources/pl-PL/Add-AppDevPackage.psd1 new file mode 100644 index 0000000..191b915 Binary files /dev/null and b/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/Add-AppDevPackage.resources/pl-PL/Add-AppDevPackage.psd1 differ diff --git a/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/Add-AppDevPackage.resources/pt-BR/Add-AppDevPackage.psd1 b/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/Add-AppDevPackage.resources/pt-BR/Add-AppDevPackage.psd1 new file mode 100644 index 0000000..e8cc86c Binary files /dev/null and b/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/Add-AppDevPackage.resources/pt-BR/Add-AppDevPackage.psd1 differ diff --git a/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/Add-AppDevPackage.resources/ru-RU/Add-AppDevPackage.psd1 b/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/Add-AppDevPackage.resources/ru-RU/Add-AppDevPackage.psd1 new file mode 100644 index 0000000..2c1dd5b Binary files /dev/null and b/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/Add-AppDevPackage.resources/ru-RU/Add-AppDevPackage.psd1 differ diff --git a/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/Add-AppDevPackage.resources/tr-TR/Add-AppDevPackage.psd1 b/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/Add-AppDevPackage.resources/tr-TR/Add-AppDevPackage.psd1 new file mode 100644 index 0000000..4fb2b07 Binary files /dev/null and b/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/Add-AppDevPackage.resources/tr-TR/Add-AppDevPackage.psd1 differ diff --git a/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/Add-AppDevPackage.resources/zh-CN/Add-AppDevPackage.psd1 b/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/Add-AppDevPackage.resources/zh-CN/Add-AppDevPackage.psd1 new file mode 100644 index 0000000..dd32ec3 Binary files /dev/null and b/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/Add-AppDevPackage.resources/zh-CN/Add-AppDevPackage.psd1 differ diff --git a/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/Add-AppDevPackage.resources/zh-TW/Add-AppDevPackage.psd1 b/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/Add-AppDevPackage.resources/zh-TW/Add-AppDevPackage.psd1 new file mode 100644 index 0000000..162d707 Binary files /dev/null and b/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/Add-AppDevPackage.resources/zh-TW/Add-AppDevPackage.psd1 differ diff --git a/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/ModernKeePass_1.1.0.0_AnyCPU.appx b/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/ModernKeePass_1.1.0.0_AnyCPU.appx new file mode 100644 index 0000000..fd89064 Binary files /dev/null and b/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/ModernKeePass_1.1.0.0_AnyCPU.appx differ diff --git a/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/ModernKeePass_1.1.0.0_AnyCPU.appxsym b/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/ModernKeePass_1.1.0.0_AnyCPU.appxsym new file mode 100644 index 0000000..dc66eea Binary files /dev/null and b/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/ModernKeePass_1.1.0.0_AnyCPU.appxsym differ diff --git a/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/ModernKeePass_1.1.0.0_AnyCPU.cer b/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/ModernKeePass_1.1.0.0_AnyCPU.cer new file mode 100644 index 0000000..4daf727 Binary files /dev/null and b/ModernKeePass/AppPackages/ModernKeePass_1.1.0.0_AnyCPU_Test/ModernKeePass_1.1.0.0_AnyCPU.cer differ diff --git a/ModernKeePass/ModernKeePass.csproj b/ModernKeePass/ModernKeePass.csproj index 7a8eae7..12452e7 100644 --- a/ModernKeePass/ModernKeePass.csproj +++ b/ModernKeePass/ModernKeePass.csproj @@ -14,9 +14,12 @@ 12 512 {BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - ModernKeePass_TemporaryKey.pfx + ModernKeePass_StoreKey.pfx + ED3AA34F46D03498F989901C5DB2742B65D72F60 + True + neutral AnyCPU @@ -129,6 +132,7 @@ Designer + @@ -137,6 +141,7 @@ + diff --git a/ModernKeePass/Package.StoreAssociation.xml b/ModernKeePass/Package.StoreAssociation.xml new file mode 100644 index 0000000..860d03a --- /dev/null +++ b/ModernKeePass/Package.StoreAssociation.xml @@ -0,0 +1,368 @@ + + + CN=0719A91A-C322-4EE0-A257-E60733EECF06 + wismna + http://www.w3.org/2001/04/xmlenc#sha256 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + wismna.ModernKeePass + + ModernKeePass + + + + + \ No newline at end of file diff --git a/ModernKeePass/Package.appxmanifest b/ModernKeePass/Package.appxmanifest index bb79302..072f094 100644 --- a/ModernKeePass/Package.appxmanifest +++ b/ModernKeePass/Package.appxmanifest @@ -1,9 +1,9 @@  - + ModernKeePass - Wismna + wismna Assets\StoreLogo.png diff --git a/ModernKeePassLib/ModernKeePassLib.nuspec b/ModernKeePassLib/ModernKeePassLib.nuspec index a7f0ea5..50de2a1 100644 --- a/ModernKeePassLib/ModernKeePassLib.nuspec +++ b/ModernKeePassLib/ModernKeePassLib.nuspec @@ -2,7 +2,7 @@ ModernKeePassLib - 2.19.2940 + 2.19.2950 ModernKeePassLib Geoffroy Bonneville Geoffroy Bonneville diff --git a/ModernKeePassLib/Native/NativeLib.cs b/ModernKeePassLib/Native/NativeLib.cs index 31faabd..bce5077 100644 --- a/ModernKeePassLib/Native/NativeLib.cs +++ b/ModernKeePassLib/Native/NativeLib.cs @@ -172,12 +172,12 @@ namespace ModernKeePassLib.Native KeyValuePair kvp = PrepareArrays256(pBuf256, pKey256); bool bResult = false; - try + /*try { bResult = NativeMethods.TransformKey(kvp.Key, kvp.Value, uRounds); } catch(Exception) { bResult = false; } - + */ if(bResult) GetBuffers256(kvp, pBuf256, pKey256); NativeLib.FreeArrays(kvp); @@ -196,8 +196,8 @@ namespace ModernKeePassLib.Native if(m_bAllowNative == false) return false; - try { puRounds = NativeMethods.TransformKeyBenchmark(uTimeMs); } - catch(Exception) { return false; } + /*try { puRounds = NativeMethods.TransformKeyBenchmark(uTimeMs); } + catch(Exception) { return false; }*/ return true; } diff --git a/ModernKeePassLib/Native/NativeMethods.cs b/ModernKeePassLib/Native/NativeMethods.cs index 3378e01..a8bd252 100644 --- a/ModernKeePassLib/Native/NativeMethods.cs +++ b/ModernKeePassLib/Native/NativeMethods.cs @@ -65,7 +65,7 @@ namespace ModernKeePassLib.Native else return TransformKeyTimed32(pBuf256, pKey256, ref puRounds, uSeconds); } */ - + /* [DllImport("KeePassLibC32.dll", EntryPoint = "TransformKey256")] [return: MarshalAs(UnmanagedType.Bool)] private static extern bool TransformKey32(IntPtr pBuf256, @@ -75,7 +75,7 @@ namespace ModernKeePassLib.Native [return: MarshalAs(UnmanagedType.Bool)] private static extern bool TransformKey64(IntPtr pBuf256, IntPtr pKey256, UInt64 uRounds); - + internal static bool TransformKey(IntPtr pBuf256, IntPtr pKey256, UInt64 uRounds) { @@ -98,7 +98,7 @@ namespace ModernKeePassLib.Native else return TransformKeyBenchmark32(uTimeMs); } - + */ #if !KeePassLibSD && TODO [DllImport("ShlWApi.dll", CharSet = CharSet.Unicode, ExactSpelling = true)] internal static extern int StrCmpLogicalW(string x, string y);