diff --git a/MacPass.xcodeproj/project.pbxproj b/MacPass.xcodeproj/project.pbxproj index a619c065..b8dbdb65 100644 --- a/MacPass.xcodeproj/project.pbxproj +++ b/MacPass.xcodeproj/project.pbxproj @@ -43,6 +43,7 @@ 4C2724D11778EFE300FD8456 /* NSString+Empty.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C2724D01778EFE300FD8456 /* NSString+Empty.m */; }; 4C2724D41778FA0700FD8456 /* NSDate+Packed.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C2724D31778FA0700FD8456 /* NSDate+Packed.m */; }; 4C2724D71778FF1A00FD8456 /* NSUUID+KeePassLib.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C2724D61778FF1A00FD8456 /* NSUUID+KeePassLib.m */; }; + 4C2724DA17790E7C00FD8456 /* NSMutableData+Base64.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C2724D917790E7C00FD8456 /* NSMutableData+Base64.m */; }; 4C2C4C2C16D3BE3700D49295 /* KdbGroup+MPTreeTools.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C2C4C2B16D3BE3700D49295 /* KdbGroup+MPTreeTools.m */; }; 4C2E381D16D11FF900037A9D /* 03_ServerTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C2E381A16D11FF900037A9D /* 03_ServerTemplate.pdf */; }; 4C2E381E16D11FF900037A9D /* 04_KlipperTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C2E381B16D11FF900037A9D /* 04_KlipperTemplate.pdf */; }; @@ -90,7 +91,6 @@ 4C669B8A16760ED100DD0774 /* InputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B4716760ED100DD0774 /* InputStream.m */; }; 4C669B8B16760ED100DD0774 /* OutputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B4916760ED100DD0774 /* OutputStream.m */; }; 4C669B8C16760ED100DD0774 /* Sha256OutputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B4B16760ED100DD0774 /* Sha256OutputStream.m */; }; - 4C669B8E16760ED100DD0774 /* Base64.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B5016760ED100DD0774 /* Base64.m */; }; 4C669B8F16760ED100DD0774 /* DDXMLDocument+MKPAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B5216760ED100DD0774 /* DDXMLDocument+MKPAdditions.m */; }; 4C669B9016760ED100DD0774 /* DDXMLElement+MKPAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B5416760ED100DD0774 /* DDXMLElement+MKPAdditions.m */; }; 4C669B9116760ED100DD0774 /* Kdb.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B5616760ED100DD0774 /* Kdb.m */; }; @@ -251,6 +251,8 @@ 4C2724D31778FA0700FD8456 /* NSDate+Packed.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDate+Packed.m"; sourceTree = ""; }; 4C2724D51778FF1A00FD8456 /* NSUUID+KeePassLib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSUUID+KeePassLib.h"; sourceTree = ""; }; 4C2724D61778FF1A00FD8456 /* NSUUID+KeePassLib.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSUUID+KeePassLib.m"; sourceTree = ""; }; + 4C2724D817790E7C00FD8456 /* NSMutableData+Base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSMutableData+Base64.h"; sourceTree = ""; }; + 4C2724D917790E7C00FD8456 /* NSMutableData+Base64.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSMutableData+Base64.m"; sourceTree = ""; }; 4C2C4C2A16D3BE3700D49295 /* KdbGroup+MPTreeTools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "KdbGroup+MPTreeTools.h"; sourceTree = ""; }; 4C2C4C2B16D3BE3700D49295 /* KdbGroup+MPTreeTools.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "KdbGroup+MPTreeTools.m"; sourceTree = ""; }; 4C2E381A16D11FF900037A9D /* 03_ServerTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 03_ServerTemplate.pdf; sourceTree = ""; }; @@ -335,8 +337,6 @@ 4C669B4916760ED100DD0774 /* OutputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OutputStream.m; sourceTree = ""; }; 4C669B4A16760ED100DD0774 /* Sha256OutputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Sha256OutputStream.h; sourceTree = ""; }; 4C669B4B16760ED100DD0774 /* Sha256OutputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Sha256OutputStream.m; sourceTree = ""; }; - 4C669B4F16760ED100DD0774 /* Base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Base64.h; sourceTree = ""; }; - 4C669B5016760ED100DD0774 /* Base64.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Base64.m; sourceTree = ""; }; 4C669B5116760ED100DD0774 /* DDXMLDocument+MKPAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "DDXMLDocument+MKPAdditions.h"; sourceTree = ""; }; 4C669B5216760ED100DD0774 /* DDXMLDocument+MKPAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "DDXMLDocument+MKPAdditions.m"; sourceTree = ""; }; 4C669B5316760ED100DD0774 /* DDXMLElement+MKPAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "DDXMLElement+MKPAdditions.h"; sourceTree = ""; }; @@ -705,6 +705,8 @@ 4C2724D31778FA0700FD8456 /* NSDate+Packed.m */, 4C2724D51778FF1A00FD8456 /* NSUUID+KeePassLib.h */, 4C2724D61778FF1A00FD8456 /* NSUUID+KeePassLib.m */, + 4C2724D817790E7C00FD8456 /* NSMutableData+Base64.h */, + 4C2724D917790E7C00FD8456 /* NSMutableData+Base64.m */, ); name = Categories; sourceTree = ""; @@ -865,8 +867,6 @@ isa = PBXGroup; children = ( 4C2724CB1778EF8E00FD8456 /* Categories */, - 4C669B4F16760ED100DD0774 /* Base64.h */, - 4C669B5016760ED100DD0774 /* Base64.m */, 4C669B5116760ED100DD0774 /* DDXMLDocument+MKPAdditions.h */, 4C669B5216760ED100DD0774 /* DDXMLDocument+MKPAdditions.m */, 4C669B5316760ED100DD0774 /* DDXMLElement+MKPAdditions.h */, @@ -1316,7 +1316,6 @@ 4C669B8A16760ED100DD0774 /* InputStream.m in Sources */, 4C669B8B16760ED100DD0774 /* OutputStream.m in Sources */, 4C669B8C16760ED100DD0774 /* Sha256OutputStream.m in Sources */, - 4C669B8E16760ED100DD0774 /* Base64.m in Sources */, 4C669B8F16760ED100DD0774 /* DDXMLDocument+MKPAdditions.m in Sources */, 4C669B9016760ED100DD0774 /* DDXMLElement+MKPAdditions.m in Sources */, 4C669B9116760ED100DD0774 /* Kdb.m in Sources */, @@ -1423,6 +1422,7 @@ 4C2724D11778EFE300FD8456 /* NSString+Empty.m in Sources */, 4C2724D41778FA0700FD8456 /* NSDate+Packed.m in Sources */, 4C2724D71778FF1A00FD8456 /* NSUUID+KeePassLib.m in Sources */, + 4C2724DA17790E7C00FD8456 /* NSMutableData+Base64.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/MacPass/MacPass-Info.plist b/MacPass/MacPass-Info.plist index d8940e2b..262492be 100644 --- a/MacPass/MacPass-Info.plist +++ b/MacPass/MacPass-Info.plist @@ -48,7 +48,7 @@ CFBundleSignature ???? CFBundleVersion - 1049 + 1063 LSMinimumSystemVersion ${MACOSX_DEPLOYMENT_TARGET} NSHumanReadableCopyright diff --git a/MacPass/de.lproj/Credits.rtf b/MacPass/de.lproj/Credits.rtf index 12c768f8..415e41d8 100644 --- a/MacPass/de.lproj/Credits.rtf +++ b/MacPass/de.lproj/Credits.rtf @@ -40,4 +40,8 @@ Copyright \'a9 2010 Qiang Yu. Alle Rechte vorbehalten.\ \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 {\field{\*\fldinst{HYPERLINK "https://github.com/Perspx/PXSourceList"}}{\fldrslt \cf3 PXSourceList}}\ -Copyright \'a9 2011, Alex Rozanski. Alle Rechte vorbehalten.} \ No newline at end of file +Copyright \'a9 2011, Alex Rozanski. Alle Rechte vorbehalten.\ +\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 +{\field{\*\fldinst{HYPERLINK "http://stackoverflow.com/questions/11386876/how-to-encode-and-decode-files-as-base64-in-cocoa-objective-c"}}{\fldrslt \cf3 Base64 Encoding Category}}\ +Copyright @2013, {\field{\*\fldinst{HYPERLINK "http://stackoverflow.com/users/200321/denis2342"}}{\fldrslt \cf3 denis2342}}} \ No newline at end of file diff --git a/MacPass/en.lproj/Credits.rtf b/MacPass/en.lproj/Credits.rtf index 74400892..008524e4 100644 --- a/MacPass/en.lproj/Credits.rtf +++ b/MacPass/en.lproj/Credits.rtf @@ -1,7 +1,7 @@ {\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf390 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;\red52\green110\blue183;\red38\green38\blue38;} -\paperw11900\paperh16840\vieww28040\viewh7240\viewkind0 +\paperw11900\paperh16840\vieww27740\viewh14060\viewkind0 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 \f0\b\fs24 \cf0 Project Website:\ @@ -40,4 +40,8 @@ Copyright \'a9 2010 Qiang Yu. All rights reserved.\ \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 {\field{\*\fldinst{HYPERLINK "https://github.com/Perspx/PXSourceList"}}{\fldrslt \cf3 PXSourceList}}\ -Copyright \'a9 2011, Alex Rozanski. All rights reserved.} \ No newline at end of file +Copyright \'a9 2011, Alex Rozanski. All rights reserved.\ +\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 +{\field{\*\fldinst{HYPERLINK "http://stackoverflow.com/questions/11386876/how-to-encode-and-decode-files-as-base64-in-cocoa-objective-c"}}{\fldrslt \cf3 Base64 Encoding Category}}\ +Copyright @2013, {\field{\*\fldinst{HYPERLINK "http://stackoverflow.com/users/200321/denis2342"}}{\fldrslt \cf3 denis2342}}} \ No newline at end of file diff --git a/MiniKeePassLib b/MiniKeePassLib index 4b5d2acd..869ba4a6 160000 --- a/MiniKeePassLib +++ b/MiniKeePassLib @@ -1 +1 @@ -Subproject commit 4b5d2acd6108633a5c168bfcc21cb0d6125877a2 +Subproject commit 869ba4a65f9c6ce3b4952122aed0dbdbfddc9261