From db0640840fb52ca13edee97a4d4be5a7c457d5f8 Mon Sep 17 00:00:00 2001 From: michael starke Date: Sun, 21 Jul 2013 01:01:23 +0200 Subject: [PATCH] Updated Submodules --- KeePassKit | 2 +- MacPass.xcodeproj/project.pbxproj | 44 ++++++++++++++++++++++++++----- MacPassTests/KPKTreeLoadingTest.h | 16 +++++++++++ MacPassTests/KPKTreeLoadingTest.m | 30 +++++++++++++++++++++ 4 files changed, 85 insertions(+), 7 deletions(-) create mode 100644 MacPassTests/KPKTreeLoadingTest.h create mode 100644 MacPassTests/KPKTreeLoadingTest.m diff --git a/KeePassKit b/KeePassKit index 50900835..d4b77fc1 160000 --- a/KeePassKit +++ b/KeePassKit @@ -1 +1 @@ -Subproject commit 50900835ee5aa3e5341243f5c01feabaae0b694d +Subproject commit d4b77fc14b89df3a9ba5735718a7ee8005b85b53 diff --git a/MacPass.xcodeproj/project.pbxproj b/MacPass.xcodeproj/project.pbxproj index 2c2234fc..a027bffd 100644 --- a/MacPass.xcodeproj/project.pbxproj +++ b/MacPass.xcodeproj/project.pbxproj @@ -14,6 +14,11 @@ 4C10412C178CDD44001B5239 /* NSDate+Humanized.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C10412B178CDD44001B5239 /* NSDate+Humanized.m */; }; 4C16BA6217879A3C002B42BD /* MPPasswordStringFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C16BA6117879A3C002B42BD /* MPPasswordStringFormatter.m */; }; 4C1842AB179B027800E2F5BC /* KPKDeletedNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C1842AA179B027800E2F5BC /* KPKDeletedNode.m */; }; + 4C1842AF179B211C00E2F5BC /* KPKXmlTreeReader.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C1842AE179B211C00E2F5BC /* KPKXmlTreeReader.m */; }; + 4C1842B2179B28C400E2F5BC /* KPKBinaryTreeReader.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C1842B1179B28C400E2F5BC /* KPKBinaryTreeReader.m */; }; + 4C1842B5179B28D400E2F5BC /* KPKBinaryTreeWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C1842B4179B28D400E2F5BC /* KPKBinaryTreeWriter.m */; }; + 4C1842B8179B348600E2F5BC /* KPKTreeLoadingTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C1842B7179B348600E2F5BC /* KPKTreeLoadingTest.m */; }; + 4C1842BC179B434C00E2F5BC /* KPKChipherInformation.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C1842BB179B434C00E2F5BC /* KPKChipherInformation.m */; }; 4C18F9AB178E122500890BCE /* Test_Password_1234.kdb in Resources */ = {isa = PBXBuildFile; fileRef = 4C18F9AA178E122500890BCE /* Test_Password_1234.kdb */; }; 4C19E500178E26EF002F2CD0 /* Test_Password_1234.kdbx in Resources */ = {isa = PBXBuildFile; fileRef = 4C19E4FF178E26EF002F2CD0 /* Test_Password_1234.kdbx */; }; 4C19E503178E2871002F2CD0 /* MPDatabasePasswordAndKeyfile.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C19E502178E2871002F2CD0 /* MPDatabasePasswordAndKeyfile.m */; }; @@ -151,7 +156,7 @@ 4C6D1D27178586CA0014C5A5 /* 99_AddFolderTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C6D1D26178586CA0014C5A5 /* 99_AddFolderTemplate.pdf */; }; 4C6D1D2B17858A250014C5A5 /* MacPass.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4C6D1D2A17858A250014C5A5 /* MacPass.icns */; }; 4C701CBC178618A000581B88 /* 12_RemoteTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C701CBB178618A000581B88 /* 12_RemoteTemplate.pdf */; }; - 4C70D0FD1790924700652EE9 /* KPKParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C70D0FC1790924700652EE9 /* KPKParser.m */; }; + 4C70D0FD1790924700652EE9 /* KPKTreeLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C70D0FC1790924700652EE9 /* KPKTreeLoader.m */; }; 4C70D100179092F200652EE9 /* KPKPassword.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C70D0FF179092F200652EE9 /* KPKPassword.m */; }; 4C74DD07177BD1640034A9DB /* MPCustomFieldView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C74DD06177BD1640034A9DB /* MPCustomFieldView.m */; }; 4C76155C1764C04C0015A1A6 /* GeneralSettings.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C76155E1764C04C0015A1A6 /* GeneralSettings.xib */; }; @@ -255,6 +260,17 @@ 4C16BA6117879A3C002B42BD /* MPPasswordStringFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPPasswordStringFormatter.m; sourceTree = ""; }; 4C1842A9179B027700E2F5BC /* KPKDeletedNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKDeletedNode.h; sourceTree = ""; }; 4C1842AA179B027800E2F5BC /* KPKDeletedNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKDeletedNode.m; sourceTree = ""; }; + 4C1842AD179B211C00E2F5BC /* KPKXmlTreeReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKXmlTreeReader.h; sourceTree = ""; }; + 4C1842AE179B211C00E2F5BC /* KPKXmlTreeReader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKXmlTreeReader.m; sourceTree = ""; }; + 4C1842B0179B28C400E2F5BC /* KPKBinaryTreeReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKBinaryTreeReader.h; sourceTree = ""; }; + 4C1842B1179B28C400E2F5BC /* KPKBinaryTreeReader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKBinaryTreeReader.m; sourceTree = ""; }; + 4C1842B3179B28D400E2F5BC /* KPKBinaryTreeWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKBinaryTreeWriter.h; sourceTree = ""; }; + 4C1842B4179B28D400E2F5BC /* KPKBinaryTreeWriter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKBinaryTreeWriter.m; sourceTree = ""; }; + 4C1842B6179B348600E2F5BC /* KPKTreeLoadingTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKTreeLoadingTest.h; sourceTree = ""; }; + 4C1842B7179B348600E2F5BC /* KPKTreeLoadingTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKTreeLoadingTest.m; sourceTree = ""; }; + 4C1842B9179B3A1700E2F5BC /* KPKHeaderFields.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KPKHeaderFields.h; sourceTree = ""; }; + 4C1842BA179B434C00E2F5BC /* KPKChipherInformation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKChipherInformation.h; sourceTree = ""; }; + 4C1842BB179B434C00E2F5BC /* KPKChipherInformation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKChipherInformation.m; sourceTree = ""; }; 4C18F9AA178E122500890BCE /* Test_Password_1234.kdb */ = {isa = PBXFileReference; lastKnownFileType = file; name = Test_Password_1234.kdb; path = Databases/Test_Password_1234.kdb; sourceTree = ""; }; 4C19E4FF178E26EF002F2CD0 /* Test_Password_1234.kdbx */ = {isa = PBXFileReference; lastKnownFileType = file; name = Test_Password_1234.kdbx; path = Databases/Test_Password_1234.kdbx; sourceTree = ""; }; 4C19E501178E2871002F2CD0 /* MPDatabasePasswordAndKeyfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPDatabasePasswordAndKeyfile.h; sourceTree = ""; }; @@ -508,8 +524,8 @@ 4C6D1D26178586CA0014C5A5 /* 99_AddFolderTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 99_AddFolderTemplate.pdf; sourceTree = ""; }; 4C6D1D2A17858A250014C5A5 /* MacPass.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = MacPass.icns; path = "../Assets/App icon/MacPass.icns"; sourceTree = ""; }; 4C701CBB178618A000581B88 /* 12_RemoteTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 12_RemoteTemplate.pdf; sourceTree = ""; }; - 4C70D0FB1790924700652EE9 /* KPKParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKParser.h; sourceTree = ""; }; - 4C70D0FC1790924700652EE9 /* KPKParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKParser.m; sourceTree = ""; }; + 4C70D0FB1790924700652EE9 /* KPKTreeLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKTreeLoader.h; sourceTree = ""; }; + 4C70D0FC1790924700652EE9 /* KPKTreeLoader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKTreeLoader.m; sourceTree = ""; }; 4C70D0FE179092F200652EE9 /* KPKPassword.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKPassword.h; sourceTree = ""; }; 4C70D0FF179092F200652EE9 /* KPKPassword.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKPassword.m; sourceTree = ""; }; 4C74DD05177BD1640034A9DB /* MPCustomFieldView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPCustomFieldView.h; sourceTree = ""; }; @@ -1056,6 +1072,8 @@ 4C45FB1F178E09ED0010007D /* Supporting Files */, 4C305F3A179A19F90082334F /* KPKIconLoading.h */, 4C305F3B179A19F90082334F /* KPKIconLoading.m */, + 4C1842B6179B348600E2F5BC /* KPKTreeLoadingTest.h */, + 4C1842B7179B348600E2F5BC /* KPKTreeLoadingTest.m */, ); path = MacPassTests; sourceTree = ""; @@ -1460,12 +1478,21 @@ 4CD3ABB5178F71B50073F5C5 /* IO */ = { isa = PBXGroup; children = ( - 4C70D0FB1790924700652EE9 /* KPKParser.h */, - 4C70D0FC1790924700652EE9 /* KPKParser.m */, + 4C70D0FB1790924700652EE9 /* KPKTreeLoader.h */, + 4C70D0FC1790924700652EE9 /* KPKTreeLoader.m */, 4CDB5C401794AA4F0017667E /* KPKTree+Serializing.h */, 4CDB5C411794AA4F0017667E /* KPKTree+Serializing.m */, 4C5AA58F179549A1008ECAD7 /* KPKXmlTreeWriter.h */, 4C5AA590179549A1008ECAD7 /* KPKXmlTreeWriter.m */, + 4C1842AD179B211C00E2F5BC /* KPKXmlTreeReader.h */, + 4C1842AE179B211C00E2F5BC /* KPKXmlTreeReader.m */, + 4C1842B0179B28C400E2F5BC /* KPKBinaryTreeReader.h */, + 4C1842B1179B28C400E2F5BC /* KPKBinaryTreeReader.m */, + 4C1842B3179B28D400E2F5BC /* KPKBinaryTreeWriter.h */, + 4C1842B4179B28D400E2F5BC /* KPKBinaryTreeWriter.m */, + 4C1842B9179B3A1700E2F5BC /* KPKHeaderFields.h */, + 4C1842BA179B434C00E2F5BC /* KPKChipherInformation.h */, + 4C1842BB179B434C00E2F5BC /* KPKChipherInformation.m */, ); path = IO; sourceTree = ""; @@ -1694,6 +1721,7 @@ 4C45FB30178E0CE20010007D /* MPDatabaseCreation.m in Sources */, 4C19E503178E2871002F2CD0 /* MPDatabasePasswordAndKeyfile.m in Sources */, 4C305F3C179A19F90082334F /* KPKIconLoading.m in Sources */, + 4C1842B8179B348600E2F5BC /* KPKTreeLoadingTest.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1853,7 +1881,7 @@ 4CD3ABC2178F72720073F5C5 /* KPKGroup.m in Sources */, 4C591B57178F897A0080B16B /* KPKAttachment.m in Sources */, 4C39B3F5178FEFAE0027DC7C /* KPKNode.m in Sources */, - 4C70D0FD1790924700652EE9 /* KPKParser.m in Sources */, + 4C70D0FD1790924700652EE9 /* KPKTreeLoader.m in Sources */, 4C70D100179092F200652EE9 /* KPKPassword.m in Sources */, 4C8A173D1790AA41008B5C17 /* NSData+Keyfile.m in Sources */, 4C3F28541791EDFD00703281 /* KPKErrors.m in Sources */, @@ -1874,6 +1902,10 @@ 4C305F36179A0BD70082334F /* KPKIcon.m in Sources */, 4CA7C36C179A98140099C34B /* NSString+Base64.m in Sources */, 4C1842AB179B027800E2F5BC /* KPKDeletedNode.m in Sources */, + 4C1842AF179B211C00E2F5BC /* KPKXmlTreeReader.m in Sources */, + 4C1842B2179B28C400E2F5BC /* KPKBinaryTreeReader.m in Sources */, + 4C1842B5179B28D400E2F5BC /* KPKBinaryTreeWriter.m in Sources */, + 4C1842BC179B434C00E2F5BC /* KPKChipherInformation.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/MacPassTests/KPKTreeLoadingTest.h b/MacPassTests/KPKTreeLoadingTest.h new file mode 100644 index 00000000..6a14bb90 --- /dev/null +++ b/MacPassTests/KPKTreeLoadingTest.h @@ -0,0 +1,16 @@ +// +// KPKTreeLoadingTest.h +// MacPass +// +// Created by Michael Starke on 20.07.13. +// Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. +// + +#import + +@interface KPKTreeLoadingTest : SenTestCase { + @private + NSData *_data; +} + +@end diff --git a/MacPassTests/KPKTreeLoadingTest.m b/MacPassTests/KPKTreeLoadingTest.m new file mode 100644 index 00000000..fa4e20be --- /dev/null +++ b/MacPassTests/KPKTreeLoadingTest.m @@ -0,0 +1,30 @@ +// +// KPKTreeLoadingTest.m +// MacPass +// +// Created by Michael Starke on 20.07.13. +// Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. +// + +#import "KPKTreeLoadingTest.h" +#import "KPKTreeLoader.h" + +@implementation KPKTreeLoadingTest + +- (void)setUp { + NSBundle *myBundle = [NSBundle bundleForClass:[self class]]; + NSURL *url = [myBundle URLForResource:@"Test_Password_1234" withExtension:@"kdbx"]; + _data = [NSData dataWithContentsOfURL:url]; +} + +- (void)tearDown { + _data = nil; +} + +- (void)testLoading { + KPKTreeLoader *loader = [[KPKTreeLoader alloc] initWithData:_data]; + KPKTree *tree = [loader loadTree]; + STAssertNil(tree, @"Loading should broken"); +} + +@end