From 0fe99cda970bad35a6bbc3981d4e81a0d35c8ac1 Mon Sep 17 00:00:00 2001
From: michael starke <michael.starke@hicknhack-software.com>
Date: Sat, 20 Jul 2013 12:23:19 +0200
Subject: [PATCH] Updated Submodules

---
 KeePassKit                        | 2 +-
 MacPass.xcodeproj/project.pbxproj | 6 ++++++
 MacPass/MPDocument+Attachments.m  | 6 +++---
 MiniKeePassLib                    | 2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/KeePassKit b/KeePassKit
index 3df84c73..685fe4e6 160000
--- a/KeePassKit
+++ b/KeePassKit
@@ -1 +1 @@
-Subproject commit 3df84c73318cdf96c8bce087e828ec43a6404b57
+Subproject commit 685fe4e69430e4229bb6f2c5f21a2a34f1c477ba
diff --git a/MacPass.xcodeproj/project.pbxproj b/MacPass.xcodeproj/project.pbxproj
index e1be3c44..6b699401 100644
--- a/MacPass.xcodeproj/project.pbxproj
+++ b/MacPass.xcodeproj/project.pbxproj
@@ -184,6 +184,7 @@
 		4CA0B2FC15BCAF8600654E32 /* MPSettingsWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CA0B2FB15BCAF8600654E32 /* MPSettingsWindowController.m */; };
 		4CA0E3A7176FAF99004D18CB /* MPDocumentQueryService.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CA0E3A6176FAF99004D18CB /* MPDocumentQueryService.m */; };
 		4CA2335A176DBFE100F0B6AC /* MPLockDaemon.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CA23359176DBFE100F0B6AC /* MPLockDaemon.m */; };
+		4CA7C36C179A98140099C34B /* NSString+Base64.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CA7C36B179A98140099C34B /* NSString+Base64.m */; };
 		4CAD747B15B887FD00104512 /* DDXMLElementAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD745715B887FD00104512 /* DDXMLElementAdditions.m */; };
 		4CAD747C15B887FD00104512 /* NSString+DDXML.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD745A15B887FD00104512 /* NSString+DDXML.m */; };
 		4CAD747D15B887FD00104512 /* DDXMLDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD745D15B887FD00104512 /* DDXMLDocument.m */; };
@@ -572,6 +573,8 @@
 		4CA0E3A6176FAF99004D18CB /* MPDocumentQueryService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPDocumentQueryService.m; sourceTree = "<group>"; };
 		4CA23358176DBFE100F0B6AC /* MPLockDaemon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPLockDaemon.h; sourceTree = "<group>"; };
 		4CA23359176DBFE100F0B6AC /* MPLockDaemon.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPLockDaemon.m; sourceTree = "<group>"; };
+		4CA7C36A179A98140099C34B /* NSString+Base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+Base64.h"; sourceTree = "<group>"; };
+		4CA7C36B179A98140099C34B /* NSString+Base64.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+Base64.m"; sourceTree = "<group>"; };
 		4CAAFDD51787AED60013FCF9 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/MainMenu.strings; sourceTree = "<group>"; };
 		4CAD745615B887FD00104512 /* DDXMLElementAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDXMLElementAdditions.h; sourceTree = "<group>"; };
 		4CAD745715B887FD00104512 /* DDXMLElementAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DDXMLElementAdditions.m; sourceTree = "<group>"; };
@@ -915,6 +918,8 @@
 				4C2724D917790E7C00FD8456 /* NSMutableData+Base64.m */,
 				4C801AFA179310E2002821E3 /* NSString+Hexdata.h */,
 				4C801AFB179310E2002821E3 /* NSString+Hexdata.m */,
+				4CA7C36A179A98140099C34B /* NSString+Base64.h */,
+				4CA7C36B179A98140099C34B /* NSString+Base64.m */,
 			);
 			name = Categories;
 			sourceTree = "<group>";
@@ -1862,6 +1867,7 @@
 				4C45100C1798C65C00219998 /* Kdb4Entry+MPAdditions.m in Sources */,
 				4CFEB36E1799D9CF00AF1868 /* Kdb3Entry+KVOAdditions.m in Sources */,
 				4C305F36179A0BD70082334F /* KPKIcon.m in Sources */,
+				4CA7C36C179A98140099C34B /* NSString+Base64.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/MacPass/MPDocument+Attachments.m b/MacPass/MPDocument+Attachments.m
index f016df5c..9a44e313 100644
--- a/MacPass/MPDocument+Attachments.m
+++ b/MacPass/MPDocument+Attachments.m
@@ -70,7 +70,7 @@
     else {
       encodedData = fileData;
     }
-    binary.data = [[NSString alloc] initWithData:encodedData encoding:NSASCIIStringEncoding];
+    binary.data = [[NSString alloc] initWithData:encodedData encoding:NSUTF8StringEncoding];
     
     [self.treeV4.binaries addObject:binary];
     BinaryRef *ref = [[BinaryRef alloc] init];
@@ -130,11 +130,11 @@
   NSData *rawData = nil;
   if(binary) {
     if(binary.compressed) {
-      rawData = [NSMutableData mutableDataWithBase64DecodedData:[binary.data dataUsingEncoding:NSASCIIStringEncoding]];
+      rawData = [NSMutableData mutableDataWithBase64DecodedData:[binary.data dataUsingEncoding:NSUTF8StringEncoding]];
       rawData = [rawData gzipInflate];
     }
     else {
-      rawData = [NSMutableData mutableDataWithBase64DecodedData:[binary.data dataUsingEncoding:NSASCIIStringEncoding]];
+      rawData = [NSMutableData mutableDataWithBase64DecodedData:[binary.data dataUsingEncoding:NSUTF8StringEncoding]];
     }
     NSError *error = nil;
     if( ![rawData writeToURL:location options:0 error:&error] ) {
diff --git a/MiniKeePassLib b/MiniKeePassLib
index 8f034d65..0b7ebb9b 160000
--- a/MiniKeePassLib
+++ b/MiniKeePassLib
@@ -1 +1 @@
-Subproject commit 8f034d65246546b90fb75c082c4b9aabd1f4409b
+Subproject commit 0b7ebb9bb174bcc9a76310b929c123e51c4849a4