From b8375d0514c40e7c29eb450f3e8e46d122ca2c9c Mon Sep 17 00:00:00 2001 From: michael starke Date: Tue, 25 Jun 2013 02:03:57 +0200 Subject: [PATCH] Removed obsolete category since it's transferred to MiniKeePassLib --- MacPass.xcodeproj/project.pbxproj | 6 ------ MacPass/MacPass-Info.plist | 2 +- MacPass/NSData+MPRandomBytes.h | 15 --------------- MacPass/NSData+MPRandomBytes.m | 20 -------------------- MacPass/NSString+MPPasswordCreation.m | 2 +- 5 files changed, 2 insertions(+), 43 deletions(-) delete mode 100644 MacPass/NSData+MPRandomBytes.h delete mode 100644 MacPass/NSData+MPRandomBytes.m diff --git a/MacPass.xcodeproj/project.pbxproj b/MacPass.xcodeproj/project.pbxproj index b8dbdb65..cdb01af6 100644 --- a/MacPass.xcodeproj/project.pbxproj +++ b/MacPass.xcodeproj/project.pbxproj @@ -59,7 +59,6 @@ 4C431BCF16E2BAB000700A81 /* OverlayWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C431BCE16E2BAB000700A81 /* OverlayWindow.xib */; }; 4C46B88517063A070046109A /* NSString+MPPasswordCreation.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46B88417063A070046109A /* NSString+MPPasswordCreation.m */; }; 4C46B88817063A170046109A /* NSString+MPPasswordAnalysis.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46B88717063A170046109A /* NSString+MPPasswordAnalysis.m */; }; - 4C46B88B1706D16E0046109A /* NSData+MPRandomBytes.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46B88A1706D16E0046109A /* NSData+MPRandomBytes.m */; }; 4C46E09E17673A0A00DA62E8 /* HNHShadowBox.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46E09D17673A0A00DA62E8 /* HNHShadowBox.m */; }; 4C4A100F176286FD00BBF2CA /* MPTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C4A100E176286FD00BBF2CA /* MPTableView.m */; }; 4C4A101217629DA900BBF2CA /* KdbGroup+KVOAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C4A101117629DA900BBF2CA /* KdbGroup+KVOAdditions.m */; }; @@ -278,8 +277,6 @@ 4C46B88417063A070046109A /* NSString+MPPasswordCreation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+MPPasswordCreation.m"; sourceTree = ""; }; 4C46B88617063A170046109A /* NSString+MPPasswordAnalysis.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+MPPasswordAnalysis.h"; sourceTree = ""; }; 4C46B88717063A170046109A /* NSString+MPPasswordAnalysis.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+MPPasswordAnalysis.m"; sourceTree = ""; }; - 4C46B8891706D16E0046109A /* NSData+MPRandomBytes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSData+MPRandomBytes.h"; sourceTree = ""; }; - 4C46B88A1706D16E0046109A /* NSData+MPRandomBytes.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSData+MPRandomBytes.m"; sourceTree = ""; }; 4C46E09C17673A0A00DA62E8 /* HNHShadowBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HNHShadowBox.h; sourceTree = ""; }; 4C46E09D17673A0A00DA62E8 /* HNHShadowBox.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HNHShadowBox.m; sourceTree = ""; }; 4C4A100D176286FD00BBF2CA /* MPTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPTableView.h; sourceTree = ""; }; @@ -789,8 +786,6 @@ 4C46B8821706397A0046109A /* Security Additions */ = { isa = PBXGroup; children = ( - 4C46B8891706D16E0046109A /* NSData+MPRandomBytes.h */, - 4C46B88A1706D16E0046109A /* NSData+MPRandomBytes.m */, 4C46B88317063A070046109A /* NSString+MPPasswordCreation.h */, 4C46B88417063A070046109A /* NSString+MPPasswordCreation.m */, 4C46B88617063A170046109A /* NSString+MPPasswordAnalysis.h */, @@ -1357,7 +1352,6 @@ 4CE39AC416ECE4F7000FE29D /* MPPopupImageView.m in Sources */, 4C46B88517063A070046109A /* NSString+MPPasswordCreation.m in Sources */, 4C46B88817063A170046109A /* NSString+MPPasswordAnalysis.m in Sources */, - 4C46B88B1706D16E0046109A /* NSData+MPRandomBytes.m in Sources */, 4C5A11FE1708DE8700223D8A /* MPPasswordCreatorViewController.m in Sources */, 4C7E832A172DE2F2002493D8 /* MPPasswordEditViewController.m in Sources */, 4CE5B54B173AFBA700207B39 /* MPDocument.m in Sources */, diff --git a/MacPass/MacPass-Info.plist b/MacPass/MacPass-Info.plist index 262492be..adc1ce74 100644 --- a/MacPass/MacPass-Info.plist +++ b/MacPass/MacPass-Info.plist @@ -48,7 +48,7 @@ CFBundleSignature ???? CFBundleVersion - 1063 + 1064 LSMinimumSystemVersion ${MACOSX_DEPLOYMENT_TARGET} NSHumanReadableCopyright diff --git a/MacPass/NSData+MPRandomBytes.h b/MacPass/NSData+MPRandomBytes.h deleted file mode 100644 index 3c59df30..00000000 --- a/MacPass/NSData+MPRandomBytes.h +++ /dev/null @@ -1,15 +0,0 @@ -// -// NSData+MPRandomBytes.h -// MacPass -// -// Created by Michael Starke on 30.03.13. -// Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. -// - -#import - -@interface NSData (MPRandomBytes) - -+ (NSData *)dataWithRandomBytes:(NSUInteger)lenght; - -@end diff --git a/MacPass/NSData+MPRandomBytes.m b/MacPass/NSData+MPRandomBytes.m deleted file mode 100644 index a63a3a13..00000000 --- a/MacPass/NSData+MPRandomBytes.m +++ /dev/null @@ -1,20 +0,0 @@ -// -// NSData+MPRandomBytes.m -// MacPass -// -// Created by Michael Starke on 30.03.13. -// Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. -// - -#import "NSData+MPRandomBytes.h" -#import - -@implementation NSData (MPRandomBytes) - -+ (NSData *)dataWithRandomBytes:(NSUInteger)length { - unsigned char *bytes = malloc(sizeof(unsigned char) * length); - SecRandomCopyBytes(kSecRandomDefault, length, bytes); - return [NSData dataWithBytesNoCopy:bytes length:length freeWhenDone:YES]; -} - -@end diff --git a/MacPass/NSString+MPPasswordCreation.m b/MacPass/NSString+MPPasswordCreation.m index 87007f67..37204556 100644 --- a/MacPass/NSString+MPPasswordCreation.m +++ b/MacPass/NSString+MPPasswordCreation.m @@ -7,7 +7,7 @@ // #import "NSString+MPPasswordCreation.h" -#import "NSData+MPRandomBytes.h" +#import "NSData+Random.h" NSString *const kMPLowercaseLetterCharacters = @"abcdefghijklmnopqrstuvw"; NSString *const kMPNumberCharacters = @"1234567890";