From 22ea657885d4a9655f3375602c834e9523dc65b6 Mon Sep 17 00:00:00 2001 From: Geoffroy Bonneville Date: Mon, 25 Sep 2017 18:34:27 +0200 Subject: [PATCH] Added unit tests (all passing unfortunately) UI improvements Write mode still doesn't work --- .../KeePass2PCL.Test.Desktop.csproj | 102 ++++++++++ KeePass2PCL.Test.Desktop/app.config | 19 ++ KeePass2PCL.Test.Desktop/packages.config | 18 ++ .../Cipher/StandardAesEngineTests.cs | 65 +++++++ .../Cryptography/CryptoRandomStreamTests.cs | 60 ++++++ .../Cryptography/CryptoRandomTests.cs | 44 +++++ .../Cryptography/HashingStreamExTests.cs | 77 ++++++++ .../Cryptography/HmacOtpTests.cs | 36 ++++ .../KeePass2PCL.Test.Shared.projitems | 30 +++ .../KeePass2PCL.Test.Shared.shproj | 11 ++ .../Keys/CompositeKeyTests.cs | 34 ++++ .../Keys/KcpCustomKeyTests.cs | 39 ++++ .../Keys/KcpKeyFileTests.cs | 76 ++++++++ .../Keys/KcpPasswordTests.cs | 33 ++++ KeePass2PCL.Test.Shared/MyClass.cs | 12 ++ .../Serialization/HashedBlockStreamTests.cs | 71 +++++++ .../Serialization/KdbxFileTests.cs | 181 +++++++++++++++++ .../Utility/GfxUtilTests.cs | 32 +++ .../Assets/LockScreenLogo.scale-200.png | Bin 0 -> 1430 bytes .../Assets/SplashScreen.scale-200.png | Bin 0 -> 7700 bytes .../Assets/Square150x150Logo.scale-200.png | Bin 0 -> 2937 bytes .../Assets/Square44x44Logo.scale-200.png | Bin 0 -> 1647 bytes ...x44Logo.targetsize-24_altform-unplated.png | Bin 0 -> 1255 bytes KeePass2PCL.Test.UWP/Assets/StoreLogo.png | Bin 0 -> 1451 bytes .../Assets/Wide310x150Logo.scale-200.png | Bin 0 -> 3204 bytes .../KeePass2PCL.Test.UWP.csproj | 172 +++++++++++++++++ .../KeePass2PCL.Test.UWP_TemporaryKey.pfx | Bin 0 -> 2504 bytes KeePass2PCL.Test.UWP/Package.appxmanifest | 45 +++++ .../Properties/AssemblyInfo.cs | 18 ++ .../Properties/UnitTestApp.rd.xml | 29 +++ KeePass2PCL.Test.UWP/PwDatabaseTests.cs | 117 +++++++++++ KeePass2PCL.Test.UWP/TestData/1.kdbx | Bin 0 -> 1134 bytes KeePass2PCL.Test.UWP/TestData/1.key | 9 + KeePass2PCL.Test.UWP/TestData/1key.kdbx | Bin 0 -> 1838 bytes KeePass2PCL.Test.UWP/UnitTestApp.xaml | 8 + KeePass2PCL.Test.UWP/UnitTestApp.xaml.cs | 102 ++++++++++ .../KeePass2PCL.Test.KeePassLib.csproj | 65 +++++++ KeePass2PCL.Test/app.config | 11 ++ KeePass2PCL.Test/packages.config | 8 + ModernKeePass.sln | 18 ++ ModernKeePass/Common/DatabaseHelper.cs | 7 +- ModernKeePass/MainPage.xaml | 5 +- ModernKeePass/MainPage.xaml.cs | 15 +- ModernKeePass/ModernKeePass.csproj | 4 +- ModernKeePass/Pages/GroupDetailPage.xaml | 4 +- ModernKeePass/Pages/GroupDetailPage.xaml.cs | 6 - ModernKeePass/ViewModels/EntryVm.cs | 2 +- ModernKeePass/ViewModels/GroupVm.cs | 31 +-- ModernKeePass/ViewModels/HomeVm.cs | 1 + ModernKeePass/packages.config | 2 +- .../Cipher/StandardAesEngineTests.cs | 65 +++++++ .../Cryptography/CryptoRandomStreamTests.cs | 60 ++++++ .../Cryptography/CryptoRandomTests.cs | 44 +++++ .../Cryptography/HashingStreamExTests.cs | 77 ++++++++ .../Cryptography/HmacOtpTests.cs | 36 ++++ .../Keys/CompositeKeyTests.cs | 34 ++++ .../Keys/KcpCustomKeyTests.cs | 39 ++++ ModernKeePassLib.Test/Keys/KcpKeyFileTests.cs | 76 ++++++++ .../Keys/KcpPasswordTests.cs | 33 ++++ .../ModernKeePassLib.Test.csproj | 124 ++++++++++++ .../Properties/AssemblyInfo.cs | 36 ++++ .../Serialization/HashedBlockStreamTests.cs | 71 +++++++ .../Serialization/KdbxFileTests.cs | 182 ++++++++++++++++++ ModernKeePassLib.Test/Utility/GfxUtilTests.cs | 32 +++ ModernKeePassLib.Test/app.config | 19 ++ ModernKeePassLib.Test/packages.config | 15 ++ ModernKeePassLib/Keys/KcpKeyFile.cs | 8 +- ModernKeePassLib/PwDatabase.cs | 8 +- ModernKeePassLib/Serialization/FileLock.cs | 12 +- .../Serialization/FileTransactionEx.cs | 4 +- .../Serialization/IOConnection.cs | 28 +-- .../Serialization/KdbxFile.Read.cs | 4 +- 72 files changed, 2563 insertions(+), 63 deletions(-) create mode 100644 KeePass2PCL.Test.Desktop/KeePass2PCL.Test.Desktop.csproj create mode 100644 KeePass2PCL.Test.Desktop/app.config create mode 100644 KeePass2PCL.Test.Desktop/packages.config create mode 100644 KeePass2PCL.Test.Shared/Cryptography/Cipher/StandardAesEngineTests.cs create mode 100644 KeePass2PCL.Test.Shared/Cryptography/CryptoRandomStreamTests.cs create mode 100644 KeePass2PCL.Test.Shared/Cryptography/CryptoRandomTests.cs create mode 100644 KeePass2PCL.Test.Shared/Cryptography/HashingStreamExTests.cs create mode 100644 KeePass2PCL.Test.Shared/Cryptography/HmacOtpTests.cs create mode 100644 KeePass2PCL.Test.Shared/KeePass2PCL.Test.Shared.projitems create mode 100644 KeePass2PCL.Test.Shared/KeePass2PCL.Test.Shared.shproj create mode 100644 KeePass2PCL.Test.Shared/Keys/CompositeKeyTests.cs create mode 100644 KeePass2PCL.Test.Shared/Keys/KcpCustomKeyTests.cs create mode 100644 KeePass2PCL.Test.Shared/Keys/KcpKeyFileTests.cs create mode 100644 KeePass2PCL.Test.Shared/Keys/KcpPasswordTests.cs create mode 100644 KeePass2PCL.Test.Shared/MyClass.cs create mode 100644 KeePass2PCL.Test.Shared/Serialization/HashedBlockStreamTests.cs create mode 100644 KeePass2PCL.Test.Shared/Serialization/KdbxFileTests.cs create mode 100644 KeePass2PCL.Test.Shared/Utility/GfxUtilTests.cs create mode 100644 KeePass2PCL.Test.UWP/Assets/LockScreenLogo.scale-200.png create mode 100644 KeePass2PCL.Test.UWP/Assets/SplashScreen.scale-200.png create mode 100644 KeePass2PCL.Test.UWP/Assets/Square150x150Logo.scale-200.png create mode 100644 KeePass2PCL.Test.UWP/Assets/Square44x44Logo.scale-200.png create mode 100644 KeePass2PCL.Test.UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png create mode 100644 KeePass2PCL.Test.UWP/Assets/StoreLogo.png create mode 100644 KeePass2PCL.Test.UWP/Assets/Wide310x150Logo.scale-200.png create mode 100644 KeePass2PCL.Test.UWP/KeePass2PCL.Test.UWP.csproj create mode 100644 KeePass2PCL.Test.UWP/KeePass2PCL.Test.UWP_TemporaryKey.pfx create mode 100644 KeePass2PCL.Test.UWP/Package.appxmanifest create mode 100644 KeePass2PCL.Test.UWP/Properties/AssemblyInfo.cs create mode 100644 KeePass2PCL.Test.UWP/Properties/UnitTestApp.rd.xml create mode 100644 KeePass2PCL.Test.UWP/PwDatabaseTests.cs create mode 100644 KeePass2PCL.Test.UWP/TestData/1.kdbx create mode 100644 KeePass2PCL.Test.UWP/TestData/1.key create mode 100644 KeePass2PCL.Test.UWP/TestData/1key.kdbx create mode 100644 KeePass2PCL.Test.UWP/UnitTestApp.xaml create mode 100644 KeePass2PCL.Test.UWP/UnitTestApp.xaml.cs create mode 100644 KeePass2PCL.Test/KeePass2PCL.Test.KeePassLib.csproj create mode 100644 KeePass2PCL.Test/app.config create mode 100644 KeePass2PCL.Test/packages.config create mode 100644 ModernKeePassLib.Test/Cryptography/Cipher/StandardAesEngineTests.cs create mode 100644 ModernKeePassLib.Test/Cryptography/CryptoRandomStreamTests.cs create mode 100644 ModernKeePassLib.Test/Cryptography/CryptoRandomTests.cs create mode 100644 ModernKeePassLib.Test/Cryptography/HashingStreamExTests.cs create mode 100644 ModernKeePassLib.Test/Cryptography/HmacOtpTests.cs create mode 100644 ModernKeePassLib.Test/Keys/CompositeKeyTests.cs create mode 100644 ModernKeePassLib.Test/Keys/KcpCustomKeyTests.cs create mode 100644 ModernKeePassLib.Test/Keys/KcpKeyFileTests.cs create mode 100644 ModernKeePassLib.Test/Keys/KcpPasswordTests.cs create mode 100644 ModernKeePassLib.Test/ModernKeePassLib.Test.csproj create mode 100644 ModernKeePassLib.Test/Properties/AssemblyInfo.cs create mode 100644 ModernKeePassLib.Test/Serialization/HashedBlockStreamTests.cs create mode 100644 ModernKeePassLib.Test/Serialization/KdbxFileTests.cs create mode 100644 ModernKeePassLib.Test/Utility/GfxUtilTests.cs create mode 100644 ModernKeePassLib.Test/app.config create mode 100644 ModernKeePassLib.Test/packages.config diff --git a/KeePass2PCL.Test.Desktop/KeePass2PCL.Test.Desktop.csproj b/KeePass2PCL.Test.Desktop/KeePass2PCL.Test.Desktop.csproj new file mode 100644 index 0000000..e7ca24b --- /dev/null +++ b/KeePass2PCL.Test.Desktop/KeePass2PCL.Test.Desktop.csproj @@ -0,0 +1,102 @@ + + + + + Debug + AnyCPU + {0BD8B544-EB60-461F-9A71-605A6DFCBB19} + Library + KeePass2PCL.Test.Desktop + KeePass2PCL.Test.Desktop + v4.5 + + + + + true + full + false + bin\Debug + DEBUG; + prompt + 4 + false + + + full + true + bin\Release + prompt + 4 + false + + + + ..\packages\Castle.Core.4.1.1\lib\net45\Castle.Core.dll + + + + + ..\packages\Moq.4.7.99\lib\net45\Moq.dll + + + ..\packages\NUnit.3.7.1\lib\net45\nunit.framework.dll + + + ..\packages\PCLCrypto.2.0.147\lib\net45\PCLCrypto.dll + + + ..\packages\PInvoke.BCrypt.0.5.97\lib\net45\PInvoke.BCrypt.dll + + + ..\packages\PInvoke.Kernel32.0.5.97\lib\net45\PInvoke.Kernel32.dll + + + ..\packages\PInvoke.NCrypt.0.5.97\lib\net45\PInvoke.NCrypt.dll + + + ..\packages\PInvoke.Windows.Core.0.5.97\lib\net35\PInvoke.Windows.Core.dll + + + ..\packages\Splat.GtkSharp.1.6.2\lib\net45\Splat.dll + + + + ..\packages\PCLStorage.1.0.2\lib\net45\PCLStorage.dll + + + ..\packages\PCLStorage.1.0.2\lib\net45\PCLStorage.Abstractions.dll + + + ..\packages\Mono.Security.3.2.3.0\lib\net45\Mono.Security.dll + + + + + ..\packages\Validation.2.4.15\lib\net45\Validation.dll + + + + + + + + + + + + + + {2e710089-9559-4967-846c-e763dd1f3acb} + KeePass2PCL + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + \ No newline at end of file diff --git a/KeePass2PCL.Test.Desktop/app.config b/KeePass2PCL.Test.Desktop/app.config new file mode 100644 index 0000000..6d631fa --- /dev/null +++ b/KeePass2PCL.Test.Desktop/app.config @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/KeePass2PCL.Test.Desktop/packages.config b/KeePass2PCL.Test.Desktop/packages.config new file mode 100644 index 0000000..57fbffd --- /dev/null +++ b/KeePass2PCL.Test.Desktop/packages.config @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/KeePass2PCL.Test.Shared/Cryptography/Cipher/StandardAesEngineTests.cs b/KeePass2PCL.Test.Shared/Cryptography/Cipher/StandardAesEngineTests.cs new file mode 100644 index 0000000..b248752 --- /dev/null +++ b/KeePass2PCL.Test.Shared/Cryptography/Cipher/StandardAesEngineTests.cs @@ -0,0 +1,65 @@ +using System; +using System.IO; + +#if KeePassLib +using KeePassLib.Cryptography.Cipher; +#else +using KeePass2PCL.Cryptography.Cipher; +#endif + +using NUnit.Framework; + +namespace KeePass2PCL.Test.Shared.Cryptography.Cipher +{ + [TestFixture ()] + public class StandardAesEngineTests + { + [Test ()] + public void TestEncryptStream () + { + // Test vector (official ECB test vector #356) + var pbIV = new byte[16]; + var pbTestKey = new byte[32]; + var pbTestData = new byte[16]; + var pbReferenceCT = new byte[16] { + 0x75, 0xD1, 0x1B, 0x0E, 0x3A, 0x68, 0xC4, 0x22, + 0x3D, 0x88, 0xDB, 0xF0, 0x17, 0x97, 0x7D, 0xD7 + }; + + pbTestData[0] = 0x04; + + var outStream = new MemoryStream (new byte[16]); + var aes = new StandardAesEngine (); + var inStream = aes.EncryptStream (outStream, pbTestKey, pbIV); + new BinaryWriter (inStream).Write (pbTestData); + Assert.That (outStream.Position, Is.EqualTo (16)); + outStream.Position = 0; + var outBytes = new BinaryReader (outStream).ReadBytes (16); + Assert.That(outBytes, Is.EqualTo (pbReferenceCT)); + } + + [Test ()] + public void TestDecryptStream () + { + // Test vector (official ECB test vector #356) + var pbIV = new byte[16]; + var pbTestKey = new byte[32]; + var pbTestData = new byte[16]; + var pbReferenceCT = new byte[16] { + 0x75, 0xD1, 0x1B, 0x0E, 0x3A, 0x68, 0xC4, 0x22, + 0x3D, 0x88, 0xDB, 0xF0, 0x17, 0x97, 0x7D, 0xD7 + }; + + pbTestData[0] = 0x04; + + // Possible Mono Bug? This only works with size >= 48 + var inStream = new MemoryStream (new byte[48]); + inStream.Write (pbReferenceCT, 0, pbReferenceCT.Length); + inStream.Position = 0; + var aes = new StandardAesEngine (); + var outStream = aes.DecryptStream (inStream, pbTestKey, pbIV); + var outBytes = new BinaryReader (outStream).ReadBytes (16); + Assert.That(outBytes, Is.EqualTo (pbTestData)); + } + } +} diff --git a/KeePass2PCL.Test.Shared/Cryptography/CryptoRandomStreamTests.cs b/KeePass2PCL.Test.Shared/Cryptography/CryptoRandomStreamTests.cs new file mode 100644 index 0000000..cf585f2 --- /dev/null +++ b/KeePass2PCL.Test.Shared/Cryptography/CryptoRandomStreamTests.cs @@ -0,0 +1,60 @@ +using NUnit.Framework; +using System; + +#if KeePassLib +using KeePassLib.Cryptography; +#else +using ModernKeePassLibPCL.Cryptography; +#endif + +namespace KeePass2PCL.Test.Shared.Cryptography +{ + [TestFixture ()] + public class CryptoRandomStreamTests + { + void TestGetRandomBytes(CryptoRandomStream stream) + { + const uint length = 16; + var bytes1 = stream.GetRandomBytes (length); + Assert.That (bytes1.Length, Is.EqualTo (length)); + var bytes2 = stream.GetRandomBytes (length); + Assert.That (bytes2, Is.Not.EqualTo (bytes1)); + } + + [Test ()] + public void TestGetRandomBytesCrsAlgorithmSalsa20 () + { + var stream = new CryptoRandomStream (CrsAlgorithm.Salsa20, new byte[16]); + TestGetRandomBytes (stream); + } + + [Test ()] + public void TestGetRandomBytesCrsAlgorithmArcFourVariant () + { + var stream = new CryptoRandomStream (CrsAlgorithm.ArcFourVariant, new byte[16]); + TestGetRandomBytes (stream); + } + + void TestGetRandomInt64 (CryptoRandomStream stream) + { + var value1 = stream.GetRandomUInt64 (); + var value2 = stream.GetRandomUInt64 (); + Assert.That (value2, Is.Not.EqualTo (value1)); + } + + [Test ()] + public void TestGetRandomInt64AlgorithmSalsa20 () + { + var stream = new CryptoRandomStream (CrsAlgorithm.Salsa20, new byte[16]); + TestGetRandomInt64 (stream); + } + + [Test ()] + public void TestGetRandomInt64AlgorithmArcFourVariant () + { + var stream = new CryptoRandomStream (CrsAlgorithm.ArcFourVariant, new byte[16]); + TestGetRandomInt64 (stream); + } + } +} + diff --git a/KeePass2PCL.Test.Shared/Cryptography/CryptoRandomTests.cs b/KeePass2PCL.Test.Shared/Cryptography/CryptoRandomTests.cs new file mode 100644 index 0000000..90d8db8 --- /dev/null +++ b/KeePass2PCL.Test.Shared/Cryptography/CryptoRandomTests.cs @@ -0,0 +1,44 @@ +using NUnit.Framework; +using System; + +#if KeePassLib +using KeePassLib.Cryptography; +#else +using KeePass2PCL.Cryptography; +#endif + +namespace KeePass2PCL.Test.Shared.Cryptography +{ + [TestFixture ()] + public class CryptoRandomTests + { + [Test ()] + public void TestAddEntropy () + { + // just making sure it does not throw an exception + CryptoRandom.Instance.AddEntropy (new byte[1]); + } + + [Test ()] + public void TestGetRandomBytes () + { + const int length = 32; + var bytes1 = CryptoRandom.Instance.GetRandomBytes (length); + Assert.That (bytes1.Length, Is.EqualTo (length)); + var bytes2 = CryptoRandom.Instance.GetRandomBytes (length); + Assert.That (bytes2, Is.Not.EqualTo (bytes1)); + } + + [Test ()] + public void TestGeneratedBytesCount () + { + const int length = 1; + CryptoRandom.Instance.GetRandomBytes (length); + var count1 = CryptoRandom.Instance.GeneratedBytesCount; + CryptoRandom.Instance.GetRandomBytes (length); + var count2 = CryptoRandom.Instance.GeneratedBytesCount; + Assert.That (count2, Is.GreaterThan (count1)); + } + } +} + diff --git a/KeePass2PCL.Test.Shared/Cryptography/HashingStreamExTests.cs b/KeePass2PCL.Test.Shared/Cryptography/HashingStreamExTests.cs new file mode 100644 index 0000000..8db9b59 --- /dev/null +++ b/KeePass2PCL.Test.Shared/Cryptography/HashingStreamExTests.cs @@ -0,0 +1,77 @@ +using NUnit.Framework; +using System; +using System.IO; +using System.Text; + +#if KeePassLib +using KeePassLib.Cryptography; +#else +using KeePass2PCL.Cryptography; +#endif + +namespace KeePass2PCL.Test.Shared.Cryptography +{ + [TestFixture ()] + public class HashingStreamExTests + { + const string data = "test"; + + // The expected hash includes the \n added by WriteLine + static readonly byte[] sha256HashOfData = { + 0xf2, 0xca, 0x1b, 0xb6, 0xc7, 0xe9, 0x07, 0xd0, + 0x6d, 0xaf, 0xe4, 0x68, 0x7e, 0x57, 0x9f, 0xce, + 0x76, 0xb3, 0x7e, 0x4e, 0x93, 0xb7, 0x60, 0x50, + 0x22, 0xda, 0x52, 0xe6, 0xcc, 0xc2, 0x6f, 0xd2 + }; + + [Test ()] + public void TestRead () + { + // if we use larger size, StreamReader will read past newline and cause bad hash + var bytes = new byte[data.Length + 1]; + using (var ms = new MemoryStream (bytes)) { + using (var sw = new StreamWriter (ms)) { + // set NewLine to ensure we don't run into cross-platform issues on Windows + sw.NewLine = "\n"; + sw.WriteLine (data); + } + } + using (var ms = new MemoryStream (bytes)) { + using (var hs = new HashingStreamEx (ms, false, null)) { + using (var sr = new StreamReader (hs)) { + var read = sr.ReadLine (); + Assert.That (read, Is.EqualTo (data)); + } + // When the StreamReader is disposed, it calls Dispose on the + //HasingStreamEx, which computes the hash. + Assert.That (hs.Hash, Is.EqualTo (sha256HashOfData)); + } + } + } + + [Test ()] + public void TestWrite () + { + var bytes = new byte[16]; + using (var ms = new MemoryStream (bytes)) { + using (var hs = new HashingStreamEx (ms, true, null)) { + using (var sw = new StreamWriter (hs)) { + // set NewLine to ensure we don't run into cross-platform issues on Windows + sw.NewLine = "\n"; + sw.WriteLine (data); + } + // When the StreamWriter is disposed, it calls Dispose on the + //HasingStreamEx, which computes the hash. + Assert.That (hs.Hash, Is.EqualTo (sha256HashOfData)); + } + } + using (var ms = new MemoryStream (bytes)) { + using (var sr = new StreamReader (ms)) { + var read = sr.ReadLine (); + Assert.That (read, Is.EqualTo (data)); + } + } + } + } +} + diff --git a/KeePass2PCL.Test.Shared/Cryptography/HmacOtpTests.cs b/KeePass2PCL.Test.Shared/Cryptography/HmacOtpTests.cs new file mode 100644 index 0000000..ce3307b --- /dev/null +++ b/KeePass2PCL.Test.Shared/Cryptography/HmacOtpTests.cs @@ -0,0 +1,36 @@ +using NUnit.Framework; +using System; +using System.Text; + +#if KeePassLib +using KeePassLib.Cryptography; +#else +using KeePass2PCL.Cryptography; +#endif + +namespace KeePass2PCL.Test.Shared.Cryptography +{ + [TestFixture ()] + public class HmacOtpTests + { + // Using the test case from Appendix D of RFC 4226 + + const string secret = "12345678901234567890"; + static readonly string[] expectedHOTP = new string[] { + "755224", "287082", "359152", "969429", "338314", + "254676", "287922", "162583", "399871", "520489" + }; + + [Test ()] + public void TestGenerate () + { + var secretBytes = Encoding.UTF8.GetBytes (secret); + + for (ulong i = 0; i < 10; i++) { + var hotp = HmacOtp.Generate (secretBytes, i, 6, false, -1); + Assert.That (hotp, Is.EqualTo (expectedHOTP[i])); + } + } + } +} + diff --git a/KeePass2PCL.Test.Shared/KeePass2PCL.Test.Shared.projitems b/KeePass2PCL.Test.Shared/KeePass2PCL.Test.Shared.projitems new file mode 100644 index 0000000..fff96bf --- /dev/null +++ b/KeePass2PCL.Test.Shared/KeePass2PCL.Test.Shared.projitems @@ -0,0 +1,30 @@ + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + true + {17F1C1A7-AE14-47AD-AE9A-ECFB9C45A559} + + + KeePass2PCL.Test.Shared + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/KeePass2PCL.Test.Shared/KeePass2PCL.Test.Shared.shproj b/KeePass2PCL.Test.Shared/KeePass2PCL.Test.Shared.shproj new file mode 100644 index 0000000..1f5f298 --- /dev/null +++ b/KeePass2PCL.Test.Shared/KeePass2PCL.Test.Shared.shproj @@ -0,0 +1,11 @@ + + + + {17F1C1A7-AE14-47AD-AE9A-ECFB9C45A559} + + + + + + + \ No newline at end of file diff --git a/KeePass2PCL.Test.Shared/Keys/CompositeKeyTests.cs b/KeePass2PCL.Test.Shared/Keys/CompositeKeyTests.cs new file mode 100644 index 0000000..e033962 --- /dev/null +++ b/KeePass2PCL.Test.Shared/Keys/CompositeKeyTests.cs @@ -0,0 +1,34 @@ +using NUnit.Framework; +using System; + +#if KeePassLib +using KeePassLib.Keys; +#else +using KeePass2PCL.Keys; +#endif + +namespace KeePass2PCL.Test.Shared.Keys +{ + [TestFixture ()] + public class CompositeKeyTests + { + [Test ()] + public void TestGenerateKey32 () + { + var originalKey = new byte[32]; + var expectedKey = new byte[32] { + 0xF0, 0xED, 0x57, 0xD5, 0xF0, 0xDA, 0xF3, 0x47, + 0x90, 0xD0, 0xDB, 0x43, 0x25, 0xC6, 0x81, 0x2C, + 0x81, 0x6A, 0x0D, 0x94, 0x96, 0xA9, 0x03, 0xE1, + 0x20, 0xD4, 0x3A, 0x3E, 0x45, 0xAD, 0x02, 0x65 + }; + const ulong rounds = 1; + + var composite = new CompositeKey (); + var key = composite.GenerateKey32 (originalKey, rounds); + Assert.That (key, Is.Not.Null); + var keyData = key.ReadData (); + Assert.That (keyData, Is.EqualTo (expectedKey)); + } + } +} diff --git a/KeePass2PCL.Test.Shared/Keys/KcpCustomKeyTests.cs b/KeePass2PCL.Test.Shared/Keys/KcpCustomKeyTests.cs new file mode 100644 index 0000000..597f051 --- /dev/null +++ b/KeePass2PCL.Test.Shared/Keys/KcpCustomKeyTests.cs @@ -0,0 +1,39 @@ +using NUnit.Framework; +using System; + +#if KeePassLib +using KeePassLib.Keys; +#else +using KeePass2PCL.Keys; +#endif + +namespace KeePass2PCL.Test.Shared.Keys +{ + [TestFixture ()] + public class KcpCustomKeyTests + { + static readonly byte[] testData = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }; + + [Test ()] + public void TestConstruct () + { + var expectedHash = new byte[32] { + 0xAF, 0x55, 0x70, 0xF5, 0xA1, 0x81, 0x0B, 0x7A, + 0xF7, 0x8C, 0xAF, 0x4B, 0xC7, 0x0A, 0x66, 0x0F, + 0x0D, 0xF5, 0x1E, 0x42, 0xBA, 0xF9, 0x1D, 0x4D, + 0xE5, 0xB2, 0x32, 0x8D, 0xE0, 0xE8, 0x3D, 0xFC + }; + + var key = new KcpCustomKey ("test1", testData, false); + var keyData = key.KeyData.ReadData (); + Assert.That (keyData, Is.EqualTo (testData)); + + key = new KcpCustomKey ("test2", testData, true); + keyData = key.KeyData.ReadData (); + Assert.That (keyData, Is.EqualTo (expectedHash)); + } + } +} + diff --git a/KeePass2PCL.Test.Shared/Keys/KcpKeyFileTests.cs b/KeePass2PCL.Test.Shared/Keys/KcpKeyFileTests.cs new file mode 100644 index 0000000..8cc0871 --- /dev/null +++ b/KeePass2PCL.Test.Shared/Keys/KcpKeyFileTests.cs @@ -0,0 +1,76 @@ +using NUnit.Framework; +using System; +using System.IO; + +#if KeePassLib +using KeePassLib.Keys; +#else +using KeePass2PCL.Keys; +#endif + +namespace KeePass2PCL.Test.Shared.Keys +{ + [TestFixture ()] + public class KcpKeyFileTests + { + const string testCreateFile = "TestCreate.xml"; + const string testKey = "0123456789"; + + const string expectedFileStart = + "\r\n" + + "\r\n" + + "\t\r\n" + + "\t\t1.00\r\n" + + "\t\r\n" + + "\t\r\n" + + "\t\t"; + + const string expectedFileEnd = "\t\r\n" + + "\r\n"; + + [Test ()] + public void TestConstruct () + { + var expectedKeyData = new byte[32] { + 0xC1, 0xB1, 0x12, 0x77, 0x23, 0xB8, 0x99, 0xB8, + 0xB9, 0x3B, 0x1B, 0xFF, 0x6C, 0xBE, 0xA1, 0x5B, + 0x8B, 0x99, 0xAC, 0xBD, 0x99, 0x51, 0x85, 0x95, + 0x31, 0xAA, 0x14, 0x3D, 0x95, 0xBF, 0x63, 0xFF + }; + + var fullPath = Path.Combine(Path.GetTempPath(), testCreateFile); + using (var fs = new FileStream(fullPath, FileMode.Create)) { + using (var sw = new StreamWriter(fs)) { + sw.Write (expectedFileStart); + sw.Write (testKey); + sw.Write (expectedFileEnd); + } + } + + try { + var keyFile = new KcpKeyFile (fullPath); + var keyData = keyFile.KeyData.ReadData (); + Assert.That (keyData, Is.EqualTo (expectedKeyData)); + } finally { + File.Delete (fullPath); + } + } + + [Test ()] + public void TestCreate () + { + var fullPath = Path.Combine(Path.GetTempPath(), testCreateFile); + File.Create(fullPath).Close(); + KcpKeyFile.Create (fullPath, null); + try { + var fileContents = File.ReadAllText (fullPath); + Assert.That (fileContents.Length, Is.EqualTo (187)); + Assert.That (fileContents, Does.StartWith (expectedFileStart)); + Assert.That (fileContents, Does.EndWith (expectedFileEnd)); + } finally { + File.Delete (fullPath); + } + } + } +} + diff --git a/KeePass2PCL.Test.Shared/Keys/KcpPasswordTests.cs b/KeePass2PCL.Test.Shared/Keys/KcpPasswordTests.cs new file mode 100644 index 0000000..533b5a7 --- /dev/null +++ b/KeePass2PCL.Test.Shared/Keys/KcpPasswordTests.cs @@ -0,0 +1,33 @@ +using NUnit.Framework; +using System; + +#if KeePassLib +using KeePassLib.Keys; +#else +using KeePass2PCL.Keys; +#endif + +namespace KeePass2PCL.Test.Shared.Keys +{ + [TestFixture ()] + public class KcpPasswordTests + { + const string testPassword = "password"; + + [Test ()] + public void TestConstruct () + { + var expectedHash = new byte[32] { + 0x5E, 0x88, 0x48, 0x98, 0xDA, 0x28, 0x04, 0x71, + 0x51, 0xD0, 0xE5, 0x6F, 0x8D, 0xC6, 0x29, 0x27, + 0x73, 0x60, 0x3D, 0x0D, 0x6A, 0xAB, 0xBD, 0xD6, + 0x2A, 0x11, 0xEF, 0x72, 0x1D, 0x15, 0x42, 0xD8 + }; + + var key = new KcpPassword (testPassword); + var keyData = key.KeyData.ReadData (); + Assert.That (keyData, Is.EqualTo (expectedHash)); + } + } +} + diff --git a/KeePass2PCL.Test.Shared/MyClass.cs b/KeePass2PCL.Test.Shared/MyClass.cs new file mode 100644 index 0000000..f57acff --- /dev/null +++ b/KeePass2PCL.Test.Shared/MyClass.cs @@ -0,0 +1,12 @@ +using System; + +namespace KeePass2PCL.Test.Shared +{ + public class MyClass + { + public MyClass () + { + } + } +} + diff --git a/KeePass2PCL.Test.Shared/Serialization/HashedBlockStreamTests.cs b/KeePass2PCL.Test.Shared/Serialization/HashedBlockStreamTests.cs new file mode 100644 index 0000000..b76122c --- /dev/null +++ b/KeePass2PCL.Test.Shared/Serialization/HashedBlockStreamTests.cs @@ -0,0 +1,71 @@ +using NUnit.Framework; +using System; +using System.IO; + +#if KeePassLib +using KeePassLib.Serialization; +#else +using KeePass2PCL.Serialization; +#endif + +namespace KeePass2PCL.Test.Shared.Serialization +{ + [TestFixture ()] + public class HashedBlockStreamTests + { + static readonly byte[] data = new byte[16]; + + static readonly byte[] hashStreamData = new byte[] { + // The first 4 bytes are an integer indicating the block index + 0x00, 0x00, 0x00, 0x00, + // Then the SHA-256 hash of the data + 0x37, 0x47, 0x08, 0xFF, 0xF7, 0x71, 0x9D, 0xD5, + 0x97, 0x9E, 0xC8, 0x75, 0xD5, 0x6C, 0xD2, 0x28, + 0x6F, 0x6D, 0x3C, 0xF7, 0xEC, 0x31, 0x7A, 0x3B, + 0x25, 0x63, 0x2A, 0xAB, 0x28, 0xEC, 0x37, 0xBB, + // then an integer that is the length of the data + 0x10, 0x00, 0x00, 0x00, + // and finally the data itself + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + // Next, a terminating block + 0x01, 0x00, 0x00, 0x00, + // terminating block is indicated by a hash of all 0s... + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + // ...and by a size of 0 + 0x00, 0x00, 0x00, 0x00 + }; + + [Test ()] + public void TestRead () + { + using (var ms = new MemoryStream (hashStreamData)) { + using (var hbs = new HashedBlockStream (ms, false)) { + using (var br = new BinaryReader(hbs)) { + var bytes = br.ReadBytes (data.Length); + Assert.That (bytes, Is.EqualTo (data)); + Assert.That (() => br.ReadByte (), Throws.InstanceOf ()); + } + } + } + } + + [Test ()] + public void TestWrite () + { + var buffer = new byte[hashStreamData.Length]; + using (var ms = new MemoryStream (buffer)) { + using (var hbs = new HashedBlockStream (ms, true)) { + using (var bw = new BinaryWriter(hbs)) { + bw.Write (data); + } + } + Assert.That (buffer, Is.EqualTo (hashStreamData)); + } + } + } +} + diff --git a/KeePass2PCL.Test.Shared/Serialization/KdbxFileTests.cs b/KeePass2PCL.Test.Shared/Serialization/KdbxFileTests.cs new file mode 100644 index 0000000..47cbc5e --- /dev/null +++ b/KeePass2PCL.Test.Shared/Serialization/KdbxFileTests.cs @@ -0,0 +1,181 @@ +using NUnit.Framework; +using System; +using System.Drawing; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; + + +#if KeePassLib +using KeePassLib; +using KeePassLib.Keys; +using KeePassLib.Security; +using KeePassLib.Serialization; +using KeePassLib.Collections; +#else +using KeePass2PCL.Keys; +using KeePass2PCL.Security; +using KeePass2PCL.Serialization; +using KeePass2PCL.Collections; +#endif + +namespace KeePass2PCL.Test.Shared.Serialization +{ + [TestFixture()] + public class KdbxFileTests + { + const string testLocalizedAppName = "My Localized App Name"; + + const string testDatabaseName = "My Database Name"; + const string testDatabaseDescription = "My Database Description"; + const string testDefaultUserName = "My Default User Name"; + const string testColor = "#FF0000"; // Red + + const string testRootGroupName = "My Root Group Name"; + const string testRootGroupNotes = "My Root Group Notes"; + const string testRootGroupDefaultAutoTypeSequence = "My Root Group Default Auto Type Sequence"; + + const string testDatabase = "\r\n" + + "\r\n" + + "\t\r\n" + + "\t\t" + testLocalizedAppName + "\r\n" + + "\t\t" + testDatabaseName + "\r\n" + + "\t\t2015-03-14T03:15:26Z\r\n" + + "\t\t" + testDatabaseDescription + "\r\n" + + "\t\t2015-03-14T03:15:26Z\r\n" + + "\t\t" + testDefaultUserName + "\r\n" + + "\t\t2015-03-14T03:15:26Z\r\n" + + "\t\t365\r\n" + + "\t\t" + testColor + "\r\n" + + "\t\t2015-03-14T03:15:26Z\r\n" + + "\t\t-1\r\n" + + "\t\t-1\r\n" + + "\t\t\r\n" + + "\t\t\tFalse\r\n" + + "\t\t\tFalse\r\n" + + "\t\t\tTrue\r\n" + + "\t\t\tFalse\r\n" + + "\t\t\tFalse\r\n" + + "\t\t\r\n" + + "\t\tTrue\r\n" + + "\t\tAAAAAAAAAAAAAAAAAAAAAA==\r\n" + + "\t\t2015-03-14T03:15:26Z\r\n" + + "\t\tAAAAAAAAAAAAAAAAAAAAAA==\r\n" + + "\t\t2015-03-14T03:15:26Z\r\n" + + "\t\t10\r\n" + + "\t\t6291456\r\n" + + "\t\tAAAAAAAAAAAAAAAAAAAAAA==\r\n" + + "\t\tAAAAAAAAAAAAAAAAAAAAAA==\r\n" + + "\t\t\r\n" + + "\t\t\r\n" + + "\t\r\n" + + "\t\r\n" + + "\t\t\r\n" + + "\t\t\tAAAAAAAAAAAAAAAAAAAAAA==\r\n" + + "\t\t\t" + testRootGroupName + "\r\n" + + "\t\t\t" + testRootGroupNotes + "\r\n" + + "\t\t\t49\r\n" + + "\t\t\t\r\n" + + "\t\t\t\t2015-03-14T03:15:26Z\r\n" + + "\t\t\t\t2015-03-14T03:15:26Z\r\n" + + "\t\t\t\t2015-03-14T03:15:26Z\r\n" + + "\t\t\t\t2015-03-14T03:15:26Z\r\n" + + "\t\t\t\tFalse\r\n" + + "\t\t\t\t0\r\n" + + "\t\t\t\t2015-03-14T03:15:26Z\r\n" + + "\t\t\t\r\n" + + "\t\t\tTrue\r\n" + + "\t\t\t" + testRootGroupDefaultAutoTypeSequence + "\r\n" + + "\t\t\tnull\r\n" + + "\t\t\tnull\r\n" + + "\t\t\tAAAAAAAAAAAAAAAAAAAAAA==\r\n" + + "\t\t\r\n" + + "\t\t\r\n" + + "\t\r\n" + + ""; + + const string testDate = "2015-03-14T03:15:26Z"; + + [Test()] + public void TestLoad() + { + var database = new PwDatabase(); + using (var ms = new MemoryStream(Encoding.UTF8.GetBytes(testDatabase))) + { + var file = new KdbxFile(database); + file.Load(ms, KdbxFormat.PlainXml, null); + } + Assert.That(database.Color.ToArgb(), Is.EqualTo(Color.Red.ToArgb())); + Assert.That(database.Compression, Is.EqualTo(PwCompressionAlgorithm.GZip)); + //Assert.That (database.CustomData, Is.EqualTo ()); + Assert.That(database.CustomIcons, Is.Empty); + } + + [Test()] + public void TestSave() + { + var buffer = new byte[4096]; + using (var ms = new MemoryStream(buffer)) + { + var database = new PwDatabase(); + database.New(new IOConnectionInfo(), new CompositeKey()); + var date = DateTime.Parse(testDate); + PwDatabase.LocalizedAppName = testLocalizedAppName; + database.Name = testDatabaseName; + database.NameChanged = date; + database.Description = testDatabaseDescription; + database.DescriptionChanged = date; + database.DefaultUserName = testDefaultUserName; + database.DefaultUserNameChanged = date; + database.Color = Color.Red; + database.MasterKeyChanged = date; + database.RecycleBinChanged = date; + database.EntryTemplatesGroupChanged = date; + database.RootGroup.Uuid = PwUuid.Zero; + database.RootGroup.Name = testRootGroupName; + database.RootGroup.Notes = testRootGroupNotes; + database.RootGroup.DefaultAutoTypeSequence = testRootGroupDefaultAutoTypeSequence; + database.RootGroup.CreationTime = date; + database.RootGroup.LastModificationTime = date; + database.RootGroup.LastAccessTime = date; + database.RootGroup.ExpiryTime = date; + database.RootGroup.LocationChanged = date; + var file = new KdbxFile(database); + file.Save(ms, null, KdbxFormat.PlainXml, null); + } + var fileContents = Encoding.UTF8.GetString(buffer).Replace("\0", ""); + if (typeof(KdbxFile).Namespace.StartsWith("KeePassLib.") + && Environment.OSVersion.Platform != PlatformID.Win32NT) + { + // Upstream KeePassLib does not specify line endings for XmlTextWriter, + // so it uses native line endings. + fileContents = fileContents.Replace("\n", "\r\n"); + } + Assert.That(fileContents, Is.EqualTo(testDatabase)); + } + + [Test] + public void TestSearch() + { + var database = new PwDatabase(); + using (var ms = new MemoryStream(Encoding.UTF8.GetBytes(testDatabase))) + { + var file = new KdbxFile(database); + file.Load(ms, KdbxFormat.PlainXml, null); + } + var sp = new SearchParameters() + { + SearchString = "sfsoiwsefsi" + }; + var listStorage = new PwObjectList(); + database.RootGroup.SearchEntries(sp, listStorage); + Assert.AreEqual(0U, listStorage.UCount); + var entry = new PwEntry(true, true); + entry.Strings.Set("Title", new ProtectedString(false, "NaMe")); + database.RootGroup.AddEntry(entry, true); + sp.SearchString = "name"; + database.RootGroup.SearchEntries(sp, listStorage); + Assert.AreEqual(1U, listStorage.UCount); + } + } +} diff --git a/KeePass2PCL.Test.Shared/Utility/GfxUtilTests.cs b/KeePass2PCL.Test.Shared/Utility/GfxUtilTests.cs new file mode 100644 index 0000000..ce25156 --- /dev/null +++ b/KeePass2PCL.Test.Shared/Utility/GfxUtilTests.cs @@ -0,0 +1,32 @@ +using NUnit.Framework; +using System; + +#if KeePassLib +using KeePassLib.Utility; +#else +using Splat; +using KeePass2PCL.Utility; +#endif + +namespace KeePass2PCL.Test.Shared.Utility +{ + [TestFixture ()] + public class GfxUtilTests + { + // 16x16 all white PNG file, base64 encoded + const string testImageData = + "iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAAsTAAA" + + "LEwEAmpwYAAAAB3RJTUUH3wMOFgIgmTCUMQAAABl0RVh0Q29tbWVudABDcmVhdG" + + "VkIHdpdGggR0lNUFeBDhcAAAAaSURBVCjPY/z//z8DKYCJgUQwqmFUw9DRAABVb" + + "QMdny4VogAAAABJRU5ErkJggg=="; + + [Test ()] + public void TestLoadImage () + { + var testData = Convert.FromBase64String (testImageData); + var image = GfxUtil.LoadImage (testData); + Assert.That (image.Width, Is.EqualTo (16)); + Assert.That (image.Height, Is.EqualTo (16)); + } + } +} diff --git a/KeePass2PCL.Test.UWP/Assets/LockScreenLogo.scale-200.png b/KeePass2PCL.Test.UWP/Assets/LockScreenLogo.scale-200.png new file mode 100644 index 0000000000000000000000000000000000000000..735f57adb5dfc01886d137b4e493d7e97cf13af3 GIT binary patch literal 1430 zcmaJ>TTC2P7~aKltDttVHYH6u8Io4i*}3fO&d$gd*bA_<3j~&e7%8(eXJLfhS!M@! zKrliY>>6yT4+Kr95$!DoD(Qn-5TP|{V_KS`k~E6(LGS@#`v$hQo&^^BKsw3HIsZBT z_y6C2n`lK@apunKojRQ^(_P}Mgewt$(^BBKCTZ;*xa?J3wQ7~@S0lUvbcLeq1Bg4o zH-bvQi|wt~L7q$~a-gDFP!{&TQfc3fX*6=uHv* zT&1&U(-)L%Xp^djI2?~eBF2cxC@YOP$+9d?P&h?lPy-9M2UT9fg5jKm1t$m#iWE{M zIf%q9@;fyT?0UP>tcw-bLkz;s2LlKl2qeP0w zECS7Ate+Awk|KQ+DOk;fl}Xsy4o^CY=pwq%QAAKKl628_yNPsK>?A>%D8fQG6IgdJ ztnxttBz#NI_a@fk7SU`WtrpsfZsNs9^0(2a z@C3#YO3>k~w7?2hipBf{#b6`}Xw1hlG$yi?;1dDs7k~xDAw@jiI*+tc;t2Lflg&bM)0!Y;0_@=w%`LW^8DsYpS#-bLOklX9r?Ei}TScw|4DbpW%+7 zFgAI)f51s}{y-eWb|vrU-Ya!GuYKP)J7z#*V_k^Xo>4!1Yqj*m)x&0L^tg3GJbVAJ zJ-Pl$R=NAabouV=^z_t;^K*0AvFs!vYU>_<|I^#c?>>CR<(T?=%{;U=aI*SbZADLH z&(f2wz_Y0??Tf|g;?|1Znw6}6U43Q#qNRwv1vp9uFn1)V#*4p&%$mP9x&15^OaBiDS(XppT|z^>;B{PLVEbS3IFYV yGvCsSX*m literal 0 HcmV?d00001 diff --git a/KeePass2PCL.Test.UWP/Assets/SplashScreen.scale-200.png b/KeePass2PCL.Test.UWP/Assets/SplashScreen.scale-200.png new file mode 100644 index 0000000000000000000000000000000000000000..023e7f1feda78d5100569825acedfd213a0d84e9 GIT binary patch literal 7700 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 literal 0 HcmV?d00001 diff --git a/KeePass2PCL.Test.UWP/Assets/Square150x150Logo.scale-200.png b/KeePass2PCL.Test.UWP/Assets/Square150x150Logo.scale-200.png new file mode 100644 index 0000000000000000000000000000000000000000..af49fec1a5484db1d52a7f9b5ec90a27c7030186 GIT binary patch literal 2937 zcma)84OCO-8BSud5)jwMLRVKgX(S?$n?Ld|vrsm<$CF7)&zTbyy1FE5bU`Q17MRv`9ue$;R(@8kR;#vJ*IM0>cJIAOte!d7oRgdH zd%ySjdB6L9=gX^A6)VzH7p2l@v~3zJAMw|DFy#^)F@@F*`mqUn=Il>l)8_+ab;nOW{%+iPx z+s{Eu|&pIs)Z7{La9~?xKfyl z#43?gjEL15d4WbOZo#SiP%>DB^+BcnJ=7dHEe;r#G=tuw|ka z%q@}##Uh7;tc%L_64m(kHtw74ty%BJMb)_1)#S0j`)F8_1jF7vScpsnH=0V19bO8y zR`0SjIdCUo&=>JwMQF8KHA<{ODHTiQh}0^@5QRmCA?gOH6_H3K^-_sNB^RrdNuK-R zOO*vOrKCVvDwgUck`kF(E7j{I#iiN;b*ZdCt4m@HPA`EuEqGGf4%!K<;(=I=&Vyrw z%TwcWtxa}8mCZ%Cyf&ActJ6_$ox5z6-D!0-dvnRx6t7y3d+h6QYpKWO;8OdnvERo7 zuEf>ih5`wqY)~o@OeVt-wM?Q!>QzdGRj!bz6fzYrfw$hZfAKzr2-M+D+R>}~oT574c;_3zquHcElqKIsryILt3g8n3jcMb+j?i?-L3FpZJ z2WRVBRdDPc+G5aaYg#5hpE+6nQ|(VSoxT3|biF;BUq#==-27Xi=gihDPYP$7?=9cP zYKE$jeQ|3~_L0VG-(F~2ZPyD0=k{J4Q~h(t__{-mz_w8{JDY9{`1ouzz!Vr5!ECdE z6U~O1k8c}24V7~zzXWTV-Pe4)y}wQJS&q%H5`Fo_f_JvIU489aCX$;P`u#!I-=^4ijC2{&9!O&h>mi?9oYD=GC#%)6{GzN6nQYw+Fal50!#x^asjBBR50i`+mho*ttoqV)ubM2KD9S~k7+FR4>{29?6 z{!l6kDdyTN0YJ9LgkPWeXm|gyi@zM3?0@{&pXT12w|78&W-q!RRF)&iLCEZVH<|fR zN0fr2^t8H(>L?>K#>^+jWROLral(Qy-xoBq1U7A&DV||wClb)Otd9?(gZ|8znMF}D zf<1haWz^s0qgecz;RFGt0C-B4g`jNGHsFU+;{<%t65v^sjk^h$lmWn#B0#_)9ij&d z-~lc`A)YYExi^7sBuPM^Y|wA2g*5?`K?#7tzELQYNxGo$UB$4J8RJp1k(8Jj+~hMT zlN~>M@KTTh^--8y3PK_NZ@AC!{PT=CziBzGd+wTJ^@icH!Bd}%)g8V)%K?|c&WTUk zy}qv1C%(fjRoZ4ozC3{O%@5?)XzH35zHns$pgU*Q?fj4v?fp1Qbm+j;3l;9jam9Da zXVcKjPlQ73x78QPu|Ffm6x?`~e3oD=gl=4kYK?={kD5j~QCXU)`HSdduNNENzA*2$ zOm3PzF!lN5e*06-f1Uot67wY#{o-S1!KZ7E=!~7ynnk9_iJR#kFoNbAOT#^2Gd17F zMmvU6>lndZQGd|ax9kUoXXO+$N?|j@6qpsF&_j7YXvwo_C{JpmLw5&#e6k>atv%es z5)7r*Wvv_JkUpT}M!_o!nVlEk1Zbl=a*2hQ*<|%*K1Glj^FcF`6kTzGQ3lz~2tCc@ z&x|tj;aH&1&9HwcJBcT`;{?a+pnej;M1HO(6Z{#J!cZA04hnFl;NXA+&`=7bjW_^o zfC40u3LMG?NdPtwGl>Tq6u}*QG)}-y;)lu-_>ee3kibW(69n0$0Zy!}9rQz%*v1iO zT9_H>99yIrSPYVy6^);rR}7Yo=J_T@hi+qhTZXnVWyf;JDYm5#eYLTxr*?kiNn!+Y zQ+LUkBafNJ#rH#C(?d5^;gw9o#%daEI{mA*LHPIHPU`#|H$hD zwm>0&+kahQ)E#%~k>&5@&#Vg82H?s%71=)(soi@174pi9--2{w{1$}Sz4zGn3Du&x bht0Iza^2ykEt4(epJ78uh5nDlX8(TxzDYwP literal 0 HcmV?d00001 diff --git a/KeePass2PCL.Test.UWP/Assets/Square44x44Logo.scale-200.png b/KeePass2PCL.Test.UWP/Assets/Square44x44Logo.scale-200.png new file mode 100644 index 0000000000000000000000000000000000000000..ce342a2ec8a61291ba76c54604aea7e9d20af11b GIT binary patch literal 1647 zcmaJ?eM}Q)7(e+G1Q(|`V9JhTI2>MkceK4;p;PR&$Pi?ejk3YQ_3o`S&|W_dsOZ8# zWPTt69g`t$ab`0cj-Y0yiBSOqmd)tG7G(}M5aP0_%&9TijB#&)I{zSE^4@#z^FF`l z`8{8`o%wlL(UI|y2!cdsuVamHH~H86F!*-15em4)NqUpCQM5?aoC_eCf@lV4wvF2a zjDQn1JBL69f&@2M3rvzJcfE!eZ8FZUBlFlC5RD)it33{mF9#B82AiyQE%w)`vlwa> zv{<1sm&kSKK$&%2jSFn7$t&P%%6Ue>R=EAnG8N7fqynWG8L3p!4801a;8{+nliO(qd(jNJ_?+9W3#hLIDLoT6~3fx9=`CC-D}-AMrpEO7HK zt3$GicGPc?GmDjy7K2P@La;eu4!$zWCZ`ym{Z$b zu-O6RM&K4JT|BIZB`E-gxqG%FzanI#+2FFmqHqXG7yxWB=w55RGOM)$xMb(>kSNR z2w=1AZi%z=AmG~yea~XaXJR!v7vLn(RUnELfiB1|6D84ICOS}^Zo2AdN}<&*h}G_u z{xZ!(%>tLT3J3<5XhWy-tg+6)0nmUUENLW8TWA{R6bgVd3X;anYFZ^IRis*_P-C-r z;i>%1^eL3UI2-{w8nuFFcs0e~7J{O2k^~Ce%+Ly4U?|=!0LH=t6()xi<^I-rs+9sF z*q{E-CxZbGPeu#a;XJwE;9S1?#R&uns>^0G3p`hEUF*v`M?@h%T%J%RChmD|EVydq zmHWh*_=S%emRC*mhxaVLzT@>Z2SX0u9v*DIJ@WC^kLVdlGV6LpK$KIrlJqc zpJ921)+3JJdTx|<`G&kXpKkjGJv=76R`yYIQ{#c-`%+`#V(7}Q;&@6U8!Td1`d;?N z_9mnI#?AA}4J!r)LN4!E-@H5eXauuB7TOawS>Y|{-P?NNx-lq+z1W-+y(;39P&&LP zL{N80?&=C*qKmdA^moMZRuPcD!B<*mq$ch=0Cnlitw#txRWhb3%TQvPqjkC`F69G4b! ze7z9MZ#+;_#l?H37UqUhDFb^l&s2{oM$3I0o^Q!yx;;V)QmCMo)Tb_ui|mit8MS?U zm##6$sZZ1$@|s%?l@>4Z<*Q}sRBSKMhb4I{e5LdEhsHIHTe8Bod5c>6QtT>$XgUBz z6MK`kO$=jmt@FqggOhJ5j~e@ygRbG;<{Vu)*+nn9aQeo0;$#j;|MS=S$&L?BeV25z xs3B`@=#`5TF{^6(A1rvdY@|-RtQ|iS5{tyX+wH?;n8E)G$kykv-D^wh{{!TZT%7;_ literal 0 HcmV?d00001 diff --git a/KeePass2PCL.Test.UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/KeePass2PCL.Test.UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png new file mode 100644 index 0000000000000000000000000000000000000000..f6c02ce97e0a802b85f6021e822c89f8bf57d5cd GIT binary patch literal 1255 zcmaJ>TWs4@7*5+{G#S+&C!qC#> zf>5N3P6jO*Cz>ug*(_DmW=)kea&m$gZ^+nyiF`;j%w@}y8)>p*SH}C`m?DXeieF2U zyQHecc_L%Gh!7GMt+hG06y;+|p4>m~}PjA}rKViGiEnn7G0ZO<>G|7q;2?NwGCM3s?eued6%hd$B+ z*kQJ{#~$S=DFE(%=E+UkmlEI*%3llUf~8Ja9YU1Vui0IbGBkW_gHB%Rd&!!ioX zs40O?i9I{};kle7GMvE7(rk`la=gTI)47=>%?q@^iL-nUo3}h4S}N-KHn8t5mVP8w z&bSErwp+37 zNJJ8?a|{r5Q3R0Z5s-LB1WHOwYC@7pCHWND#cL1cZ?{kJ368_*(UDWUDyb<}0y@o# zfMF016iMWPCb6obAxT$JlB6(2DrlXDTB&!0`!m??4F(qWMhjVZo?JXQmz`1*58Z=& zcDmB|S-E@j?BoFGix0flckqdS4jsPNzhfWyWIM98GxcLs89C(~dw%$_t;JjX-SD}E zfiGV;{8Q%8r}w9x>EEigW81>`kvnU@pK)4+xk9@+bNj9L!AAZ@SZ@q|)&BmY3+HZx zul~BeG4|}-;L%cHViQGQX?^zFfO0&#cHwel=d`lH9sJ-@Sl@n*(8J2>%Ac`IxyY?Q z{=GhWvC#gu-~Ia7*n{=+;qM?Ul_wy1+u7ho;=`>EwP^g~R@{unBds`!#@}tluZQpS zm)M~nYEifJWJGx?_6DcTy>#uh%>!H9=hb^(v`=m3F1{L>db=<5_tm+_&knAQ2EU$s Mu9UqpbNZeC0BbUo^Z)<= literal 0 HcmV?d00001 diff --git a/KeePass2PCL.Test.UWP/Assets/StoreLogo.png b/KeePass2PCL.Test.UWP/Assets/StoreLogo.png new file mode 100644 index 0000000000000000000000000000000000000000..7385b56c0e4d3c6b0efe3324aa1194157d837826 GIT binary patch literal 1451 zcmaJ>eN5D57_Z|bH;{0+1#mbl)eTU3{h)Wf7EZV?;HD@XL@{B`Ui%(2aMxQ~xdXSv z5nzWi(LW)U2=Vc-cY@s7nPt{i0hc6!7xN4NNHI#EQl>YNBy8l4%x9gr_W-j zEZMQmmTIy(>;lblRfh`dIyTgc9W5d!VP$L4(kKrN1c5G~(O_#xG zAJCNTstD^5SeXFB+&$h=ToJP2H>xr$iqPs-#O*;4(!Fjw25-!gEb*)mU}=)J;Iu>w zxK(5XoD0wrPSKQ~rbL^Cw6O_03*l*}i=ydbu7adJ6y;%@tjFeXIXT+ms30pmbOP%Q zX}S;+LBh8Tea~TSkHzvX6$rYb)+n&{kSbIqh|c7hmlxmwSiq5iVhU#iEQ<>a18|O^Sln-8t&+t`*{qBWo5M?wFM(JuimAOb5!K#D}XbslM@#1ZVz_;!9U zpfEpLAOz=0g@bd6Xj_ILi-x^!M}73h^o@}hM$1jflTs|Yuj9AL@A3<-?MV4!^4q`e z)fO@A;{9K^?W?DbnesnPr6kK>$zaKo&;FhFd(GYFCIU^T+OIMb%Tqo+P%oq(IdX7S zf6+HLO?7o0m+p>~Tp5UrXWh!UH!wZ5kv!E`_w)PTpI(#Iw{AS`gH4^b(bm^ZCq^FZ zY9DD7bH}rq9mg88+KgA$Zp!iWncuU2n1AuIa@=sWvUR-s`Qb{R*kk(SPU^`$6BXz8 zn#7yaFOIK%qGxyi`dYtm#&qqox0$h=pNi#u=M8zUG@bpiZ=3sT=1}Trr}39cC)H|v zbL?W)=&s4zrh)7>L(|cc%$1#!zfL?HjpeP%T+x_a+jZ16b^iKOHxFEX$7d|8${H-* zIrOJ5w&i$>*D>AKaIoYg`;{L@jM((Kt?$N$5OnuPqVvq**Nm}(f0wwOF%iX_Pba;V z;m@wxX&NcV3?<1+u?A{y_DIj7#m3Af1rCE)o`D&Y3}0%7E;iX1yMDiS)sh0wKi!36 zL!Wmq?P^Ku&rK~HJd97KkLTRl>ScGFYZNlYytWnhmuu|)L&ND8_PmkayQb{HOY640 bno1(wj@u8DCVuFR|31B*4ek@pZJqxCDDe1x literal 0 HcmV?d00001 diff --git a/KeePass2PCL.Test.UWP/Assets/Wide310x150Logo.scale-200.png b/KeePass2PCL.Test.UWP/Assets/Wide310x150Logo.scale-200.png new file mode 100644 index 0000000000000000000000000000000000000000..288995b397fdbef1fb7e85afd71445d5de1952c5 GIT binary patch literal 3204 zcmbVPeQXow8NYmBd90>}0NP?GhXW~VaeThm=a0tV#EwJMI!)6M3}|c4_Bl3=Kd>G0 z(GHx1wl<7(tP?FsOQkTilSo*iIvF%uArExJ73~P zSv1xEy!U(Wd4A9D`FQV@W3@F^qJ@PEF$@z`Z!*BbFsS(^?B zyiAzJ+q})bkgiQHWqEb*jJD-coHYr1^iocg)l!Qa{Xqs-l~6J}p-|##ZHYofskQ3$ zI0;xzXyhazBeXhIsg5A=%ufo@f)1yy&ScKS0;HF^!r_2UE^lpZEom(+@duma3awTv zCrCL-%D_SvYWIcdHkmI}#50(fkUi)Qgx!80ju>g1za^}ff>JI8Z@^-iCiaCgg@TgF z+vtE?Q9{VQUX&MW9SYYmGcxA14%N2@7FwBTD4N<(2{nWgV8$e3?-F=L^&FrtWn~(U_Q~~^uYiyeY6-KoTnfh9AWz@ zIKje0)u!_Lw)E}G!#kEfwKVdNt(UAf9*f>tEL_(=xco-T%jTi@7YlC3hs2ik%Le0H ztj}RTeCF(5mwvi3_56>-yB?l;J>-1%!9~=fs|QcNG3J~a@JCu`4SB460s0ZO+##4fFUSGLcj_ja^fL4&BKALfb#$6$O?>P@qx2Agl^x0i&ugt zsy5Pyu=()`7HRMG3IB7F1@`_ z+-!J%#i6e^U$e#+C%Q>_qVRzWRsG^W_n+@OcX@vzI&z;mzHNb!GQ?LWA(wtpqHqTM z1OFw_{Zn?fD)p)`c`kOgv{de=v@suGRqY{N^U7gI1VF3*F=obwaXI6ob5__Yn zVTguS!%(NI09J8x#AO_aW!9W7k*UvB;IWDFC3srwftr{kHj%g)fvnAm;&h_dnl~

MY- zf+K}sCe8qU6Ujs`3ua{U0Of$R_gVQBuUA za0v=mu#vIOqiiAZOr&h*$WyOw&k-xr$;G4Ixa!#TJNr>95(h>l%)PUy4p+^SgR(uR zta%k*?ny-+nAr8spEk1fo{J4i!b^Fia`N{_F6@zidA2ZTTrjl#^5Z-2KfB@Cu}l9s z(*|Z2jc?p~vn2f)3y9i*7zJV1L{$?|&q)4oaT;uXi6>1GkRXVTOzAz(RHEmr=eFIi z`}<>-Q?K0GN8!IYxeP1XKXO+jsJbp~o^);Bc;%b7Flpe7;1`Ny@3r7ZR;?R)aJt8C ziNlEC<@3f_lIV4TwV}&e;D!Ee5_|e#g0LUh=5vmYWYm7&2h*M>QPKvGh9-)wfMMW3 z8J9b%1k7dzPzO0_NGQy92BZ^FR6R~6;^6?lqO;-QUP4BY%cG%3vEhbm#>4vIhPBh3 z-+pZGjh$x%Hp{?=FHsMp0&wNPlj00us{&`1ZOZTqs8%4X&xH=UDr*xyBW(Zp&Em94 zf)ZSfn#yg0N)>!1kWdkqJ^S*z0FF5|fj&qcE#Na|%OY0$uO>!&hP+1ywfD_WXk@4J(?MBftK7>$Nvqh@tDuarN%PrTLQ2Uzysx>UV=V zk^RrDSvdQ?0;=hY67EgII-f4`t=+i*yS=Y~!XlqIy_4x&%+OdfbKOFPXS2X5%4R{N z$SQMX^AK6(fA + + + + Debug + x86 + {4E21AE3C-13FF-4773-824C-D51542AD1A7B} + AppContainerExe + Properties + KeePass2PCL.Test.UWP + KeePass2PCL.Test.UWP + en-US + UAP + 10.0.15063.0 + 10.0.10240.0 + 14 + 512 + {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + KeePass2PCL.Test.UWP_TemporaryKey.pfx + $(VisualStudioVersion) + + + true + bin\x86\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + x86 + false + prompt + true + + + bin\x86\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + x86 + false + prompt + true + true + + + true + bin\ARM\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + ARM + false + prompt + true + + + bin\ARM\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + ARM + false + prompt + true + true + + + true + bin\x64\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + x64 + false + prompt + true + + + bin\x64\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + x64 + false + prompt + true + true + + + PackageReference + + + + + + + + + UnitTestApp.xaml + + + + + MSBuild:Compile + Designer + + + + + Designer + + + + + + + + + + + + + + + + + + + 5.4.0 + + + 1.1.18 + + + 1.1.18 + + + 2.0.147 + + + 1.1.0 + + + 1.0.2 + + + 2.0.0 + + + + + {2e710089-9559-4967-846c-e763dd1f3acb} + KeePass2PCL + + + + + + + 14.0 + + + + \ No newline at end of file diff --git a/KeePass2PCL.Test.UWP/KeePass2PCL.Test.UWP_TemporaryKey.pfx b/KeePass2PCL.Test.UWP/KeePass2PCL.Test.UWP_TemporaryKey.pfx new file mode 100644 index 0000000000000000000000000000000000000000..f04aea4512e263125379a3d3f871b8e73b86537b GIT binary patch literal 2504 zcmZWpc{tQ-8~)8=5JE(jG@?&Ka~exb>9jDIA$yThmPTVvwisoo!GuUeWNc|l8k8m3 zmoO;97|DKYiQ_1iF+aORT9lnC0!xu5ih;9Fs z!RFiHB57O79UaYN4=7al9h?q-cOdPOi8;;9?sDPAlPa^$v1WCJ(DaQ=pl6LRY@E1@ z8@c2xE5U3~KNy@yw3bUH$Jds(v9M~@m+0*q8eb&b89^Zq)n2JJHw6f8m@zf8?9Y9~ zv&rvwwq_6XRSk7OxekPy9~eRsiSr56x%+ah!x`@z2<0o zP9`oEz9pii2gJNFIQK1kP+x&@c1+>xiMt;=`e?xb?*OJ5HPY}ybgu-D1GJ{hIEm9( zPDAN^W5Nt!*Wll|0u$%3w4r-05yLP>5`;1&H(=m0X_m>E{31-w&l8V@wg>2<>P!|__To+U2d$l z!DSFv`k+|0tKy6y&U)Q;VuGl?$@h@oOb&jqF(mR_&z`)68l#$}bPAx84$m`Ea-$b@ z1A3vwFx8+-9m3?BndhC2yF2%V0Mh3ES2c`G7RFo!H@H-|J+g3Ku z*xFBO%wEO@EDR&fl^b$iP8(S;W1bSReQ8?KKxD_}@0_K$S)V!EsAYrVnK@POrnQ1> zZW?sdG{Ll7A<4QiqzW+t6{7pwZ zA~gQlP_TP_Hm53^SGXU0?Dr}wm1X8=ZcCj*IWEYl)%We&=9u|#9ekeKi;oG96P)m- zR@j|B6(YW@l?+;4ex5q}#g*XCEh8@%!&)Z=haFy&{6R>thd&dGol~+m*ULOf9FXaL zC2n`3v3IVo$h);@)R8AvwKunPe#6zj^Q9tkKbv2l_wXsTVUL(XlHsdT=jamK@V8cx zRT~|*`Ec{t3*)`$NJoR0R$Vu}a=}Qx+h$mf;nXuRsUcScX`RkF(jMJ16o2?TJi*2AnQQsY;0qFkz6CTk{UZ$SRvm0QckK?4O~?~6PZHS z>!vE-DR6_uyQ+jpu!Qr{T9OL|^z&;24{8$eCVYBRJIhM*s&1ZoI;w7UzqWd#Y)s<4{-c{LMf#}N zBVDYc9o~VF`Fl)??$k!W;Sc}-FpmF-vfAb7wfJris+h z$~CC=t&}llhWL#H#eoA0LfsxLoOFiv z3+1@na+f%Q)g8*aD5-q(+~R?|{`yb*gb!PfT<@@HxnOon(~=NA%X0GNk6H*)$Kf$M z6fdO6#}g=hXkE{@>oX#iE=mIPHoGgI0>m4{`v;_1y1vFzw4gZ_Z68DD24K0d@`3pD z`xg9DglS;8+sh2kiObaQYfEcSTS*x80ZO9n>*6(g)m7ZD3?ikHziE+L)^;h{Fz$K` z#{m@oPOWBmeR7<|b2Kr&CCenb1=cUW*NYNFF&lOKkurpy3chb4hX~2JYEfOhVQp|P z&`;4o=rj)KzOq-)6>w)Dvjm=J<`9?j*{R4=Y04QpJZ_WUo;D(|^zS~hni1t(EP?Q@ z9zN1vm|$I^WG7sP+U*vGat@1PepPip5|>@1phy|EXI*Pt60xQ(y;)-f95=jMP+Vnrirp`7%MVY|_+GJeiP#dQSCx5)ZM>i#!ft=!m-LEho!PG=OuO|&Y{nQYzhi>L5Eh-k* z`+T?DR-<~X`E5`9{lUKT^*qGrHE$U^9`KvgtQO29&msKaUXxPh$g5}=6=R6mgAqmu zX>Er=72&ckFG}1_Qg4^$+)^-8I9`$eEV?osE=y_V_S;5P1ki7z_AxI_v%N6O_CG%u JIAVUSe* + + + + + + + + KeePass2PCL.Test.UWP + anpan + Assets\StoreLogo.png + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/KeePass2PCL.Test.UWP/Properties/AssemblyInfo.cs b/KeePass2PCL.Test.UWP/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..175ba33 --- /dev/null +++ b/KeePass2PCL.Test.UWP/Properties/AssemblyInfo.cs @@ -0,0 +1,18 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +[assembly: AssemblyTitle("KeePass2PCL.Test.UWP")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("KeePass2PCL.Test.UWP")] +[assembly: AssemblyCopyright("Copyright © 2017")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] +[assembly: AssemblyMetadata("TargetPlatform","UAP")] + +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: ComVisible(false)] \ No newline at end of file diff --git a/KeePass2PCL.Test.UWP/Properties/UnitTestApp.rd.xml b/KeePass2PCL.Test.UWP/Properties/UnitTestApp.rd.xml new file mode 100644 index 0000000..efee59d --- /dev/null +++ b/KeePass2PCL.Test.UWP/Properties/UnitTestApp.rd.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/KeePass2PCL.Test.UWP/PwDatabaseTests.cs b/KeePass2PCL.Test.UWP/PwDatabaseTests.cs new file mode 100644 index 0000000..868aa95 --- /dev/null +++ b/KeePass2PCL.Test.UWP/PwDatabaseTests.cs @@ -0,0 +1,117 @@ +using System.Reflection; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using PCLStorage; +using System.IO; +using KeePass2PCL.Serialization; +using KeePass2PCL.Keys; + +namespace KeePass2PCL.Test.UWP +{ + [TestClass] + public class PwDatabaseTests + { + [TestMethod] + public void Open_With_Wrong_Password_Test() + { + IFolder folder = SpecialFolder.Current.Local; + IFolder testData = folder.CreateFolderAsync("TestData", + CreationCollisionOption.OpenIfExists).Result; + IFile file = testData.CreateFileAsync("1.kdbx", + CreationCollisionOption.ReplaceExisting).Result; + var fileStream = file.OpenAsync(PCLStorage.FileAccess.ReadAndWrite).Result; + var assembly = typeof(PwDatabaseTests).GetTypeInfo().Assembly; + var stream = assembly.GetManifestResourceStream( + "KeePass2PCL.Test.UWP.TestData.1.kdbx"); + using (var reader = new BinaryReader(stream)) + using (var fileWriter = new BinaryWriter(fileStream)) + { + fileWriter.Write(reader.ReadBytes((int)stream.Length)); + } + + var ci = new IOConnectionInfo(); + ci.Path = file.Path; + var key = new CompositeKey(); + key.AddUserKey(new KcpPassword("0")); + var db = new PwDatabase(); + bool wasException = false; + try + { + db.Open(ci, key, null); + } + catch (InvalidCompositeKeyException) + { + wasException = true; + } + Assert.IsTrue(wasException); + file.DeleteAsync().Wait(); + testData.DeleteAsync().Wait(); + } + + [TestMethod] + public void Open_With_KeyFile_Test() + { + IFolder folder = SpecialFolder.Current.Local; + IFolder testData = folder.CreateFolderAsync("TestData", + CreationCollisionOption.OpenIfExists).Result; + IFile keyFile = testData.CreateFileAsync("1.key", + CreationCollisionOption.ReplaceExisting).Result; + var fileStream = keyFile.OpenAsync(PCLStorage.FileAccess.ReadAndWrite).Result; + var assembly = typeof(PwDatabaseTests).GetTypeInfo().Assembly; + var stream = assembly.GetManifestResourceStream( + "KeePass2PCL.Test.UWP.TestData.1.key"); + using (var reader = new BinaryReader(stream)) + using (var fileWriter = new BinaryWriter(fileStream)) + { + fileWriter.Write(reader.ReadBytes((int)stream.Length)); + } + + IFile file = testData.CreateFileAsync("1key.kdbx", + CreationCollisionOption.ReplaceExisting).Result; + fileStream = file.OpenAsync(PCLStorage.FileAccess.ReadAndWrite).Result; + assembly = typeof(PwDatabaseTests).GetTypeInfo().Assembly; + stream = assembly.GetManifestResourceStream( + "KeePass2PCL.Test.UWP.TestData.1key.kdbx"); + using (var reader = new BinaryReader(stream)) + using (var fileWriter = new BinaryWriter(fileStream)) + { + fileWriter.Write(reader.ReadBytes((int)stream.Length)); + } + + var ci = new IOConnectionInfo(); + ci.Path = file.Path; + var key = new CompositeKey(); + key.AddUserKey(new KcpKeyFile(keyFile.Path)); + var db = new PwDatabase(); + db.Open(ci, key, null); + keyFile.DeleteAsync().Wait(); + file.DeleteAsync().Wait(); + testData.DeleteAsync().Wait(); + } + + [TestMethod] + public void New_Test() + { + IFolder folder = SpecialFolder.Current.Local; + IFolder testData = folder.CreateFolderAsync("TestData", + CreationCollisionOption.OpenIfExists).Result; + IFile file = testData.CreateFileAsync("1.kdbx", + CreationCollisionOption.ReplaceExisting).Result; + + var ci = new IOConnectionInfo(); + ci.Path = file.Path; + var key = new CompositeKey(); + key.AddUserKey(new KcpPassword("0")); + var db = new PwDatabase(); + db.New(ci, key); + var initialEnitiesCount = db.RootGroup.GetEntriesCount(true); + Assert.AreNotEqual(0, initialEnitiesCount); + db.Save(null); + db.Close(); + Assert.IsNull(db.RootGroup); + db = new PwDatabase(); + db.Open(ci, key, null); + Assert.AreEqual(initialEnitiesCount, + db.RootGroup.GetEntriesCount(true)); + } + } +} diff --git a/KeePass2PCL.Test.UWP/TestData/1.kdbx b/KeePass2PCL.Test.UWP/TestData/1.kdbx new file mode 100644 index 0000000000000000000000000000000000000000..9a6ea8aae099337f000fd8a0240027a90b846106 GIT binary patch literal 1134 zcmV-!1d;m#*`k_f`%AR}00RI55CAd3^5(yBLr}h01tDtuTK@wC0096100bZaGO0rb z1=bNzlj5*a^)Q|w>#Ybsf{)ZViToe@88uil1t0*FR`tXWwU9t@4d018twNh8`zETV zWNkB0QVbnBH-g0m2mo*w00000000LN0C9w}Sn!mL~^@a+dyh!JszJYt?v`F0{ zH=)Qlo2Rk*x=b59N!u@J$DdOGOm;-LXOqZsQ2s;9d*zf?{Y!xQ>;*azwF?@y zhFS`fSHS^MuU@V&X|^kZ#TX`ECo~y{QG(PmmuRZRe9cD5MQqf)kNBgIrucm~|B17AQUOyGsF}H8dCP)l9@Or;raLWR6(zh) zt;G&{W~o~Q0!B0GeD9+t{91Bu95o)9AR4MEQMMU#P9E@gVB4F&S80Fi@t&Suy~tYu ztHfl;DC+}d1(%R$)@Nr|hL+83AV@-xya2^Jm5-8{=vyq^_;)TUNIFx9p2_-ui4a8J zz!J-u&ZQ}RVMPurVhru4M_3KVDRb({;HM!jS<*I2b?xd{ErB}45$R2X-q}|P{$%V+ z1lSx>&tk0Wm%*9pbWEQmlKhzWw%o?~9SSCrxHIin8*5;E3s6BTi$_ILl z8FcyV@mbozW-0{{!RZyfJ_Q$u8~l&t8_dSTS^rtn=!b=rxB)5Ko0!IzoQ4|H(WGi=JosZuSqa zhLrR2`c{5s)`a1aA7YuI-ctE3_)onZE!l#!Rtmt@dCCwt&{Dm3rpUjcBpDb=2=blX z8KRUHL1WN$ybMoYC+BQ@Bi305CV#|fg4DDoC5fni3vK$dp-wr0dZvTmR*h5RGWPbP?1{8u6 A`~Uy| literal 0 HcmV?d00001 diff --git a/KeePass2PCL.Test.UWP/TestData/1.key b/KeePass2PCL.Test.UWP/TestData/1.key new file mode 100644 index 0000000..fcbc781 --- /dev/null +++ b/KeePass2PCL.Test.UWP/TestData/1.key @@ -0,0 +1,9 @@ + + + + 1.00 + + + M+5k7gXYzjN8Vwp5akdSwaPeUhBq0bC0q5qnSYlJmAw= + + diff --git a/KeePass2PCL.Test.UWP/TestData/1key.kdbx b/KeePass2PCL.Test.UWP/TestData/1key.kdbx new file mode 100644 index 0000000000000000000000000000000000000000..838ad6cd0414cdfb523c2d69606868195e5b7f3c GIT binary patch literal 1838 zcmV+}2hsQg*`k_f`%AR}00RI55CAd3^5(yBLr}h01tDtuTK@wC0096100bZa(iGCt zqwa}kkHgz}gvA)@g)DQVa412mo*w00000000LN05a(iS$1IcE6<(J%+nG&_Xr>Wwr>-Nd@ur) z0dIQ_7BM@DB|IPHO@O+xfYGyBwz)D32_OJeS8TPu(N8I@Hc|RwcQGL$zYzCbQf3#OAG0^cQH~6}!g)7?x=c?y3Mow!7W?=Spe^$6QkqD)I1Vj> z;imno(7Yg(!i`lCskB*YSc7L{#Rm@lUw)NY;%L^iRYv(U*0ZE_>uB!cj(4x6#GUq& zbq$L4)I5hmY%Nw@8Qva-<1GWy3Hc`#LXwEVNQ^Y+ftW9g+KVI>4UFp}r@=$OZ~88N zcC*T05E6wGsu5K%+lXeBV-;o30Q8l_j!3L-7bk;}S^vxwZa#p3x5;@^ScDuff@*c}-Nte~0db(5*B`C67zH2!d8 zx_iZ0@3S~>NQo(2Se7rSPQwf@R%)fPK#;xa_5JwcRI6;3cWs2Xmu1}Bp%RX!Rp4#} zU2MiZCGI2T8u~aa_=xaDY;hoi=SvJBYMG4fsXDIRM0k+C$t?ugQ!*ZKKi^eY!GY=r zl29l5=(-QN3FR_i=Y7Z&il|U(Dgyr?kvek+PiqW=CDf}l<>c`5vMqoD!RN6AWL}%#}?*iYtR`JOEYp zc!~DEip6O_1b3U{9^;fc&ql}Zmhl)pRa^Eo;BU(@5>TY4Z1-j~-H)lL@rGHE_inE@ zK3^We>b{)9ZXrW|BPB_t2u^+6#|`C2*~U%=P>W;H=+m5mT==WqW31RYQe5(Y-?d9>wVM6w^}M#R(;gttgR(EI19O;6G9o!z+&8x_>Pd-s0wV;uV&cJwQM zOC82`Vixm*?G2@I|s3lsantqbMo2RUK z>D~7r%IJ{v2TC4iy9sLu3Wl!6uKsa+|J+&b8zl`8Tmi;Yl~-6T!A&`tD+Q}U^|g9a z4#nr`ftI29MK5!vCs2LItu_QlXxqTv)0(FM6W%`%*3x;*grDwj5xl6J>JmG*uQ=bt ztnC)Vl&{2s>|Jaj(;jR_i6Nsj=@H^VdY^oL{pWEuzadJWXP!fgWTY~CMcFMO)7}&t z``{aC5xO#V#Y8C+YQKF$9Pys*-6huBp+b&`H$uhc_BpDMpn&Qh1~~N@Sp1WrPW)Fj z8FS9`4=Y8~j1W91rnze{eBdcun)Fn#DyEGIGW*VKX_u5?=@>Gc^7ajS;Jmp2=ExD@ zp>-SAd)$z~5krBhAtP^xLQshLMQ^=L-N3T8OuIAt4X6EOg&n&;55S^34RdotarXF< zJu*qJr9>b!g7W{9B<=V&?CVkCwV3@ybYYFc9u{N_u&e-I#ftDHaomS77ul-fB*CwV zG7Q3^aH?k++wW8g-PWZKk%&67{}3v+4@wLm72-0rWZ;kyZe4}d<)1yM+jWi+mo(%x z{{?S&q@powe*kaA4D!Yg+w+~uK43b3- + + diff --git a/KeePass2PCL.Test.UWP/UnitTestApp.xaml.cs b/KeePass2PCL.Test.UWP/UnitTestApp.xaml.cs new file mode 100644 index 0000000..22ee43c --- /dev/null +++ b/KeePass2PCL.Test.UWP/UnitTestApp.xaml.cs @@ -0,0 +1,102 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Runtime.InteropServices.WindowsRuntime; +using Windows.ApplicationModel; +using Windows.ApplicationModel.Activation; +using Windows.Foundation; +using Windows.Foundation.Collections; +using Windows.UI.Xaml; +using Windows.UI.Xaml.Controls; +using Windows.UI.Xaml.Controls.Primitives; +using Windows.UI.Xaml.Data; +using Windows.UI.Xaml.Input; +using Windows.UI.Xaml.Media; +using Windows.UI.Xaml.Navigation; + +namespace KeePass2PCL.Test.UWP +{ + ///

+ /// Provides application-specific behavior to supplement the default Application class. + /// + sealed partial class App : Application + { + /// + /// Initializes the singleton application object. This is the first line of authored code + /// executed, and as such is the logical equivalent of main() or WinMain(). + /// + public App() + { + this.InitializeComponent(); + this.Suspending += OnSuspending; + } + + /// + /// Invoked when the application is launched normally by the end user. Other entry points + /// will be used such as when the application is launched to open a specific file. + /// + /// Details about the launch request and process. + protected override void OnLaunched(LaunchActivatedEventArgs e) + { + +#if DEBUG + if (System.Diagnostics.Debugger.IsAttached) + { + this.DebugSettings.EnableFrameRateCounter = true; + } +#endif + + Frame rootFrame = Window.Current.Content as Frame; + + // Do not repeat app initialization when the Window already has content, + // just ensure that the window is active + if (rootFrame == null) + { + // Create a Frame to act as the navigation context and navigate to the first page + rootFrame = new Frame(); + + rootFrame.NavigationFailed += OnNavigationFailed; + + if (e.PreviousExecutionState == ApplicationExecutionState.Terminated) + { + //TODO: Load state from previously suspended application + } + + // Place the frame in the current Window + Window.Current.Content = rootFrame; + } + + Microsoft.VisualStudio.TestPlatform.TestExecutor.UnitTestClient.CreateDefaultUI(); + + // Ensure the current window is active + Window.Current.Activate(); + + Microsoft.VisualStudio.TestPlatform.TestExecutor.UnitTestClient.Run(e.Arguments); + } + + /// + /// Invoked when Navigation to a certain page fails + /// + /// The Frame which failed navigation + /// Details about the navigation failure + void OnNavigationFailed(object sender, NavigationFailedEventArgs e) + { + throw new Exception("Failed to load Page " + e.SourcePageType.FullName); + } + + /// + /// Invoked when application execution is being suspended. Application state is saved + /// without knowing whether the application will be terminated or resumed with the contents + /// of memory still intact. + /// + /// The source of the suspend request. + /// Details about the suspend request. + private void OnSuspending(object sender, SuspendingEventArgs e) + { + var deferral = e.SuspendingOperation.GetDeferral(); + //TODO: Save application state and stop any background activity + deferral.Complete(); + } + } +} diff --git a/KeePass2PCL.Test/KeePass2PCL.Test.KeePassLib.csproj b/KeePass2PCL.Test/KeePass2PCL.Test.KeePassLib.csproj new file mode 100644 index 0000000..a40e2e8 --- /dev/null +++ b/KeePass2PCL.Test/KeePass2PCL.Test.KeePassLib.csproj @@ -0,0 +1,65 @@ + + + + + Debug + AnyCPU + {2637FAA9-838C-43AB-81F3-BB231E0E1DCA} + Library + KeePass2PCL.Test.KeePassLib + KeePass2PCL.Test.KeePassLib + v4.5 + + + + + true + full + false + bin\Debug + DEBUG;KeePassLib + prompt + 4 + false + + + true + bin\Release + KeePassLib; + prompt + 4 + false + + + + ..\packages\Castle.Core.4.1.1\lib\net45\Castle.Core.dll + + + ..\packages\pt.KeePassLib.2.35.2\lib\net20\KeePassLib.dll + + + ..\packages\Moq.4.7.99\lib\net45\Moq.dll + + + ..\packages\NUnit.3.7.1\lib\net45\nunit.framework.dll + + + + + + + + + + + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + \ No newline at end of file diff --git a/KeePass2PCL.Test/app.config b/KeePass2PCL.Test/app.config new file mode 100644 index 0000000..81b66be --- /dev/null +++ b/KeePass2PCL.Test/app.config @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/KeePass2PCL.Test/packages.config b/KeePass2PCL.Test/packages.config new file mode 100644 index 0000000..58f1691 --- /dev/null +++ b/KeePass2PCL.Test/packages.config @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/ModernKeePass.sln b/ModernKeePass.sln index 4c7e596..afc08f4 100644 --- a/ModernKeePass.sln +++ b/ModernKeePass.sln @@ -7,6 +7,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModernKeePass", "ModernKeeP EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModernKeePassLibPCL", "ModernKeePassLib\ModernKeePassLibPCL.csproj", "{2E710089-9559-4967-846C-E763DD1F3ACB}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModernKeePassLib.Test", "ModernKeePassLib.Test\ModernKeePassLib.Test.csproj", "{067456C0-086C-46A8-B37F-1405717B7BFC}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -59,6 +61,22 @@ Global {2E710089-9559-4967-846C-E763DD1F3ACB}.Release|x64.Build.0 = Release|Any CPU {2E710089-9559-4967-846C-E763DD1F3ACB}.Release|x86.ActiveCfg = Release|Any CPU {2E710089-9559-4967-846C-E763DD1F3ACB}.Release|x86.Build.0 = Release|Any CPU + {067456C0-086C-46A8-B37F-1405717B7BFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {067456C0-086C-46A8-B37F-1405717B7BFC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {067456C0-086C-46A8-B37F-1405717B7BFC}.Debug|ARM.ActiveCfg = Debug|Any CPU + {067456C0-086C-46A8-B37F-1405717B7BFC}.Debug|ARM.Build.0 = Debug|Any CPU + {067456C0-086C-46A8-B37F-1405717B7BFC}.Debug|x64.ActiveCfg = Debug|Any CPU + {067456C0-086C-46A8-B37F-1405717B7BFC}.Debug|x64.Build.0 = Debug|Any CPU + {067456C0-086C-46A8-B37F-1405717B7BFC}.Debug|x86.ActiveCfg = Debug|Any CPU + {067456C0-086C-46A8-B37F-1405717B7BFC}.Debug|x86.Build.0 = Debug|Any CPU + {067456C0-086C-46A8-B37F-1405717B7BFC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {067456C0-086C-46A8-B37F-1405717B7BFC}.Release|Any CPU.Build.0 = Release|Any CPU + {067456C0-086C-46A8-B37F-1405717B7BFC}.Release|ARM.ActiveCfg = Release|Any CPU + {067456C0-086C-46A8-B37F-1405717B7BFC}.Release|ARM.Build.0 = Release|Any CPU + {067456C0-086C-46A8-B37F-1405717B7BFC}.Release|x64.ActiveCfg = Release|Any CPU + {067456C0-086C-46A8-B37F-1405717B7BFC}.Release|x64.Build.0 = Release|Any CPU + {067456C0-086C-46A8-B37F-1405717B7BFC}.Release|x86.ActiveCfg = Release|Any CPU + {067456C0-086C-46A8-B37F-1405717B7BFC}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/ModernKeePass/Common/DatabaseHelper.cs b/ModernKeePass/Common/DatabaseHelper.cs index d0e2ed5..4306b92 100644 --- a/ModernKeePass/Common/DatabaseHelper.cs +++ b/ModernKeePass/Common/DatabaseHelper.cs @@ -31,8 +31,11 @@ namespace ModernKeePass.Common _pwDatabase.Open(IOConnectionInfo.FromFile(databaseFile), key, new NullStatusLogger()); //_pwDatabase.Open(IOConnectionInfo.FromPath(databaseFile.Path), key, new NullStatusLogger()); IsOpen = _pwDatabase.IsOpen; - Name = databaseFile.DisplayName; - RootGroup = new GroupVm(_pwDatabase.RootGroup); + if (IsOpen) + { + Name = databaseFile.DisplayName; + RootGroup = new GroupVm(_pwDatabase.RootGroup); + } } catch (ArgumentNullException) { diff --git a/ModernKeePass/MainPage.xaml b/ModernKeePass/MainPage.xaml index 3ecfd71..b0a737e 100644 --- a/ModernKeePass/MainPage.xaml +++ b/ModernKeePass/MainPage.xaml @@ -20,7 +20,7 @@ - + @@ -37,6 +37,7 @@ New File Recent files - Coming soon + Url files - Coming soon @@ -56,6 +57,6 @@