diff --git a/External/Pearl b/External/Pearl index affcd43c..e9b731dc 160000 --- a/External/Pearl +++ b/External/Pearl @@ -1 +1 @@ -Subproject commit affcd43c4e50b99f12da5b3cf342bc6fab6e0298 +Subproject commit e9b731dca83d62a1b5bf49d24d1a981349b5cdc8 diff --git a/MasterPassword/ObjC/MPAppDelegate_Store.m b/MasterPassword/ObjC/MPAppDelegate_Store.m index 76031221..c634deb7 100644 --- a/MasterPassword/ObjC/MPAppDelegate_Store.m +++ b/MasterPassword/ObjC/MPAppDelegate_Store.m @@ -16,9 +16,11 @@ #endif @implementation MPAppDelegate_Shared(Store) - PearlAssociatedObjectProperty(PearlAlert*, HandleCloudContentAlert, handleCloudContentAlert); +#if TARGET_OS_IPHONE +PearlAssociatedObjectProperty(PearlAlert*, HandleCloudContentAlert, handleCloudContentAlert); PearlAssociatedObjectProperty(PearlAlert*, FixCloudContentAlert, fixCloudContentAlert); PearlAssociatedObjectProperty(PearlOverlay*, StoreLoading, storeLoading); +#endif PearlAssociatedObjectProperty(NSManagedObjectContext*, PrivateManagedObjectContext, privateManagedObjectContext); PearlAssociatedObjectProperty(NSManagedObjectContext*, MainManagedObjectContext, mainManagedObjectContext); @@ -322,10 +324,12 @@ PearlAssociatedObjectProperty(NSManagedObjectContext*, MainManagedObjectContext, self.privateManagedObjectContext = nil; self.mainManagedObjectContext = nil; +#if TARGET_OS_IPHONE dispatch_async( dispatch_get_main_queue(), ^{ if (![self.storeLoading isVisible]) self.storeLoading = [PearlOverlay showOverlayWithTitle:@"Opening Your Data"]; } ); +#endif [self migrateStoreForManager:manager isCloud:isCloudStore]; } @@ -352,9 +356,11 @@ PearlAssociatedObjectProperty(NSManagedObjectContext*, MainManagedObjectContext, self.privateManagedObjectContext = privateManagedObjectContext; self.mainManagedObjectContext = mainManagedObjectContext; +#if TARGET_OS_IPHONE [self.handleCloudContentAlert cancelAlertAnimated:YES]; [self.fixCloudContentAlert cancelAlertAnimated:YES]; [self.storeLoading cancelOverlay]; +#endif } - (void)ubiquityStoreManager:(UbiquityStoreManager *)manager didEncounterError:(NSError *)error cause:(UbiquityStoreErrorCause)cause @@ -370,14 +376,17 @@ PearlAssociatedObjectProperty(NSManagedObjectContext*, MainManagedObjectContext, - (BOOL)ubiquityStoreManager:(UbiquityStoreManager *)manager handleCloudContentCorruptionWithHealthyStore:(BOOL)storeHealthy { +#if TARGET_OS_IPHONE if (manager.cloudEnabled && !storeHealthy && !([self.handleCloudContentAlert.alertView isVisible] || [self.fixCloudContentAlert.alertView isVisible])) dispatch_async( dispatch_get_main_queue(), ^{ [self showCloudContentAlert]; } ); +#endif return NO; } +#if TARGET_OS_IPHONE - (void)showCloudContentAlert { __weak MPAppDelegate_Shared *wSelf = self; @@ -402,6 +411,7 @@ PearlAssociatedObjectProperty(NSManagedObjectContext*, MainManagedObjectContext, cancelTitle:[PearlStrings get].commonButtonBack otherTitles:@"Fix Anyway", nil]; }; } +#endif #pragma mark - Import / Export diff --git a/MasterPassword/ObjC/Mac/MPAppDelegate.m b/MasterPassword/ObjC/Mac/MPAppDelegate.m index 2c4886dc..14b682fd 100644 --- a/MasterPassword/ObjC/Mac/MPAppDelegate.m +++ b/MasterPassword/ObjC/Mac/MPAppDelegate.m @@ -122,7 +122,7 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven - (IBAction)activate:(id)sender { - if (!self.activeUser) + if (![self activeUserForThread]) // No user, can't activate. return; @@ -135,16 +135,16 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven - (IBAction)togglePreference:(NSMenuItem *)sender { if (sender == useICloudItem) - [MPConfig get].iCloud = @(sender.state == NSOnState); + [self storeManager].cloudEnabled = sender.state == NSOnState; if (sender == rememberPasswordItem) [MPConfig get].rememberLogin = [NSNumber numberWithBool:![[MPConfig get].rememberLogin boolValue]]; if (sender == savePasswordItem) { - MPUserEntity *activeUser = [MPAppDelegate get].activeUser; + MPUserEntity *activeUser = [[MPAppDelegate get] activeUserForThread]; if ((activeUser.saveKey = !activeUser.saveKey)) [[MPAppDelegate get] storeSavedKeyFor:activeUser]; else [[MPAppDelegate get] forgetSavedKeyFor:activeUser]; - [activeUser saveContext]; + [activeUser.managedObjectContext saveToStore]; } } @@ -190,7 +190,7 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven __weak MPAppDelegate *wSelf = self; [self addObserverBlock:^(NSString *keyPath, id object, NSDictionary *change, void *context) { - MPUserEntity *activeUser = wSelf.activeUser; + MPUserEntity *activeUser = [wSelf activeUserForThread]; [[[wSelf.usersItem submenu] itemArray] enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) { if ([[obj representedObject] isEqual:[activeUser objectID]]) [obj setState:NSOnState]; @@ -212,7 +212,7 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven [[NSNotificationCenter defaultCenter] addObserverForName:MPCheckConfigNotification object:nil queue:nil usingBlock: ^(NSNotification *note) { self.rememberPasswordItem.state = [[MPConfig get].rememberLogin boolValue]? NSOnState: NSOffState; - self.savePasswordItem.state = [MPAppDelegate get].activeUser.saveKey? NSOnState: NSOffState; + self.savePasswordItem.state = [[MPAppDelegate get] activeUserForThread].saveKey? NSOnState: NSOffState; }]; [self updateUsers]; @@ -234,11 +234,12 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven - (void)updateMenuItems { + MPUserEntity *activeUser = [self activeUserForThread]; if (!(self.showItem.enabled = ![self.passwordWindow.window isVisible])) { self.showItem.title = @"Show (Showing)"; self.showItem.toolTip = @"Master Password is already showing."; } - else if (!(self.showItem.enabled = (self.activeUser != nil))) { + else if (!(self.showItem.enabled = (activeUser != nil))) { self.showItem.title = @"Show (No user)"; self.showItem.toolTip = @"First select the user to show passwords for."; } @@ -260,8 +261,8 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven self.rememberPasswordItem.state = [[MPConfig get].rememberLogin boolValue]? NSOnState: NSOffState; - self.savePasswordItem.state = [MPAppDelegate get].activeUser.saveKey? NSOnState: NSOffState; - if (!self.activeUser) { + self.savePasswordItem.state = activeUser.saveKey? NSOnState: NSOffState; + if (!activeUser) { self.savePasswordItem.title = @"Save Password (No user)"; self.savePasswordItem.enabled = NO; self.savePasswordItem.toolTip = @"First select your user and unlock by showing the Master Password window."; @@ -277,8 +278,9 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven self.savePasswordItem.toolTip = nil; } - self.useICloudItem.state = [[MPMacConfig get].iCloud boolValue]? NSOnState: NSOffState; - if (!(self.useICloudItem.enabled = ![[MPMacConfig get].iCloud boolValue])) { + self.useICloudItem.state = self.storeManager.cloudEnabled? NSOnState: NSOffState; + self.useICloudItem.enabled = !self.storeManager.cloudEnabled; + if (self.storeManager.cloudEnabled) { self.useICloudItem.title = @"Use iCloud (Required)"; self.useICloudItem.toolTip = @"iCloud is required in this version. Future versions will work without iCloud as well."; } @@ -318,57 +320,16 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven if (![moc hasChanges]) return NSTerminateNow; - NSError *error = nil; - if (![moc save:&error]) - err(@"While terminating: %@", error); - + [moc saveToStore]; return NSTerminateNow; } #pragma mark - UbiquityStoreManagerDelegate +- (void)ubiquityStoreManager:(UbiquityStoreManager *)manager willLoadStoreIsCloud:(BOOL)isCloudStore { -- (void)ubiquityStoreManager:(UbiquityStoreManager *)manager didSwitchToCloud:(BOOL)cloudEnabled { + manager.cloudEnabled = YES; - [super ubiquityStoreManager:manager didSwitchToCloud:cloudEnabled]; - - [self updateMenuItems]; - - if (![[MPConfig get].iCloudDecided boolValue]) { - if (cloudEnabled) - return; - - switch ([[NSAlert alertWithMessageText:@"iCloud Is Disabled" - defaultButton:@"Enable iCloud" alternateButton:@"Leave iCloud Off" otherButton:@"Explain?" - informativeTextWithFormat:@"It is highly recommended you enable iCloud."] runModal]) { - case NSAlertDefaultReturn: { - [MPConfig get].iCloudDecided = @YES; - manager.cloudEnabled = YES; - break; - } - - case NSAlertOtherReturn: { - [[NSAlert alertWithMessageText:@"About iCloud" - defaultButton:[PearlStrings get].commonButtonThanks alternateButton:nil otherButton:nil - informativeTextWithFormat: - @"iCloud is Apple's solution for saving your data in \"the cloud\" " - @"and making sure your other iPhones, iPads and Macs are in sync.\n\n" - @"For Master Password, that means your sites are available on all your " - @"Apple devices, and you always have a backup of them in case " - @"you loose one or need to restore.\n\n" - @"Because of the way Master Password works, it doesn't need to send your " - @"site's passwords to Apple. Only their names are saved to make it easier " - @"for you to find the site you need. For some sites you may have set " - @"a user-specified password: these are sent to iCloud after being encrypted " - @"with your master password.\n\n" - @"Apple can never see any of your passwords."] runModal]; - [self ubiquityStoreManager:manager didSwitchToCloud:cloudEnabled]; - break; - } - - default: - break; - }; - } + [super ubiquityStoreManager:manager willLoadStoreIsCloud:isCloudStore]; } @end diff --git a/MasterPassword/ObjC/Mac/MPPasswordWindowController.m b/MasterPassword/ObjC/Mac/MPPasswordWindowController.m index 18e9fce0..2ff92e59 100644 --- a/MasterPassword/ObjC/Mac/MPPasswordWindowController.m +++ b/MasterPassword/ObjC/Mac/MPPasswordWindowController.m @@ -30,7 +30,7 @@ [self.tipField setStringValue:@""]; [[MPAppDelegate get] addObserverBlock:^(NSString *keyPath, id object, NSDictionary *change, void *context) { - [self.userLabel setStringValue:PearlString( @"%@'s password for:", [MPAppDelegate get].activeUser.name )]; + [self.userLabel setStringValue:PearlString( @"%@'s password for:", [[MPAppDelegate get] activeUserForThread].name )]; } forKeyPath:@"activeUser" options:NSKeyValueObservingOptionInitial context:nil]; [[MPAppDelegate get] addObserverBlock:^(NSString *keyPath, id object, NSDictionary *change, void *context) { if (![MPAppDelegate get].key) { @@ -39,8 +39,7 @@ } [MPAppDelegate managedObjectContextPerformBlock:^(NSManagedObjectContext *moc) { - MPUserEntity *activeUser = [MPAppDelegate get].activeUser; - if (![MPAlgorithmDefault migrateUser:activeUser]) + if (![MPAlgorithmDefault migrateUser:[[MPAppDelegate get] activeUserForThread]]) [NSAlert alertWithMessageText:@"Migration Needed" defaultButton:@"OK" alternateButton:nil otherButton:nil informativeTextWithFormat:@"Certain sites require explicit migration to get updated to the latest version of the " @"Master Password algorithm. For these sites, a migration button will appear. Migrating these sites will cause " @@ -68,13 +67,14 @@ - (void)unlock { - if (![MPAppDelegate get].activeUser) + MPUserEntity *activeUser = [[MPAppDelegate get] activeUserForThread]; + if (!activeUser) // No user to sign in with. return; if ([MPAppDelegate get].key) // Already logged in. return; - if ([[MPAppDelegate get] signInAsUser:[MPAppDelegate get].activeUser usingMasterPassword:nil]) + if ([[MPAppDelegate get] signInAsUser:activeUser usingMasterPassword:nil]) // Load the key from the keychain. return; @@ -91,7 +91,7 @@ NSAlert *alert = [NSAlert alertWithMessageText:@"Master Password is locked." defaultButton:@"Unlock" alternateButton:@"Change" otherButton:@"Cancel" informativeTextWithFormat:@"The master password is required to unlock the application for:\n\n%@", - [MPAppDelegate get].activeUser.name]; + activeUser.name]; NSSecureTextField *passwordField = [[NSSecureTextField alloc] initWithFrame:NSMakeRect( 0, 0, 200, 22 )]; [alert setAccessoryView:passwordField]; [alert layout]; @@ -108,6 +108,7 @@ return; } if (contextInfo == MPAlertUnlockMP) { + MPUserEntity *activeUser = [[MPAppDelegate get] activeUserForThread]; switch (returnCode) { case NSAlertAlternateReturn: // "Change" button. @@ -120,8 +121,8 @@ @"You can always change back to your current master password later.\n" @"Your current sites and passwords will then become available again."] runModal] == 1) { - [MPAppDelegate get].activeUser.keyID = nil; - [[MPAppDelegate get] forgetSavedKeyFor:[MPAppDelegate get].activeUser]; + activeUser.keyID = nil; + [[MPAppDelegate get] forgetSavedKeyFor:activeUser]; [[MPAppDelegate get] signOutAnimated:YES]; } break; @@ -137,7 +138,7 @@ [self.progressView startAnimation:nil]; self.inProgress = YES; dispatch_async( dispatch_get_global_queue( DISPATCH_QUEUE_PRIORITY_LOW, 0 ), ^{ - BOOL success = [[MPAppDelegate get] signInAsUser:[MPAppDelegate get].activeUser + BOOL success = [[MPAppDelegate get] signInAsUser:activeUser usingMasterPassword:[(NSSecureTextField *)alert.accessoryView stringValue]]; self.inProgress = NO; @@ -149,7 +150,7 @@ else { [[NSAlert alertWithError:[NSError errorWithDomain:MPErrorDomain code:0 userInfo:@{ NSLocalizedDescriptionKey : PearlString( @"Incorrect master password for user %@", - [MPAppDelegate get].activeUser.name ) + activeUser.name ) }]] beginSheetModalForWindow:self.window modalDelegate:self didEndSelector:@selector(alertDidEnd:returnCode:contextInfo:) contextInfo:MPAlertIncorrectMP]; } @@ -175,7 +176,7 @@ NSFetchRequest *fetchRequest = [NSFetchRequest fetchRequestWithEntityName:NSStringFromClass( [MPElementEntity class] )]; fetchRequest.sortDescriptors = [NSArray arrayWithObject:[[NSSortDescriptor alloc] initWithKey:@"uses_" ascending:NO]]; fetchRequest.predicate = [NSPredicate predicateWithFormat:@"(name BEGINSWITH[cd] %@) AND user == %@", - query, [MPAppDelegate get].activeUser]; + query, [[MPAppDelegate get] activeUserForThread]]; NSError *error = nil; self.siteResults = [[MPAppDelegate managedObjectContextForThreadIfReady] executeFetchRequest:fetchRequest error:&error]; diff --git a/MasterPassword/ObjC/Mac/MasterPassword-Info.plist b/MasterPassword/ObjC/Mac/MasterPassword-Info.plist index 755c60d1..17ad1a4c 100644 --- a/MasterPassword/ObjC/Mac/MasterPassword-Info.plist +++ b/MasterPassword/ObjC/Mac/MasterPassword-Info.plist @@ -1,38 +1,38 @@ - - CFBundleDevelopmentRegion - en - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIconFile - Icon - CFBundleIdentifier - com.lyndir.lhunath.${PRODUCT_NAME:rfc1034identifier}.Mac - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - APPL - CFBundleShortVersionString - [auto] - CFBundleSignature - ???? - CFBundleVersion - [auto] - LSApplicationCategoryType - public.app-category.productivity - LSMinimumSystemVersion - ${MACOSX_DEPLOYMENT_TARGET} - LSUIElement - - NSHumanReadableCopyright - Copyright © 2011-2013 Lyndir. All rights reserved. - NSMainNibFile - MainMenu - NSPrincipalClass - NSApplication - + + CFBundleDevelopmentRegion + en + CFBundleExecutable + ${EXECUTABLE_NAME} + CFBundleIconFile + Icon + CFBundleIdentifier + com.lyndir.lhunath.${PRODUCT_NAME:rfc1034identifier}.Mac + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + ${PRODUCT_NAME} + CFBundlePackageType + APPL + CFBundleShortVersionString + [auto] + CFBundleSignature + ???? + CFBundleVersion + [auto] + LSApplicationCategoryType + public.app-category.productivity + LSMinimumSystemVersion + ${MACOSX_DEPLOYMENT_TARGET} + LSUIElement + + NSHumanReadableCopyright + Copyright © 2011-2013 Lyndir. All rights reserved. + NSMainNibFile + MainMenu + NSPrincipalClass + NSApplication + diff --git a/MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/project.pbxproj b/MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/project.pbxproj index 04399b9c..ce0379c5 100644 --- a/MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/project.pbxproj +++ b/MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/project.pbxproj @@ -20,7 +20,6 @@ DA16B33A17064508000A0EAB /* MPAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = DA16B32F17064507000A0EAB /* MPAppDelegate.m */; }; DA16B33B17064508000A0EAB /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = DA16B33017064507000A0EAB /* main.m */; }; DA16B33C17064508000A0EAB /* MPPasswordWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = DA16B33117064507000A0EAB /* MPPasswordWindowController.xib */; }; - DA16B33E17066103000A0EAB /* libscryptenc-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DA16B33D17066103000A0EAB /* libscryptenc-osx.a */; }; DA16B33F170661D4000A0EAB /* libUbiquityStoreManager.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DA4425CB1557BED40052177D /* libUbiquityStoreManager.a */; }; DA16B341170661DB000A0EAB /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA16B340170661DB000A0EAB /* Carbon.framework */; }; DA16B342170661E0000A0EAB /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DAC632871486D95D0075AEA5 /* Security.framework */; }; @@ -39,6 +38,16 @@ DA3EF17D15A47744003ABF4E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA5BFA4A147E415C00F98B1E /* Foundation.framework */; }; DA4425CC1557BED40052177D /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA5BFA4A147E415C00F98B1E /* Foundation.framework */; }; DA4DA1D91564471A00F6F596 /* libjrswizzle.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DAC6326C148680650075AEA5 /* libjrswizzle.a */; }; + DA5E5C8817248AA1003798D8 /* crypto_aesctr.h in Headers */ = {isa = PBXBuildFile; fileRef = DA5E5C7B17248AA1003798D8 /* crypto_aesctr.h */; }; + DA5E5C8917248AA1003798D8 /* crypto_scrypt.h in Headers */ = {isa = PBXBuildFile; fileRef = DA5E5C7C17248AA1003798D8 /* crypto_scrypt.h */; }; + DA5E5C8A17248AA1003798D8 /* memlimit.h in Headers */ = {isa = PBXBuildFile; fileRef = DA5E5C7D17248AA1003798D8 /* memlimit.h */; }; + DA5E5C8B17248AA1003798D8 /* readpass.h in Headers */ = {isa = PBXBuildFile; fileRef = DA5E5C7E17248AA1003798D8 /* readpass.h */; }; + DA5E5C8C17248AA1003798D8 /* scryptenc.h in Headers */ = {isa = PBXBuildFile; fileRef = DA5E5C7F17248AA1003798D8 /* scryptenc.h */; }; + DA5E5C8D17248AA1003798D8 /* scryptenc_cpuperf.h in Headers */ = {isa = PBXBuildFile; fileRef = DA5E5C8017248AA1003798D8 /* scryptenc_cpuperf.h */; }; + DA5E5C8E17248AA1003798D8 /* sha256.h in Headers */ = {isa = PBXBuildFile; fileRef = DA5E5C8117248AA1003798D8 /* sha256.h */; }; + DA5E5C8F17248AA1003798D8 /* sysendian.h in Headers */ = {isa = PBXBuildFile; fileRef = DA5E5C8217248AA1003798D8 /* sysendian.h */; }; + DA5E5C9017248AA1003798D8 /* warn.h in Headers */ = {isa = PBXBuildFile; fileRef = DA5E5C8317248AA1003798D8 /* warn.h */; }; + DA5E5C9417248AA1003798D8 /* libscryptenc-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DA5E5C8717248AA1003798D8 /* libscryptenc-osx.a */; }; DAC6326D148680650075AEA5 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA5BFA4A147E415C00F98B1E /* Foundation.framework */; }; DAC77CAE148291A600BCF976 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA5BFA4A147E415C00F98B1E /* Foundation.framework */; }; DACA22BB1705DE7D002C6C22 /* UbiquityStoreManager.m in Sources */ = {isa = PBXBuildFile; fileRef = DACA22B71705DE7D002C6C22 /* UbiquityStoreManager.m */; }; @@ -114,87 +123,6 @@ DACA29741705E1A8002C6C22 /* dictionary.lst in Resources */ = {isa = PBXBuildFile; fileRef = DACA29721705E1A8002C6C22 /* dictionary.lst */; }; DACA298D1705E2BD002C6C22 /* JRSwizzle.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA29771705E2BD002C6C22 /* JRSwizzle.h */; }; DACA299A1705E2BD002C6C22 /* JRSwizzle.m in Sources */ = {isa = PBXBuildFile; fileRef = DACA298C1705E2BD002C6C22 /* JRSwizzle.m */; }; - DACA2A331705EE91002C6C22 /* conf.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA29E11705EE90002C6C22 /* conf.h */; }; - DACA2A341705EE91002C6C22 /* rsa.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA29E21705EE90002C6C22 /* rsa.h */; }; - DACA2A351705EE91002C6C22 /* ui.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA29E31705EE91002C6C22 /* ui.h */; }; - DACA2A361705EE91002C6C22 /* seed.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA29E41705EE91002C6C22 /* seed.h */; }; - DACA2A371705EE91002C6C22 /* stack.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA29E51705EE91002C6C22 /* stack.h */; }; - DACA2A381705EE91002C6C22 /* buffer.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA29E61705EE91002C6C22 /* buffer.h */; }; - DACA2A391705EE91002C6C22 /* ssl2.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA29E71705EE91002C6C22 /* ssl2.h */; }; - DACA2A3A1705EE91002C6C22 /* ocsp.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA29E81705EE91002C6C22 /* ocsp.h */; }; - DACA2A3B1705EE91002C6C22 /* rc4.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA29E91705EE91002C6C22 /* rc4.h */; }; - DACA2A3C1705EE91002C6C22 /* ossl_typ.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA29EA1705EE91002C6C22 /* ossl_typ.h */; }; - DACA2A3D1705EE91002C6C22 /* dso.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA29EB1705EE91002C6C22 /* dso.h */; }; - DACA2A3E1705EE91002C6C22 /* txt_db.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA29EC1705EE91002C6C22 /* txt_db.h */; }; - DACA2A3F1705EE91002C6C22 /* err.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA29ED1705EE91002C6C22 /* err.h */; }; - DACA2A401705EE91002C6C22 /* pem.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA29EE1705EE91002C6C22 /* pem.h */; }; - DACA2A411705EE91002C6C22 /* blowfish.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA29EF1705EE91002C6C22 /* blowfish.h */; }; - DACA2A421705EE91002C6C22 /* ssl3.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA29F01705EE91002C6C22 /* ssl3.h */; }; - DACA2A431705EE91002C6C22 /* evp.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA29F11705EE91002C6C22 /* evp.h */; }; - DACA2A441705EE91002C6C22 /* crypto.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA29F21705EE91002C6C22 /* crypto.h */; }; - DACA2A451705EE91002C6C22 /* idea.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA29F31705EE91002C6C22 /* idea.h */; }; - DACA2A461705EE91002C6C22 /* objects.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA29F41705EE91002C6C22 /* objects.h */; }; - DACA2A471705EE91002C6C22 /* pqueue.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA29F51705EE91002C6C22 /* pqueue.h */; }; - DACA2A481705EE91002C6C22 /* rand.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA29F61705EE91002C6C22 /* rand.h */; }; - DACA2A491705EE91002C6C22 /* modes.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA29F71705EE91002C6C22 /* modes.h */; }; - DACA2A4A1705EE91002C6C22 /* hmac.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA29F81705EE91002C6C22 /* hmac.h */; }; - DACA2A4B1705EE91002C6C22 /* ec.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA29F91705EE91002C6C22 /* ec.h */; }; - DACA2A4C1705EE91002C6C22 /* dtls1.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA29FA1705EE91002C6C22 /* dtls1.h */; }; - DACA2A4D1705EE91002C6C22 /* engine.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA29FB1705EE91002C6C22 /* engine.h */; }; - DACA2A4E1705EE91002C6C22 /* pem2.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA29FC1705EE91002C6C22 /* pem2.h */; }; - DACA2A4F1705EE91002C6C22 /* des.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA29FD1705EE91002C6C22 /* des.h */; }; - DACA2A501705EE91002C6C22 /* ecdh.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA29FE1705EE91002C6C22 /* ecdh.h */; }; - DACA2A511705EE91002C6C22 /* e_os2.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA29FF1705EE91002C6C22 /* e_os2.h */; }; - DACA2A521705EE91002C6C22 /* pkcs7.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA2A001705EE91002C6C22 /* pkcs7.h */; }; - DACA2A531705EE91002C6C22 /* ecdsa.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA2A011705EE91002C6C22 /* ecdsa.h */; }; - DACA2A541705EE91002C6C22 /* krb5_asn.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA2A021705EE91002C6C22 /* krb5_asn.h */; }; - DACA2A551705EE91002C6C22 /* dh.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA2A031705EE91002C6C22 /* dh.h */; }; - DACA2A561705EE91002C6C22 /* cast.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA2A041705EE91002C6C22 /* cast.h */; }; - DACA2A571705EE91002C6C22 /* comp.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA2A051705EE91002C6C22 /* comp.h */; }; - DACA2A581705EE91002C6C22 /* obj_mac.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA2A061705EE91002C6C22 /* obj_mac.h */; }; - DACA2A591705EE91002C6C22 /* ebcdic.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA2A071705EE91002C6C22 /* ebcdic.h */; }; - DACA2A5A1705EE91002C6C22 /* pkcs12.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA2A081705EE91002C6C22 /* pkcs12.h */; }; - DACA2A5B1705EE91002C6C22 /* camellia.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA2A091705EE91002C6C22 /* camellia.h */; }; - DACA2A5C1705EE91002C6C22 /* asn1t.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA2A0A1705EE91002C6C22 /* asn1t.h */; }; - DACA2A5D1705EE91002C6C22 /* md5.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA2A0B1705EE91002C6C22 /* md5.h */; }; - DACA2A5E1705EE91002C6C22 /* symhacks.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA2A0C1705EE91002C6C22 /* symhacks.h */; }; - DACA2A5F1705EE91002C6C22 /* ui_compat.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA2A0D1705EE91002C6C22 /* ui_compat.h */; }; - DACA2A601705EE91002C6C22 /* rc2.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA2A0E1705EE91002C6C22 /* rc2.h */; }; - DACA2A611705EE91002C6C22 /* lhash.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA2A0F1705EE91002C6C22 /* lhash.h */; }; - DACA2A621705EE91002C6C22 /* bn.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA2A101705EE91002C6C22 /* bn.h */; }; - DACA2A631705EE91002C6C22 /* opensslv.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA2A111705EE91002C6C22 /* opensslv.h */; }; - DACA2A641705EE91002C6C22 /* mdc2.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA2A121705EE91002C6C22 /* mdc2.h */; }; - DACA2A651705EE91002C6C22 /* cms.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA2A131705EE91002C6C22 /* cms.h */; }; - DACA2A661705EE91002C6C22 /* x509v3.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA2A141705EE91002C6C22 /* x509v3.h */; }; - DACA2A671705EE91002C6C22 /* md4.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA2A151705EE91002C6C22 /* md4.h */; }; - DACA2A681705EE91002C6C22 /* asn1_mac.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA2A161705EE91002C6C22 /* asn1_mac.h */; }; - DACA2A691705EE91002C6C22 /* ssl23.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA2A171705EE91002C6C22 /* ssl23.h */; }; - DACA2A6A1705EE91002C6C22 /* x509.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA2A181705EE91002C6C22 /* x509.h */; }; - DACA2A6B1705EE91002C6C22 /* safestack.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA2A191705EE91002C6C22 /* safestack.h */; }; - DACA2A6C1705EE91002C6C22 /* des_old.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA2A1A1705EE91002C6C22 /* des_old.h */; }; - DACA2A6D1705EE91002C6C22 /* ts.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA2A1B1705EE91002C6C22 /* ts.h */; }; - DACA2A6E1705EE91002C6C22 /* bio.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA2A1C1705EE91002C6C22 /* bio.h */; }; - DACA2A6F1705EE91002C6C22 /* sha.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA2A1D1705EE91002C6C22 /* sha.h */; }; - DACA2A701705EE91002C6C22 /* whrlpool.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA2A1E1705EE91002C6C22 /* whrlpool.h */; }; - DACA2A711705EE91002C6C22 /* x509_vfy.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA2A1F1705EE91002C6C22 /* x509_vfy.h */; }; - DACA2A721705EE91002C6C22 /* conf_api.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA2A201705EE91002C6C22 /* conf_api.h */; }; - DACA2A731705EE91002C6C22 /* aes.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA2A211705EE91002C6C22 /* aes.h */; }; - DACA2A741705EE91002C6C22 /* tls1.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA2A221705EE91002C6C22 /* tls1.h */; }; - DACA2A751705EE91002C6C22 /* kssl.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA2A231705EE91002C6C22 /* kssl.h */; }; - DACA2A761705EE91002C6C22 /* ripemd.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA2A241705EE91002C6C22 /* ripemd.h */; }; - DACA2A771705EE91002C6C22 /* dsa.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA2A251705EE91002C6C22 /* dsa.h */; }; - DACA2A781705EE91002C6C22 /* ssl.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA2A261705EE91002C6C22 /* ssl.h */; }; - DACA2A791705EE91002C6C22 /* opensslconf.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA2A271705EE91002C6C22 /* opensslconf.h */; }; - DACA2A7A1705EE91002C6C22 /* asn1.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA2A281705EE91002C6C22 /* asn1.h */; }; - DACA2A7B1705EE91002C6C22 /* scryptenc_cpuperf.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA2A2A1705EE91002C6C22 /* scryptenc_cpuperf.h */; }; - DACA2A7C1705EE91002C6C22 /* scryptenc.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA2A2B1705EE91002C6C22 /* scryptenc.h */; }; - DACA2A7D1705EE91002C6C22 /* crypto_scrypt.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA2A2C1705EE91002C6C22 /* crypto_scrypt.h */; }; - DACA2A7E1705EE91002C6C22 /* memlimit.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA2A2D1705EE91002C6C22 /* memlimit.h */; }; - DACA2A7F1705EE91002C6C22 /* sha256.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA2A2E1705EE91002C6C22 /* sha256.h */; }; - DACA2A801705EE91002C6C22 /* sysendian.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA2A2F1705EE91002C6C22 /* sysendian.h */; }; - DACA2A811705EE91002C6C22 /* crypto_aesctr.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA2A301705EE91002C6C22 /* crypto_aesctr.h */; }; - DACA2A821705EE91002C6C22 /* warn.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA2A311705EE91002C6C22 /* warn.h */; }; - DACA2A831705EE91002C6C22 /* readpass.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA2A321705EE91002C6C22 /* readpass.h */; }; DAFE4A1315039824003ABA7C /* NSObject+PearlExport.h in Headers */ = {isa = PBXBuildFile; fileRef = DAFE45D815039823003ABA7C /* NSObject+PearlExport.h */; }; DAFE4A1415039824003ABA7C /* NSObject+PearlExport.m in Sources */ = {isa = PBXBuildFile; fileRef = DAFE45D915039823003ABA7C /* NSObject+PearlExport.m */; }; DAFE4A1515039824003ABA7C /* NSString+PearlNSArrayFormat.h in Headers */ = {isa = PBXBuildFile; fileRef = DAFE45DA15039823003ABA7C /* NSString+PearlNSArrayFormat.h */; }; @@ -254,27 +182,6 @@ remoteGlobalIDString = DAC6326B148680650075AEA5; remoteInfo = jrswizzle; }; - DACA29DA1705E36C002C6C22 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = DACA29C01705E313002C6C22 /* scrypt.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = D2AAC07E0554694100DB518D; - remoteInfo = scryptenc; - }; - DACA29DC1705E36C002C6C22 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = DACA29C01705E313002C6C22 /* scrypt.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A0511C5A127770FD00DE46C4; - remoteInfo = scryptcrypto; - }; - DACA29DE1705E36C002C6C22 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = DACA29C01705E313002C6C22 /* scrypt.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = DA67FE5D14E4834300DB7CC9; - remoteInfo = util; - }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -298,7 +205,6 @@ DA16B33017064507000A0EAB /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; DA16B33117064507000A0EAB /* MPPasswordWindowController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MPPasswordWindowController.xib; sourceTree = ""; }; DA16B33217064507000A0EAB /* MPPasswordWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPPasswordWindowController.h; sourceTree = ""; }; - DA16B33D17066103000A0EAB /* libscryptenc-osx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libscryptenc-osx.a"; sourceTree = ""; }; DA16B340170661DB000A0EAB /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = System/Library/Frameworks/Carbon.framework; sourceTree = SDKROOT; }; DA16B343170661EE000A0EAB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; }; DA30E9CB15722ECA00A68B4C /* NSBundle+PearlMutableInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSBundle+PearlMutableInfo.h"; sourceTree = ""; }; @@ -317,6 +223,16 @@ DA5BFA4A147E415C00F98B1E /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; DA5BFA4C147E415C00F98B1E /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; DA5BFA4E147E415C00F98B1E /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; }; + DA5E5C7B17248AA1003798D8 /* crypto_aesctr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_aesctr.h; sourceTree = ""; }; + DA5E5C7C17248AA1003798D8 /* crypto_scrypt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_scrypt.h; sourceTree = ""; }; + DA5E5C7D17248AA1003798D8 /* memlimit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = memlimit.h; sourceTree = ""; }; + DA5E5C7E17248AA1003798D8 /* readpass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = readpass.h; sourceTree = ""; }; + DA5E5C7F17248AA1003798D8 /* scryptenc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scryptenc.h; sourceTree = ""; }; + DA5E5C8017248AA1003798D8 /* scryptenc_cpuperf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scryptenc_cpuperf.h; sourceTree = ""; }; + DA5E5C8117248AA1003798D8 /* sha256.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sha256.h; sourceTree = ""; }; + DA5E5C8217248AA1003798D8 /* sysendian.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sysendian.h; sourceTree = ""; }; + DA5E5C8317248AA1003798D8 /* warn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = warn.h; sourceTree = ""; }; + DA5E5C8717248AA1003798D8 /* libscryptenc-osx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libscryptenc-osx.a"; sourceTree = ""; }; DA6701B716406A4100B61001 /* Accounts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accounts.framework; path = System/Library/Frameworks/Accounts.framework; sourceTree = SDKROOT; }; DA6701DD16406B7300B61001 /* Social.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Social.framework; path = System/Library/Frameworks/Social.framework; sourceTree = SDKROOT; }; DA6701DF16406BB400B61001 /* AdSupport.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AdSupport.framework; path = System/Library/Frameworks/AdSupport.framework; sourceTree = SDKROOT; }; @@ -419,88 +335,6 @@ DACA29721705E1A8002C6C22 /* dictionary.lst */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = dictionary.lst; sourceTree = ""; }; DACA29771705E2BD002C6C22 /* JRSwizzle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JRSwizzle.h; sourceTree = ""; }; DACA298C1705E2BD002C6C22 /* JRSwizzle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JRSwizzle.m; sourceTree = ""; }; - DACA29C01705E313002C6C22 /* scrypt.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = scrypt.xcodeproj; path = ports/security/scrypt/scrypt.xcodeproj; sourceTree = ""; }; - DACA29E11705EE90002C6C22 /* conf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = conf.h; sourceTree = ""; }; - DACA29E21705EE90002C6C22 /* rsa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rsa.h; sourceTree = ""; }; - DACA29E31705EE91002C6C22 /* ui.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ui.h; sourceTree = ""; }; - DACA29E41705EE91002C6C22 /* seed.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = seed.h; sourceTree = ""; }; - DACA29E51705EE91002C6C22 /* stack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stack.h; sourceTree = ""; }; - DACA29E61705EE91002C6C22 /* buffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = buffer.h; sourceTree = ""; }; - DACA29E71705EE91002C6C22 /* ssl2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ssl2.h; sourceTree = ""; }; - DACA29E81705EE91002C6C22 /* ocsp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ocsp.h; sourceTree = ""; }; - DACA29E91705EE91002C6C22 /* rc4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rc4.h; sourceTree = ""; }; - DACA29EA1705EE91002C6C22 /* ossl_typ.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ossl_typ.h; sourceTree = ""; }; - DACA29EB1705EE91002C6C22 /* dso.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dso.h; sourceTree = ""; }; - DACA29EC1705EE91002C6C22 /* txt_db.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = txt_db.h; sourceTree = ""; }; - DACA29ED1705EE91002C6C22 /* err.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = err.h; sourceTree = ""; }; - DACA29EE1705EE91002C6C22 /* pem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pem.h; sourceTree = ""; }; - DACA29EF1705EE91002C6C22 /* blowfish.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = blowfish.h; sourceTree = ""; }; - DACA29F01705EE91002C6C22 /* ssl3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ssl3.h; sourceTree = ""; }; - DACA29F11705EE91002C6C22 /* evp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = evp.h; sourceTree = ""; }; - DACA29F21705EE91002C6C22 /* crypto.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto.h; sourceTree = ""; }; - DACA29F31705EE91002C6C22 /* idea.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = idea.h; sourceTree = ""; }; - DACA29F41705EE91002C6C22 /* objects.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = objects.h; sourceTree = ""; }; - DACA29F51705EE91002C6C22 /* pqueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pqueue.h; sourceTree = ""; }; - DACA29F61705EE91002C6C22 /* rand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rand.h; sourceTree = ""; }; - DACA29F71705EE91002C6C22 /* modes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = modes.h; sourceTree = ""; }; - DACA29F81705EE91002C6C22 /* hmac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hmac.h; sourceTree = ""; }; - DACA29F91705EE91002C6C22 /* ec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ec.h; sourceTree = ""; }; - DACA29FA1705EE91002C6C22 /* dtls1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dtls1.h; sourceTree = ""; }; - DACA29FB1705EE91002C6C22 /* engine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = engine.h; sourceTree = ""; }; - DACA29FC1705EE91002C6C22 /* pem2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pem2.h; sourceTree = ""; }; - DACA29FD1705EE91002C6C22 /* des.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = des.h; sourceTree = ""; }; - DACA29FE1705EE91002C6C22 /* ecdh.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ecdh.h; sourceTree = ""; }; - DACA29FF1705EE91002C6C22 /* e_os2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = e_os2.h; sourceTree = ""; }; - DACA2A001705EE91002C6C22 /* pkcs7.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pkcs7.h; sourceTree = ""; }; - DACA2A011705EE91002C6C22 /* ecdsa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ecdsa.h; sourceTree = ""; }; - DACA2A021705EE91002C6C22 /* krb5_asn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = krb5_asn.h; sourceTree = ""; }; - DACA2A031705EE91002C6C22 /* dh.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dh.h; sourceTree = ""; }; - DACA2A041705EE91002C6C22 /* cast.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cast.h; sourceTree = ""; }; - DACA2A051705EE91002C6C22 /* comp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = comp.h; sourceTree = ""; }; - DACA2A061705EE91002C6C22 /* obj_mac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = obj_mac.h; sourceTree = ""; }; - DACA2A071705EE91002C6C22 /* ebcdic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ebcdic.h; sourceTree = ""; }; - DACA2A081705EE91002C6C22 /* pkcs12.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pkcs12.h; sourceTree = ""; }; - DACA2A091705EE91002C6C22 /* camellia.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = camellia.h; sourceTree = ""; }; - DACA2A0A1705EE91002C6C22 /* asn1t.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = asn1t.h; sourceTree = ""; }; - DACA2A0B1705EE91002C6C22 /* md5.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = md5.h; sourceTree = ""; }; - DACA2A0C1705EE91002C6C22 /* symhacks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = symhacks.h; sourceTree = ""; }; - DACA2A0D1705EE91002C6C22 /* ui_compat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ui_compat.h; sourceTree = ""; }; - DACA2A0E1705EE91002C6C22 /* rc2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rc2.h; sourceTree = ""; }; - DACA2A0F1705EE91002C6C22 /* lhash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lhash.h; sourceTree = ""; }; - DACA2A101705EE91002C6C22 /* bn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bn.h; sourceTree = ""; }; - DACA2A111705EE91002C6C22 /* opensslv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = opensslv.h; sourceTree = ""; }; - DACA2A121705EE91002C6C22 /* mdc2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mdc2.h; sourceTree = ""; }; - DACA2A131705EE91002C6C22 /* cms.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cms.h; sourceTree = ""; }; - DACA2A141705EE91002C6C22 /* x509v3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = x509v3.h; sourceTree = ""; }; - DACA2A151705EE91002C6C22 /* md4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = md4.h; sourceTree = ""; }; - DACA2A161705EE91002C6C22 /* asn1_mac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = asn1_mac.h; sourceTree = ""; }; - DACA2A171705EE91002C6C22 /* ssl23.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ssl23.h; sourceTree = ""; }; - DACA2A181705EE91002C6C22 /* x509.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = x509.h; sourceTree = ""; }; - DACA2A191705EE91002C6C22 /* safestack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = safestack.h; sourceTree = ""; }; - DACA2A1A1705EE91002C6C22 /* des_old.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = des_old.h; sourceTree = ""; }; - DACA2A1B1705EE91002C6C22 /* ts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ts.h; sourceTree = ""; }; - DACA2A1C1705EE91002C6C22 /* bio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bio.h; sourceTree = ""; }; - DACA2A1D1705EE91002C6C22 /* sha.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sha.h; sourceTree = ""; }; - DACA2A1E1705EE91002C6C22 /* whrlpool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = whrlpool.h; sourceTree = ""; }; - DACA2A1F1705EE91002C6C22 /* x509_vfy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = x509_vfy.h; sourceTree = ""; }; - DACA2A201705EE91002C6C22 /* conf_api.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = conf_api.h; sourceTree = ""; }; - DACA2A211705EE91002C6C22 /* aes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = aes.h; sourceTree = ""; }; - DACA2A221705EE91002C6C22 /* tls1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tls1.h; sourceTree = ""; }; - DACA2A231705EE91002C6C22 /* kssl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = kssl.h; sourceTree = ""; }; - DACA2A241705EE91002C6C22 /* ripemd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ripemd.h; sourceTree = ""; }; - DACA2A251705EE91002C6C22 /* dsa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dsa.h; sourceTree = ""; }; - DACA2A261705EE91002C6C22 /* ssl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ssl.h; sourceTree = ""; }; - DACA2A271705EE91002C6C22 /* opensslconf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = opensslconf.h; sourceTree = ""; }; - DACA2A281705EE91002C6C22 /* asn1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = asn1.h; sourceTree = ""; }; - DACA2A2A1705EE91002C6C22 /* scryptenc_cpuperf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scryptenc_cpuperf.h; sourceTree = ""; }; - DACA2A2B1705EE91002C6C22 /* scryptenc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scryptenc.h; sourceTree = ""; }; - DACA2A2C1705EE91002C6C22 /* crypto_scrypt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_scrypt.h; sourceTree = ""; }; - DACA2A2D1705EE91002C6C22 /* memlimit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = memlimit.h; sourceTree = ""; }; - DACA2A2E1705EE91002C6C22 /* sha256.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sha256.h; sourceTree = ""; }; - DACA2A2F1705EE91002C6C22 /* sysendian.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sysendian.h; sourceTree = ""; }; - DACA2A301705EE91002C6C22 /* crypto_aesctr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_aesctr.h; sourceTree = ""; }; - DACA2A311705EE91002C6C22 /* warn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = warn.h; sourceTree = ""; }; - DACA2A321705EE91002C6C22 /* readpass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = readpass.h; sourceTree = ""; }; DAD312C01552A20800A3F9ED /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = usr/lib/libsqlite3.dylib; sourceTree = SDKROOT; }; DAEBC45214F6364500987BF6 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; DAFE45D815039823003ABA7C /* NSObject+PearlExport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSObject+PearlExport.h"; sourceTree = ""; }; @@ -594,7 +428,7 @@ files = ( DA4DA1D91564471A00F6F596 /* libjrswizzle.a in Frameworks */, DAC77CAE148291A600BCF976 /* Foundation.framework in Frameworks */, - DA16B33E17066103000A0EAB /* libscryptenc-osx.a in Frameworks */, + DA5E5C9417248AA1003798D8 /* libscryptenc-osx.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -671,6 +505,31 @@ name = Frameworks; sourceTree = ""; }; + DA5E5C7917248AA1003798D8 /* lib */ = { + isa = PBXGroup; + children = ( + DA5E5C7A17248AA1003798D8 /* include */, + DA5E5C8717248AA1003798D8 /* libscryptenc-osx.a */, + ); + path = lib; + sourceTree = ""; + }; + DA5E5C7A17248AA1003798D8 /* include */ = { + isa = PBXGroup; + children = ( + DA5E5C7B17248AA1003798D8 /* crypto_aesctr.h */, + DA5E5C7C17248AA1003798D8 /* crypto_scrypt.h */, + DA5E5C7D17248AA1003798D8 /* memlimit.h */, + DA5E5C7E17248AA1003798D8 /* readpass.h */, + DA5E5C7F17248AA1003798D8 /* scryptenc.h */, + DA5E5C8017248AA1003798D8 /* scryptenc_cpuperf.h */, + DA5E5C8117248AA1003798D8 /* sha256.h */, + DA5E5C8217248AA1003798D8 /* sysendian.h */, + DA5E5C8317248AA1003798D8 /* warn.h */, + ); + path = include; + sourceTree = ""; + }; DAC77CAF148291A600BCF976 /* Pearl */ = { isa = PBXGroup; children = ( @@ -684,7 +543,6 @@ DACA22121705DDC5002C6C22 /* External */ = { isa = PBXGroup; children = ( - DACA29D11705E353002C6C22 /* iOSPorts */, DACA29751705E2BD002C6C22 /* jrswizzle */, DACA22181705DE28002C6C22 /* Crashlytics.framework */, DAC77CAF148291A600BCF976 /* Pearl */, @@ -870,124 +728,6 @@ path = Pearl/External/jrswizzle; sourceTree = ""; }; - DACA29D11705E353002C6C22 /* iOSPorts */ = { - isa = PBXGroup; - children = ( - DACA29E01705EE90002C6C22 /* openssl */, - DACA2A291705EE91002C6C22 /* scrypt */, - DACA29C01705E313002C6C22 /* scrypt.xcodeproj */, - ); - name = iOSPorts; - path = Pearl/External/iOSPorts; - sourceTree = ""; - }; - DACA29D31705E36C002C6C22 /* Products */ = { - isa = PBXGroup; - children = ( - DACA29DB1705E36C002C6C22 /* libscryptenc.a */, - DACA29DD1705E36C002C6C22 /* libscryptcrypto.a */, - DACA29DF1705E36C002C6C22 /* libutil.a */, - ); - name = Products; - sourceTree = ""; - }; - DACA29E01705EE90002C6C22 /* openssl */ = { - isa = PBXGroup; - children = ( - DACA29E11705EE90002C6C22 /* conf.h */, - DACA29E21705EE90002C6C22 /* rsa.h */, - DACA29E31705EE91002C6C22 /* ui.h */, - DACA29E41705EE91002C6C22 /* seed.h */, - DACA29E51705EE91002C6C22 /* stack.h */, - DACA29E61705EE91002C6C22 /* buffer.h */, - DACA29E71705EE91002C6C22 /* ssl2.h */, - DACA29E81705EE91002C6C22 /* ocsp.h */, - DACA29E91705EE91002C6C22 /* rc4.h */, - DACA29EA1705EE91002C6C22 /* ossl_typ.h */, - DACA29EB1705EE91002C6C22 /* dso.h */, - DACA29EC1705EE91002C6C22 /* txt_db.h */, - DACA29ED1705EE91002C6C22 /* err.h */, - DACA29EE1705EE91002C6C22 /* pem.h */, - DACA29EF1705EE91002C6C22 /* blowfish.h */, - DACA29F01705EE91002C6C22 /* ssl3.h */, - DACA29F11705EE91002C6C22 /* evp.h */, - DACA29F21705EE91002C6C22 /* crypto.h */, - DACA29F31705EE91002C6C22 /* idea.h */, - DACA29F41705EE91002C6C22 /* objects.h */, - DACA29F51705EE91002C6C22 /* pqueue.h */, - DACA29F61705EE91002C6C22 /* rand.h */, - DACA29F71705EE91002C6C22 /* modes.h */, - DACA29F81705EE91002C6C22 /* hmac.h */, - DACA29F91705EE91002C6C22 /* ec.h */, - DACA29FA1705EE91002C6C22 /* dtls1.h */, - DACA29FB1705EE91002C6C22 /* engine.h */, - DACA29FC1705EE91002C6C22 /* pem2.h */, - DACA29FD1705EE91002C6C22 /* des.h */, - DACA29FE1705EE91002C6C22 /* ecdh.h */, - DACA29FF1705EE91002C6C22 /* e_os2.h */, - DACA2A001705EE91002C6C22 /* pkcs7.h */, - DACA2A011705EE91002C6C22 /* ecdsa.h */, - DACA2A021705EE91002C6C22 /* krb5_asn.h */, - DACA2A031705EE91002C6C22 /* dh.h */, - DACA2A041705EE91002C6C22 /* cast.h */, - DACA2A051705EE91002C6C22 /* comp.h */, - DACA2A061705EE91002C6C22 /* obj_mac.h */, - DACA2A071705EE91002C6C22 /* ebcdic.h */, - DACA2A081705EE91002C6C22 /* pkcs12.h */, - DACA2A091705EE91002C6C22 /* camellia.h */, - DACA2A0A1705EE91002C6C22 /* asn1t.h */, - DACA2A0B1705EE91002C6C22 /* md5.h */, - DACA2A0C1705EE91002C6C22 /* symhacks.h */, - DACA2A0D1705EE91002C6C22 /* ui_compat.h */, - DACA2A0E1705EE91002C6C22 /* rc2.h */, - DACA2A0F1705EE91002C6C22 /* lhash.h */, - DACA2A101705EE91002C6C22 /* bn.h */, - DACA2A111705EE91002C6C22 /* opensslv.h */, - DACA2A121705EE91002C6C22 /* mdc2.h */, - DACA2A131705EE91002C6C22 /* cms.h */, - DACA2A141705EE91002C6C22 /* x509v3.h */, - DACA2A151705EE91002C6C22 /* md4.h */, - DACA2A161705EE91002C6C22 /* asn1_mac.h */, - DACA2A171705EE91002C6C22 /* ssl23.h */, - DACA2A181705EE91002C6C22 /* x509.h */, - DACA2A191705EE91002C6C22 /* safestack.h */, - DACA2A1A1705EE91002C6C22 /* des_old.h */, - DACA2A1B1705EE91002C6C22 /* ts.h */, - DACA2A1C1705EE91002C6C22 /* bio.h */, - DACA2A1D1705EE91002C6C22 /* sha.h */, - DACA2A1E1705EE91002C6C22 /* whrlpool.h */, - DACA2A1F1705EE91002C6C22 /* x509_vfy.h */, - DACA2A201705EE91002C6C22 /* conf_api.h */, - DACA2A211705EE91002C6C22 /* aes.h */, - DACA2A221705EE91002C6C22 /* tls1.h */, - DACA2A231705EE91002C6C22 /* kssl.h */, - DACA2A241705EE91002C6C22 /* ripemd.h */, - DACA2A251705EE91002C6C22 /* dsa.h */, - DACA2A261705EE91002C6C22 /* ssl.h */, - DACA2A271705EE91002C6C22 /* opensslconf.h */, - DACA2A281705EE91002C6C22 /* asn1.h */, - ); - name = openssl; - path = include/openssl; - sourceTree = ""; - }; - DACA2A291705EE91002C6C22 /* scrypt */ = { - isa = PBXGroup; - children = ( - DACA2A2A1705EE91002C6C22 /* scryptenc_cpuperf.h */, - DACA2A2B1705EE91002C6C22 /* scryptenc.h */, - DACA2A2C1705EE91002C6C22 /* crypto_scrypt.h */, - DACA2A2D1705EE91002C6C22 /* memlimit.h */, - DACA2A2E1705EE91002C6C22 /* sha256.h */, - DACA2A2F1705EE91002C6C22 /* sysendian.h */, - DACA2A301705EE91002C6C22 /* crypto_aesctr.h */, - DACA2A311705EE91002C6C22 /* warn.h */, - DACA2A321705EE91002C6C22 /* readpass.h */, - ); - name = scrypt; - path = include/scrypt; - sourceTree = ""; - }; DAFE45D715039823003ABA7C /* Pearl */ = { isa = PBXGroup; children = ( @@ -1051,7 +791,7 @@ DAFE45FC15039823003ABA7C /* Pearl-Crypto */ = { isa = PBXGroup; children = ( - DA16B33D17066103000A0EAB /* libscryptenc-osx.a */, + DA5E5C7917248AA1003798D8 /* lib */, DAFE45FD15039823003ABA7C /* Pearl-Crypto.h */, DA30E9D115722EE500A68B4C /* Pearl-Crypto.m */, DAFE45FE15039823003ABA7C /* PearlCryptUtils.h */, @@ -1118,87 +858,15 @@ 93D39C34FE35830EF5BE1D2A /* NSArray+Indexing.h in Headers */, 93D392EC39DA43C46C692C12 /* NSDictionary+Indexing.h in Headers */, DA3509FE15F101A500C14A8E /* PearlQueue.h in Headers */, - DACA2A331705EE91002C6C22 /* conf.h in Headers */, - DACA2A341705EE91002C6C22 /* rsa.h in Headers */, - DACA2A351705EE91002C6C22 /* ui.h in Headers */, - DACA2A361705EE91002C6C22 /* seed.h in Headers */, - DACA2A371705EE91002C6C22 /* stack.h in Headers */, - DACA2A381705EE91002C6C22 /* buffer.h in Headers */, - DACA2A391705EE91002C6C22 /* ssl2.h in Headers */, - DACA2A3A1705EE91002C6C22 /* ocsp.h in Headers */, - DACA2A3B1705EE91002C6C22 /* rc4.h in Headers */, - DACA2A3C1705EE91002C6C22 /* ossl_typ.h in Headers */, - DACA2A3D1705EE91002C6C22 /* dso.h in Headers */, - DACA2A3E1705EE91002C6C22 /* txt_db.h in Headers */, - DACA2A3F1705EE91002C6C22 /* err.h in Headers */, - DACA2A401705EE91002C6C22 /* pem.h in Headers */, - DACA2A411705EE91002C6C22 /* blowfish.h in Headers */, - DACA2A421705EE91002C6C22 /* ssl3.h in Headers */, - DACA2A431705EE91002C6C22 /* evp.h in Headers */, - DACA2A441705EE91002C6C22 /* crypto.h in Headers */, - DACA2A451705EE91002C6C22 /* idea.h in Headers */, - DACA2A461705EE91002C6C22 /* objects.h in Headers */, - DACA2A471705EE91002C6C22 /* pqueue.h in Headers */, - DACA2A481705EE91002C6C22 /* rand.h in Headers */, - DACA2A491705EE91002C6C22 /* modes.h in Headers */, - DACA2A4A1705EE91002C6C22 /* hmac.h in Headers */, - DACA2A4B1705EE91002C6C22 /* ec.h in Headers */, - DACA2A4C1705EE91002C6C22 /* dtls1.h in Headers */, - DACA2A4D1705EE91002C6C22 /* engine.h in Headers */, - DACA2A4E1705EE91002C6C22 /* pem2.h in Headers */, - DACA2A4F1705EE91002C6C22 /* des.h in Headers */, - DACA2A501705EE91002C6C22 /* ecdh.h in Headers */, - DACA2A511705EE91002C6C22 /* e_os2.h in Headers */, - DACA2A521705EE91002C6C22 /* pkcs7.h in Headers */, - DACA2A531705EE91002C6C22 /* ecdsa.h in Headers */, - DACA2A541705EE91002C6C22 /* krb5_asn.h in Headers */, - DACA2A551705EE91002C6C22 /* dh.h in Headers */, - DACA2A561705EE91002C6C22 /* cast.h in Headers */, - DACA2A571705EE91002C6C22 /* comp.h in Headers */, - DACA2A581705EE91002C6C22 /* obj_mac.h in Headers */, - DACA2A591705EE91002C6C22 /* ebcdic.h in Headers */, - DACA2A5A1705EE91002C6C22 /* pkcs12.h in Headers */, - DACA2A5B1705EE91002C6C22 /* camellia.h in Headers */, - DACA2A5C1705EE91002C6C22 /* asn1t.h in Headers */, - DACA2A5D1705EE91002C6C22 /* md5.h in Headers */, - DACA2A5E1705EE91002C6C22 /* symhacks.h in Headers */, - DACA2A5F1705EE91002C6C22 /* ui_compat.h in Headers */, - DACA2A601705EE91002C6C22 /* rc2.h in Headers */, - DACA2A611705EE91002C6C22 /* lhash.h in Headers */, - DACA2A621705EE91002C6C22 /* bn.h in Headers */, - DACA2A631705EE91002C6C22 /* opensslv.h in Headers */, - DACA2A641705EE91002C6C22 /* mdc2.h in Headers */, - DACA2A651705EE91002C6C22 /* cms.h in Headers */, - DACA2A661705EE91002C6C22 /* x509v3.h in Headers */, - DACA2A671705EE91002C6C22 /* md4.h in Headers */, - DACA2A681705EE91002C6C22 /* asn1_mac.h in Headers */, - DACA2A691705EE91002C6C22 /* ssl23.h in Headers */, - DACA2A6A1705EE91002C6C22 /* x509.h in Headers */, - DACA2A6B1705EE91002C6C22 /* safestack.h in Headers */, - DACA2A6C1705EE91002C6C22 /* des_old.h in Headers */, - DACA2A6D1705EE91002C6C22 /* ts.h in Headers */, - DACA2A6E1705EE91002C6C22 /* bio.h in Headers */, - DACA2A6F1705EE91002C6C22 /* sha.h in Headers */, - DACA2A701705EE91002C6C22 /* whrlpool.h in Headers */, - DACA2A711705EE91002C6C22 /* x509_vfy.h in Headers */, - DACA2A721705EE91002C6C22 /* conf_api.h in Headers */, - DACA2A731705EE91002C6C22 /* aes.h in Headers */, - DACA2A741705EE91002C6C22 /* tls1.h in Headers */, - DACA2A751705EE91002C6C22 /* kssl.h in Headers */, - DACA2A761705EE91002C6C22 /* ripemd.h in Headers */, - DACA2A771705EE91002C6C22 /* dsa.h in Headers */, - DACA2A781705EE91002C6C22 /* ssl.h in Headers */, - DACA2A791705EE91002C6C22 /* opensslconf.h in Headers */, - DACA2A7A1705EE91002C6C22 /* asn1.h in Headers */, - DACA2A7B1705EE91002C6C22 /* scryptenc_cpuperf.h in Headers */, - DACA2A7C1705EE91002C6C22 /* scryptenc.h in Headers */, - DACA2A7D1705EE91002C6C22 /* crypto_scrypt.h in Headers */, - DACA2A7E1705EE91002C6C22 /* memlimit.h in Headers */, - DACA2A7F1705EE91002C6C22 /* sha256.h in Headers */, - DACA2A801705EE91002C6C22 /* sysendian.h in Headers */, - DACA2A811705EE91002C6C22 /* crypto_aesctr.h in Headers */, - DACA2A821705EE91002C6C22 /* warn.h in Headers */, - DACA2A831705EE91002C6C22 /* readpass.h in Headers */, + DA5E5C8817248AA1003798D8 /* crypto_aesctr.h in Headers */, + DA5E5C8917248AA1003798D8 /* crypto_scrypt.h in Headers */, + DA5E5C8A17248AA1003798D8 /* memlimit.h in Headers */, + DA5E5C8B17248AA1003798D8 /* readpass.h in Headers */, + DA5E5C8C17248AA1003798D8 /* scryptenc.h in Headers */, + DA5E5C8D17248AA1003798D8 /* scryptenc_cpuperf.h in Headers */, + DA5E5C8E17248AA1003798D8 /* sha256.h in Headers */, + DA5E5C8F17248AA1003798D8 /* sysendian.h in Headers */, + DA5E5C9017248AA1003798D8 /* warn.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1317,12 +985,6 @@ mainGroup = DA5BFA39147E415C00F98B1E; productRefGroup = DA5BFA45147E415C00F98B1E /* Products */; projectDirPath = ""; - projectReferences = ( - { - ProductGroup = DACA29D31705E36C002C6C22 /* Products */; - ProjectRef = DACA29C01705E313002C6C22 /* scrypt.xcodeproj */; - }, - ); projectRoot = ""; targets = ( DA5BFA43147E415C00F98B1E /* MasterPassword */, @@ -1334,30 +996,6 @@ }; /* End PBXProject section */ -/* Begin PBXReferenceProxy section */ - DACA29DB1705E36C002C6C22 /* libscryptenc.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libscryptenc.a; - remoteRef = DACA29DA1705E36C002C6C22 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - DACA29DD1705E36C002C6C22 /* libscryptcrypto.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libscryptcrypto.a; - remoteRef = DACA29DC1705E36C002C6C22 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - DACA29DF1705E36C002C6C22 /* libutil.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libutil.a; - remoteRef = DACA29DE1705E36C002C6C22 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; -/* End PBXReferenceProxy section */ - /* Begin PBXResourcesBuildPhase section */ DA3EF17615A47744003ABF4E /* Resources */ = { isa = PBXResourcesBuildPhase; @@ -1614,7 +1252,7 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ - DA3EF18915A47744003ABF4E /* Debug */ = { + DA3EF18915A47744003ABF4E /* Debug-Mac */ = { isa = XCBuildConfiguration; buildSettings = { BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/MasterPassword.app/MasterPassword"; @@ -1634,9 +1272,9 @@ TEST_HOST = "$(BUNDLE_LOADER)"; WRAPPER_EXTENSION = octest; }; - name = Debug; + name = "Debug-Mac"; }; - DA3EF18A15A47744003ABF4E /* AdHoc */ = { + DA3EF18A15A47744003ABF4E /* AdHoc-Mac */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -1664,9 +1302,9 @@ VALIDATE_PRODUCT = YES; WRAPPER_EXTENSION = octest; }; - name = AdHoc; + name = "AdHoc-Mac"; }; - DA3EF18B15A47744003ABF4E /* AppStore */ = { + DA3EF18B15A47744003ABF4E /* AppStore-Mac */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -1694,30 +1332,30 @@ VALIDATE_PRODUCT = YES; WRAPPER_EXTENSION = octest; }; - name = AppStore; + name = "AppStore-Mac"; }; - DA4425D41557BED40052177D /* Debug */ = { + DA4425D41557BED40052177D /* Debug-Mac */ = { isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_OBJC_ARC = YES; }; - name = Debug; + name = "Debug-Mac"; }; - DA4425D51557BED40052177D /* AdHoc */ = { + DA4425D51557BED40052177D /* AdHoc-Mac */ = { isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_OBJC_ARC = YES; }; - name = AdHoc; + name = "AdHoc-Mac"; }; - DA4425D61557BED40052177D /* AppStore */ = { + DA4425D61557BED40052177D /* AppStore-Mac */ = { isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_OBJC_ARC = YES; }; - name = AppStore; + name = "AppStore-Mac"; }; - DA5BFA6B147E415C00F98B1E /* Debug */ = { + DA5BFA6B147E415C00F98B1E /* Debug-Mac */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -1788,9 +1426,9 @@ SDKROOT = macosx; SKIP_INSTALL = YES; }; - name = Debug; + name = "Debug-Mac"; }; - DA5BFA6C147E415C00F98B1E /* AdHoc */ = { + DA5BFA6C147E415C00F98B1E /* AdHoc-Mac */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -1862,9 +1500,9 @@ SKIP_INSTALL = YES; VALIDATE_PRODUCT = YES; }; - name = AdHoc; + name = "AdHoc-Mac"; }; - DA5BFA6E147E415C00F98B1E /* Debug */ = { + DA5BFA6E147E415C00F98B1E /* Debug-Mac */ = { isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_OBJC_ARC = YES; @@ -1873,9 +1511,9 @@ INFOPLIST_FILE = "MasterPassword-Info.plist"; SKIP_INSTALL = NO; }; - name = Debug; + name = "Debug-Mac"; }; - DA5BFA6F147E415C00F98B1E /* AdHoc */ = { + DA5BFA6F147E415C00F98B1E /* AdHoc-Mac */ = { isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_OBJC_ARC = YES; @@ -1884,9 +1522,9 @@ INFOPLIST_FILE = "MasterPassword-Info.plist"; SKIP_INSTALL = NO; }; - name = AdHoc; + name = "AdHoc-Mac"; }; - DA95D60914DF3F3B008D1B94 /* AppStore */ = { + DA95D60914DF3F3B008D1B94 /* AppStore-Mac */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -1960,9 +1598,9 @@ SKIP_INSTALL = YES; VALIDATE_PRODUCT = YES; }; - name = AppStore; + name = "AppStore-Mac"; }; - DA95D60A14DF3F3B008D1B94 /* AppStore */ = { + DA95D60A14DF3F3B008D1B94 /* AppStore-Mac */ = { isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_OBJC_ARC = YES; @@ -1971,9 +1609,9 @@ INFOPLIST_FILE = "MasterPassword-Info.plist"; SKIP_INSTALL = NO; }; - name = AppStore; + name = "AppStore-Mac"; }; - DA95D60B14DF3F3B008D1B94 /* AppStore */ = { + DA95D60B14DF3F3B008D1B94 /* AppStore-Mac */ = { isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_OBJC_ARC = YES; @@ -1982,14 +1620,15 @@ LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)/../../../External/Pearl/Pearl-Crypto\"", + "\"$(SRCROOT)/../../../External/Pearl/Pearl-Crypto/lib\"", ); OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; }; - name = AppStore; + name = "AppStore-Mac"; }; - DA95D60D14DF3F3B008D1B94 /* AppStore */ = { + DA95D60D14DF3F3B008D1B94 /* AppStore-Mac */ = { isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_OBJC_ARC = NO; @@ -1999,9 +1638,9 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; }; - name = AppStore; + name = "AppStore-Mac"; }; - DAC63275148680650075AEA5 /* Debug */ = { + DAC63275148680650075AEA5 /* Debug-Mac */ = { isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_OBJC_ARC = NO; @@ -2011,9 +1650,9 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; }; - name = Debug; + name = "Debug-Mac"; }; - DAC63276148680650075AEA5 /* AdHoc */ = { + DAC63276148680650075AEA5 /* AdHoc-Mac */ = { isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_OBJC_ARC = NO; @@ -2023,9 +1662,9 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; }; - name = AdHoc; + name = "AdHoc-Mac"; }; - DAC77CB5148291A600BCF976 /* Debug */ = { + DAC77CB5148291A600BCF976 /* Debug-Mac */ = { isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_OBJC_ARC = YES; @@ -2034,14 +1673,15 @@ LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)/../../../External/Pearl/Pearl-Crypto\"", + "\"$(SRCROOT)/../../../External/Pearl/Pearl-Crypto/lib\"", ); OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; }; - name = Debug; + name = "Debug-Mac"; }; - DAC77CB6148291A600BCF976 /* AdHoc */ = { + DAC77CB6148291A600BCF976 /* AdHoc-Mac */ = { isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_OBJC_ARC = YES; @@ -2050,12 +1690,13 @@ LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)/../../../External/Pearl/Pearl-Crypto\"", + "\"$(SRCROOT)/../../../External/Pearl/Pearl-Crypto/lib\"", ); OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; }; - name = AdHoc; + name = "AdHoc-Mac"; }; /* End XCBuildConfiguration section */ @@ -2063,62 +1704,62 @@ DA3EF18815A47744003ABF4E /* Build configuration list for PBXNativeTarget "Tests" */ = { isa = XCConfigurationList; buildConfigurations = ( - DA3EF18915A47744003ABF4E /* Debug */, - DA3EF18A15A47744003ABF4E /* AdHoc */, - DA3EF18B15A47744003ABF4E /* AppStore */, + DA3EF18915A47744003ABF4E /* Debug-Mac */, + DA3EF18A15A47744003ABF4E /* AdHoc-Mac */, + DA3EF18B15A47744003ABF4E /* AppStore-Mac */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = AdHoc; + defaultConfigurationName = "AdHoc-Mac"; }; DA4425D31557BED40052177D /* Build configuration list for PBXNativeTarget "UbiquityStoreManager" */ = { isa = XCConfigurationList; buildConfigurations = ( - DA4425D41557BED40052177D /* Debug */, - DA4425D51557BED40052177D /* AdHoc */, - DA4425D61557BED40052177D /* AppStore */, + DA4425D41557BED40052177D /* Debug-Mac */, + DA4425D51557BED40052177D /* AdHoc-Mac */, + DA4425D61557BED40052177D /* AppStore-Mac */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = AdHoc; + defaultConfigurationName = "AdHoc-Mac"; }; DA5BFA3E147E415C00F98B1E /* Build configuration list for PBXProject "MasterPassword-Mac" */ = { isa = XCConfigurationList; buildConfigurations = ( - DA5BFA6B147E415C00F98B1E /* Debug */, - DA5BFA6C147E415C00F98B1E /* AdHoc */, - DA95D60914DF3F3B008D1B94 /* AppStore */, + DA5BFA6B147E415C00F98B1E /* Debug-Mac */, + DA5BFA6C147E415C00F98B1E /* AdHoc-Mac */, + DA95D60914DF3F3B008D1B94 /* AppStore-Mac */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = AdHoc; + defaultConfigurationName = "AdHoc-Mac"; }; DA5BFA6D147E415C00F98B1E /* Build configuration list for PBXNativeTarget "MasterPassword" */ = { isa = XCConfigurationList; buildConfigurations = ( - DA5BFA6E147E415C00F98B1E /* Debug */, - DA5BFA6F147E415C00F98B1E /* AdHoc */, - DA95D60A14DF3F3B008D1B94 /* AppStore */, + DA5BFA6E147E415C00F98B1E /* Debug-Mac */, + DA5BFA6F147E415C00F98B1E /* AdHoc-Mac */, + DA95D60A14DF3F3B008D1B94 /* AppStore-Mac */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = AdHoc; + defaultConfigurationName = "AdHoc-Mac"; }; DAC63274148680650075AEA5 /* Build configuration list for PBXNativeTarget "jrswizzle" */ = { isa = XCConfigurationList; buildConfigurations = ( - DAC63275148680650075AEA5 /* Debug */, - DAC63276148680650075AEA5 /* AdHoc */, - DA95D60D14DF3F3B008D1B94 /* AppStore */, + DAC63275148680650075AEA5 /* Debug-Mac */, + DAC63276148680650075AEA5 /* AdHoc-Mac */, + DA95D60D14DF3F3B008D1B94 /* AppStore-Mac */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = AdHoc; + defaultConfigurationName = "AdHoc-Mac"; }; DAC77CB7148291A600BCF976 /* Build configuration list for PBXNativeTarget "Pearl" */ = { isa = XCConfigurationList; buildConfigurations = ( - DAC77CB5148291A600BCF976 /* Debug */, - DAC77CB6148291A600BCF976 /* AdHoc */, - DA95D60B14DF3F3B008D1B94 /* AppStore */, + DAC77CB5148291A600BCF976 /* Debug-Mac */, + DAC77CB6148291A600BCF976 /* AdHoc-Mac */, + DA95D60B14DF3F3B008D1B94 /* AppStore-Mac */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = AdHoc; + defaultConfigurationName = "AdHoc-Mac"; }; /* End XCConfigurationList section */ diff --git a/MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/xcshareddata/xcschemes/MasterPassword Mac (App Store).xcscheme b/MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/xcshareddata/xcschemes/MasterPassword Mac (App Store).xcscheme index 265c77db..a4f86a0a 100644 --- a/MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/xcshareddata/xcschemes/MasterPassword Mac (App Store).xcscheme +++ b/MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/xcshareddata/xcschemes/MasterPassword Mac (App Store).xcscheme @@ -1,10 +1,17 @@ - + + buildForTesting = "YES" + buildForRunning = "YES" + buildForProfiling = "YES" + buildForArchiving = "YES" + buildForAnalyzing = "YES"> + + + + + buildConfiguration = "AppStore-Mac" + ignoresPersistentStateOnLaunch = "NO" + debugDocumentVersioning = "YES" + allowLocationSimulation = "YES"> + + + + + + + + diff --git a/MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/xcshareddata/xcschemes/MasterPassword Mac (Development).xcscheme b/MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/xcshareddata/xcschemes/MasterPassword Mac (Development).xcscheme index 32f6be57..0ae08aea 100644 --- a/MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/xcshareddata/xcschemes/MasterPassword Mac (Development).xcscheme +++ b/MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/xcshareddata/xcschemes/MasterPassword Mac (Development).xcscheme @@ -1,10 +1,17 @@ - + + buildForTesting = "YES" + buildForRunning = "YES" + buildForProfiling = "YES" + buildForArchiving = "YES" + buildForAnalyzing = "YES"> + + + + + buildConfiguration = "Debug-Mac" + ignoresPersistentStateOnLaunch = "NO" + debugDocumentVersioning = "YES" + allowLocationSimulation = "YES"> + + + + + + + + + + + + diff --git a/MasterPassword/ObjC/iOS/MainStoryboard_iPhone.storyboard b/MasterPassword/ObjC/iOS/MainStoryboard_iPhone.storyboard index b1508592..b6fd805c 100644 --- a/MasterPassword/ObjC/iOS/MainStoryboard_iPhone.storyboard +++ b/MasterPassword/ObjC/iOS/MainStoryboard_iPhone.storyboard @@ -2810,190 +2810,6 @@ However, it means that anyone who finds your device unlocked can do the same. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj b/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj index 29689915..694560fa 100644 --- a/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj +++ b/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj @@ -47,6 +47,16 @@ DA5BFA4D147E415C00F98B1E /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA5BFA4C147E415C00F98B1E /* CoreGraphics.framework */; }; DA5BFA4F147E415C00F98B1E /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA5BFA4E147E415C00F98B1E /* CoreData.framework */; }; DA5E5C3D1723681B003798D8 /* Square-bottom.png in Resources */ = {isa = PBXBuildFile; fileRef = DA5E5C3C1723681B003798D8 /* Square-bottom.png */; }; + DA5E5C6E17248959003798D8 /* crypto_aesctr.h in Headers */ = {isa = PBXBuildFile; fileRef = DA5E5C6517248959003798D8 /* crypto_aesctr.h */; }; + DA5E5C6F17248959003798D8 /* crypto_scrypt.h in Headers */ = {isa = PBXBuildFile; fileRef = DA5E5C6617248959003798D8 /* crypto_scrypt.h */; }; + DA5E5C7017248959003798D8 /* memlimit.h in Headers */ = {isa = PBXBuildFile; fileRef = DA5E5C6717248959003798D8 /* memlimit.h */; }; + DA5E5C7117248959003798D8 /* readpass.h in Headers */ = {isa = PBXBuildFile; fileRef = DA5E5C6817248959003798D8 /* readpass.h */; }; + DA5E5C7217248959003798D8 /* scryptenc.h in Headers */ = {isa = PBXBuildFile; fileRef = DA5E5C6917248959003798D8 /* scryptenc.h */; }; + DA5E5C7317248959003798D8 /* scryptenc_cpuperf.h in Headers */ = {isa = PBXBuildFile; fileRef = DA5E5C6A17248959003798D8 /* scryptenc_cpuperf.h */; }; + DA5E5C7417248959003798D8 /* sha256.h in Headers */ = {isa = PBXBuildFile; fileRef = DA5E5C6B17248959003798D8 /* sha256.h */; }; + DA5E5C7517248959003798D8 /* sysendian.h in Headers */ = {isa = PBXBuildFile; fileRef = DA5E5C6C17248959003798D8 /* sysendian.h */; }; + DA5E5C7617248959003798D8 /* warn.h in Headers */ = {isa = PBXBuildFile; fileRef = DA5E5C6D17248959003798D8 /* warn.h */; }; + DA5E5C78172489FA003798D8 /* libscryptenc-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DA5E5C77172489FA003798D8 /* libscryptenc-ios.a */; }; DA6701B816406A4100B61001 /* Accounts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA6701B716406A4100B61001 /* Accounts.framework */; settings = {ATTRIBUTES = (Required, ); }; }; DA6701DE16406B7300B61001 /* Social.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA6701DD16406B7300B61001 /* Social.framework */; settings = {ATTRIBUTES = (Required, ); }; }; DA6701E016406BB400B61001 /* AdSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA6701DF16406BB400B61001 /* AdSupport.framework */; settings = {ATTRIBUTES = (Required, ); }; }; @@ -757,7 +767,6 @@ DABD3C251711E2DC00CF925C /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = DABD3BF91711E2DC00CF925C /* Settings.bundle */; }; DABD3C261711E2DC00CF925C /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = DABD3BFA1711E2DC00CF925C /* InfoPlist.strings */; }; DABD3C271711E2DC00CF925C /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = DABD3BFC1711E2DC00CF925C /* main.m */; }; - DABD3FC717122ADD00CF925C /* libscrypt-bin-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DABD3FC617122ADD00CF925C /* libscrypt-bin-ios.a */; }; DABD3FCA1712446200CF925C /* cloud.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD3FC81712446200CF925C /* cloud.png */; }; DABD3FCB1712446200CF925C /* cloud@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD3FC91712446200CF925C /* cloud@2x.png */; }; DABD3FCE1714F45C00CF925C /* identity.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD3FCC1714F45B00CF925C /* identity.png */; }; @@ -950,55 +959,6 @@ remoteGlobalIDString = DA5BFA43147E415C00F98B1E; remoteInfo = MasterPassword; }; - DA5A09D21714FA83005284AB /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = DACA29C01705E313002C6C22 /* scrypt.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = D2AAC07E0554694100DB518D; - remoteInfo = scryptenc; - }; - DA5A09D41714FA83005284AB /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = DACA29C01705E313002C6C22 /* scrypt.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A0511C5A127770FD00DE46C4; - remoteInfo = scryptcrypto; - }; - DA5A09D61714FA83005284AB /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = DACA29C01705E313002C6C22 /* scrypt.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = DA67FE5D14E4834300DB7CC9; - remoteInfo = util; - }; - DA5A09D81714FA83005284AB /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = DACA29C01705E313002C6C22 /* scrypt.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = DABD3E841711E7D600CF925C; - remoteInfo = "scrypt-bin-ios"; - }; - DA5A09DA1714FA83005284AB /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = DACA29C01705E313002C6C22 /* scrypt.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = DABD3E9D1711E7E000CF925C; - remoteInfo = "scrypt-bin-osx"; - }; - DAC63283148681200075AEA5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = DA5BFA3B147E415C00F98B1E /* Project object */; - proxyType = 1; - remoteGlobalIDString = DAC6325C1486805C0075AEA5; - remoteInfo = "uicolor-utilities"; - }; - DAC63285148681200075AEA5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = DA5BFA3B147E415C00F98B1E /* Project object */; - proxyType = 1; - remoteGlobalIDString = DAC6326B148680650075AEA5; - remoteInfo = jrswizzle; - }; /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -1051,6 +1011,16 @@ DA5BFA4C147E415C00F98B1E /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; DA5BFA4E147E415C00F98B1E /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; }; DA5E5C3C1723681B003798D8 /* Square-bottom.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Square-bottom.png"; path = "Dividers/Square-bottom.png"; sourceTree = ""; }; + DA5E5C6517248959003798D8 /* crypto_aesctr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_aesctr.h; sourceTree = ""; }; + DA5E5C6617248959003798D8 /* crypto_scrypt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_scrypt.h; sourceTree = ""; }; + DA5E5C6717248959003798D8 /* memlimit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = memlimit.h; sourceTree = ""; }; + DA5E5C6817248959003798D8 /* readpass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = readpass.h; sourceTree = ""; }; + DA5E5C6917248959003798D8 /* scryptenc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scryptenc.h; sourceTree = ""; }; + DA5E5C6A17248959003798D8 /* scryptenc_cpuperf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scryptenc_cpuperf.h; sourceTree = ""; }; + DA5E5C6B17248959003798D8 /* sha256.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sha256.h; sourceTree = ""; }; + DA5E5C6C17248959003798D8 /* sysendian.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sysendian.h; sourceTree = ""; }; + DA5E5C6D17248959003798D8 /* warn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = warn.h; sourceTree = ""; }; + DA5E5C77172489FA003798D8 /* libscryptenc-ios.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libscryptenc-ios.a"; path = "/Users/.z/lhunath/Documents/workspace/lyndir/MasterPassword/External/Pearl/Pearl-Crypto/lib/libscryptenc-ios.a"; sourceTree = ""; }; DA6701B716406A4100B61001 /* Accounts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accounts.framework; path = System/Library/Frameworks/Accounts.framework; sourceTree = SDKROOT; }; DA6701DD16406B7300B61001 /* Social.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Social.framework; path = System/Library/Frameworks/Social.framework; sourceTree = SDKROOT; }; DA6701DF16406BB400B61001 /* AdSupport.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AdSupport.framework; path = System/Library/Frameworks/AdSupport.framework; sourceTree = SDKROOT; }; @@ -1946,7 +1916,6 @@ DACA29B61705E2DE002C6C22 /* UIColor+HSV.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIColor+HSV.h"; sourceTree = ""; }; DACA29BA1705E2DE002C6C22 /* UIColor+Expanded.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIColor+Expanded.m"; sourceTree = ""; }; DACA29BB1705E2DE002C6C22 /* UIColor+HSV.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIColor+HSV.m"; sourceTree = ""; }; - DACA29C01705E313002C6C22 /* scrypt.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = scrypt.xcodeproj; path = External/iOSPorts/ports/security/scrypt/scrypt.xcodeproj; sourceTree = ""; }; DAD3127115528CD200A3F9ED /* libLocalytics.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libLocalytics.a; sourceTree = BUILT_PRODUCTS_DIR; }; DAD312C01552A20800A3F9ED /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = usr/lib/libsqlite3.dylib; sourceTree = SDKROOT; }; DAEBC45214F6364500987BF6 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; @@ -2130,10 +2099,10 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - DABD3FC717122ADD00CF925C /* libscrypt-bin-ios.a in Frameworks */, DA4DA1DA1564471F00F6F596 /* libuicolor-utilities.a in Frameworks */, DA4DA1D91564471A00F6F596 /* libjrswizzle.a in Frameworks */, DAC77CAE148291A600BCF976 /* Foundation.framework in Frameworks */, + DA5E5C78172489FA003798D8 /* libscryptenc-ios.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2148,18 +2117,6 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - DA5A09C91714FA83005284AB /* Products */ = { - isa = PBXGroup; - children = ( - DA5A09D31714FA83005284AB /* libscryptenc.a */, - DA5A09D51714FA83005284AB /* libscryptcrypto.a */, - DA5A09D71714FA83005284AB /* libutil.a */, - DA5A09D91714FA83005284AB /* libscrypt-bin-ios.a */, - DA5A09DB1714FA83005284AB /* libscrypt-bin-osx.a */, - ); - name = Products; - sourceTree = ""; - }; DA5BFA39147E415C00F98B1E = { isa = PBXGroup; children = ( @@ -2213,6 +2170,31 @@ name = Frameworks; sourceTree = ""; }; + DA5E5C6317248959003798D8 /* lib */ = { + isa = PBXGroup; + children = ( + DA5E5C77172489FA003798D8 /* libscryptenc-ios.a */, + DA5E5C6417248959003798D8 /* include */, + ); + path = lib; + sourceTree = ""; + }; + DA5E5C6417248959003798D8 /* include */ = { + isa = PBXGroup; + children = ( + DA5E5C6517248959003798D8 /* crypto_aesctr.h */, + DA5E5C6617248959003798D8 /* crypto_scrypt.h */, + DA5E5C6717248959003798D8 /* memlimit.h */, + DA5E5C6817248959003798D8 /* readpass.h */, + DA5E5C6917248959003798D8 /* scryptenc.h */, + DA5E5C6A17248959003798D8 /* scryptenc_cpuperf.h */, + DA5E5C6B17248959003798D8 /* sha256.h */, + DA5E5C6C17248959003798D8 /* sysendian.h */, + DA5E5C6D17248959003798D8 /* warn.h */, + ); + path = include; + sourceTree = ""; + }; DABD360D1711E29400CF925C /* Media */ = { isa = PBXGroup; children = ( @@ -3038,7 +3020,6 @@ DAFE45FC15039823003ABA7C /* Pearl-Crypto */, DAFE460715039823003ABA7C /* Pearl-UIKit */, DAC77CB1148291A600BCF976 /* Pearl-Prefix.pch */, - DACA29C01705E313002C6C22 /* scrypt.xcodeproj */, DACA29751705E2BD002C6C22 /* jrswizzle */, DACA29B41705E2DE002C6C22 /* uicolor-utilities */, ); @@ -3450,6 +3431,7 @@ DAFE45FC15039823003ABA7C /* Pearl-Crypto */ = { isa = PBXGroup; children = ( + DA5E5C6317248959003798D8 /* lib */, DAFE45FD15039823003ABA7C /* Pearl-Crypto.h */, DA30E9D115722EE500A68B4C /* Pearl-Crypto.m */, DAFE45FE15039823003ABA7C /* PearlCryptUtils.h */, @@ -3640,6 +3622,15 @@ DA3509FE15F101A500C14A8E /* PearlQueue.h in Headers */, 93D396BA1C74C4A06FD86437 /* PearlOverlay.h in Headers */, 93D3992FA1546E01F498F665 /* PearlNavigationController.h in Headers */, + DA5E5C6E17248959003798D8 /* crypto_aesctr.h in Headers */, + DA5E5C6F17248959003798D8 /* crypto_scrypt.h in Headers */, + DA5E5C7017248959003798D8 /* memlimit.h in Headers */, + DA5E5C7117248959003798D8 /* readpass.h in Headers */, + DA5E5C7217248959003798D8 /* scryptenc.h in Headers */, + DA5E5C7317248959003798D8 /* scryptenc_cpuperf.h in Headers */, + DA5E5C7417248959003798D8 /* sha256.h in Headers */, + DA5E5C7517248959003798D8 /* sysendian.h in Headers */, + DA5E5C7617248959003798D8 /* warn.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3808,8 +3799,6 @@ buildRules = ( ); dependencies = ( - DAC63284148681200075AEA5 /* PBXTargetDependency */, - DAC63286148681200075AEA5 /* PBXTargetDependency */, ); name = Pearl; productName = Pearl; @@ -3855,12 +3844,6 @@ mainGroup = DA5BFA39147E415C00F98B1E; productRefGroup = DA5BFA45147E415C00F98B1E /* Products */; projectDirPath = ""; - projectReferences = ( - { - ProductGroup = DA5A09C91714FA83005284AB /* Products */; - ProjectRef = DACA29C01705E313002C6C22 /* scrypt.xcodeproj */; - }, - ); projectRoot = ""; targets = ( DA5BFA43147E415C00F98B1E /* MasterPassword */, @@ -3877,44 +3860,6 @@ }; /* End PBXProject section */ -/* Begin PBXReferenceProxy section */ - DA5A09D31714FA83005284AB /* libscryptenc.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libscryptenc.a; - remoteRef = DA5A09D21714FA83005284AB /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - DA5A09D51714FA83005284AB /* libscryptcrypto.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libscryptcrypto.a; - remoteRef = DA5A09D41714FA83005284AB /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - DA5A09D71714FA83005284AB /* libutil.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libutil.a; - remoteRef = DA5A09D61714FA83005284AB /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - DA5A09D91714FA83005284AB /* libscrypt-bin-ios.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libscrypt-bin-ios.a"; - remoteRef = DA5A09D81714FA83005284AB /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - DA5A09DB1714FA83005284AB /* libscrypt-bin-osx.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libscrypt-bin-osx.a"; - remoteRef = DA5A09DA1714FA83005284AB /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; -/* End PBXReferenceProxy section */ - /* Begin PBXResourcesBuildPhase section */ DA3EF17615A47744003ABF4E /* Resources */ = { isa = PBXResourcesBuildPhase; @@ -4875,16 +4820,6 @@ target = DA5BFA43147E415C00F98B1E /* MasterPassword */; targetProxy = DA3EF19D15A47AEB003ABF4E /* PBXContainerItemProxy */; }; - DAC63284148681200075AEA5 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = DAC6325C1486805C0075AEA5 /* uicolor-utilities */; - targetProxy = DAC63283148681200075AEA5 /* PBXContainerItemProxy */; - }; - DAC63286148681200075AEA5 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = DAC6326B148680650075AEA5 /* jrswizzle */; - targetProxy = DAC63285148681200075AEA5 /* PBXContainerItemProxy */; - }; /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ @@ -4907,7 +4842,7 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ - DA3EF18915A47744003ABF4E /* Debug */ = { + DA3EF18915A47744003ABF4E /* Debug-iOS */ = { isa = XCBuildConfiguration; buildSettings = { BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/MasterPassword.app/MasterPassword"; @@ -4927,9 +4862,9 @@ TEST_HOST = "$(BUNDLE_LOADER)"; WRAPPER_EXTENSION = octest; }; - name = Debug; + name = "Debug-iOS"; }; - DA3EF18A15A47744003ABF4E /* AdHoc */ = { + DA3EF18A15A47744003ABF4E /* AdHoc-iOS */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -4957,9 +4892,9 @@ VALIDATE_PRODUCT = YES; WRAPPER_EXTENSION = octest; }; - name = AdHoc; + name = "AdHoc-iOS"; }; - DA3EF18B15A47744003ABF4E /* AppStore */ = { + DA3EF18B15A47744003ABF4E /* AppStore-iOS */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -4987,51 +4922,51 @@ VALIDATE_PRODUCT = YES; WRAPPER_EXTENSION = octest; }; - name = AppStore; + name = "AppStore-iOS"; }; - DA4425D41557BED40052177D /* Debug */ = { + DA4425D41557BED40052177D /* Debug-iOS */ = { isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_OBJC_ARC = YES; }; - name = Debug; + name = "Debug-iOS"; }; - DA4425D51557BED40052177D /* AdHoc */ = { + DA4425D51557BED40052177D /* AdHoc-iOS */ = { isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_OBJC_ARC = YES; }; - name = AdHoc; + name = "AdHoc-iOS"; }; - DA4425D61557BED40052177D /* AppStore */ = { + DA4425D61557BED40052177D /* AppStore-iOS */ = { isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_OBJC_ARC = YES; }; - name = AppStore; + name = "AppStore-iOS"; }; - DA497BA115E8C90E00B52167 /* Debug */ = { + DA497BA115E8C90E00B52167 /* Debug-iOS */ = { isa = XCBuildConfiguration; buildSettings = { GCC_WARN_INHIBIT_ALL_WARNINGS = YES; }; - name = Debug; + name = "Debug-iOS"; }; - DA497BA215E8C90E00B52167 /* AdHoc */ = { + DA497BA215E8C90E00B52167 /* AdHoc-iOS */ = { isa = XCBuildConfiguration; buildSettings = { GCC_WARN_INHIBIT_ALL_WARNINGS = YES; }; - name = AdHoc; + name = "AdHoc-iOS"; }; - DA497BA315E8C90E00B52167 /* AppStore */ = { + DA497BA315E8C90E00B52167 /* AppStore-iOS */ = { isa = XCBuildConfiguration; buildSettings = { GCC_WARN_INHIBIT_ALL_WARNINGS = YES; }; - name = AppStore; + name = "AppStore-iOS"; }; - DA5BFA6B147E415C00F98B1E /* Debug */ = { + DA5BFA6B147E415C00F98B1E /* Debug-iOS */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -5099,9 +5034,9 @@ SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = "1,2"; }; - name = Debug; + name = "Debug-iOS"; }; - DA5BFA6C147E415C00F98B1E /* AdHoc */ = { + DA5BFA6C147E415C00F98B1E /* AdHoc-iOS */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -5169,9 +5104,9 @@ TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; }; - name = AdHoc; + name = "AdHoc-iOS"; }; - DA5BFA6E147E415C00F98B1E /* Debug */ = { + DA5BFA6E147E415C00F98B1E /* Debug-iOS */ = { isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_OBJC_ARC = YES; @@ -5185,9 +5120,9 @@ SKIP_INSTALL = NO; TARGETED_DEVICE_FAMILY = 1; }; - name = Debug; + name = "Debug-iOS"; }; - DA5BFA6F147E415C00F98B1E /* AdHoc */ = { + DA5BFA6F147E415C00F98B1E /* AdHoc-iOS */ = { isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_OBJC_ARC = YES; @@ -5203,30 +5138,30 @@ SKIP_INSTALL = NO; TARGETED_DEVICE_FAMILY = 1; }; - name = AdHoc; + name = "AdHoc-iOS"; }; - DA829E5A159847E0002417D3 /* Debug */ = { + DA829E5A159847E0002417D3 /* Debug-iOS */ = { isa = XCBuildConfiguration; buildSettings = { GCC_WARN_INHIBIT_ALL_WARNINGS = YES; }; - name = Debug; + name = "Debug-iOS"; }; - DA829E5B159847E0002417D3 /* AdHoc */ = { + DA829E5B159847E0002417D3 /* AdHoc-iOS */ = { isa = XCBuildConfiguration; buildSettings = { GCC_WARN_INHIBIT_ALL_WARNINGS = YES; }; - name = AdHoc; + name = "AdHoc-iOS"; }; - DA829E5C159847E0002417D3 /* AppStore */ = { + DA829E5C159847E0002417D3 /* AppStore-iOS */ = { isa = XCBuildConfiguration; buildSettings = { GCC_WARN_INHIBIT_ALL_WARNINGS = YES; }; - name = AppStore; + name = "AppStore-iOS"; }; - DA95D5A514DF063C008D1B94 /* Debug */ = { + DA95D5A514DF063C008D1B94 /* Debug-iOS */ = { isa = XCBuildConfiguration; buildSettings = { DSTROOT = /tmp/InAppSettingsKit.dst; @@ -5235,9 +5170,9 @@ PRODUCT_NAME = InAppSettingsKit; SKIP_INSTALL = YES; }; - name = Debug; + name = "Debug-iOS"; }; - DA95D5A614DF063C008D1B94 /* AdHoc */ = { + DA95D5A614DF063C008D1B94 /* AdHoc-iOS */ = { isa = XCBuildConfiguration; buildSettings = { DSTROOT = /tmp/InAppSettingsKit.dst; @@ -5246,9 +5181,9 @@ PRODUCT_NAME = InAppSettingsKit; SKIP_INSTALL = YES; }; - name = AdHoc; + name = "AdHoc-iOS"; }; - DA95D60914DF3F3B008D1B94 /* AppStore */ = { + DA95D60914DF3F3B008D1B94 /* AppStore-iOS */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -5316,9 +5251,9 @@ TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; }; - name = AppStore; + name = "AppStore-iOS"; }; - DA95D60A14DF3F3B008D1B94 /* AppStore */ = { + DA95D60A14DF3F3B008D1B94 /* AppStore-iOS */ = { isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_OBJC_ARC = YES; @@ -5334,21 +5269,25 @@ SKIP_INSTALL = NO; TARGETED_DEVICE_FAMILY = 1; }; - name = AppStore; + name = "AppStore-iOS"; }; - DA95D60B14DF3F3B008D1B94 /* AppStore */ = { + DA95D60B14DF3F3B008D1B94 /* AppStore-iOS */ = { isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_OBJC_ARC = YES; DSTROOT = /tmp/Pearl.dst; GCC_PREFIX_HEADER = "../Pearl/Pearl-Prefix.pch"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/../../../External/Pearl/Pearl-Crypto\"", + ); OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; }; - name = AppStore; + name = "AppStore-iOS"; }; - DA95D60C14DF3F3B008D1B94 /* AppStore */ = { + DA95D60C14DF3F3B008D1B94 /* AppStore-iOS */ = { isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_OBJC_ARC = NO; @@ -5358,9 +5297,9 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; }; - name = AppStore; + name = "AppStore-iOS"; }; - DA95D60D14DF3F3B008D1B94 /* AppStore */ = { + DA95D60D14DF3F3B008D1B94 /* AppStore-iOS */ = { isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_OBJC_ARC = NO; @@ -5370,9 +5309,9 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; }; - name = AppStore; + name = "AppStore-iOS"; }; - DA95D60E14DF3F3B008D1B94 /* AppStore */ = { + DA95D60E14DF3F3B008D1B94 /* AppStore-iOS */ = { isa = XCBuildConfiguration; buildSettings = { DSTROOT = /tmp/InAppSettingsKit.dst; @@ -5381,9 +5320,9 @@ PRODUCT_NAME = InAppSettingsKit; SKIP_INSTALL = YES; }; - name = AppStore; + name = "AppStore-iOS"; }; - DAC632661486805C0075AEA5 /* Debug */ = { + DAC632661486805C0075AEA5 /* Debug-iOS */ = { isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_OBJC_ARC = NO; @@ -5393,9 +5332,9 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; }; - name = Debug; + name = "Debug-iOS"; }; - DAC632671486805C0075AEA5 /* AdHoc */ = { + DAC632671486805C0075AEA5 /* AdHoc-iOS */ = { isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_OBJC_ARC = NO; @@ -5405,9 +5344,9 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; }; - name = AdHoc; + name = "AdHoc-iOS"; }; - DAC63275148680650075AEA5 /* Debug */ = { + DAC63275148680650075AEA5 /* Debug-iOS */ = { isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_OBJC_ARC = NO; @@ -5417,9 +5356,9 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; }; - name = Debug; + name = "Debug-iOS"; }; - DAC63276148680650075AEA5 /* AdHoc */ = { + DAC63276148680650075AEA5 /* AdHoc-iOS */ = { isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_OBJC_ARC = NO; @@ -5429,52 +5368,60 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; }; - name = AdHoc; + name = "AdHoc-iOS"; }; - DAC77CB5148291A600BCF976 /* Debug */ = { + DAC77CB5148291A600BCF976 /* Debug-iOS */ = { isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_OBJC_ARC = YES; DSTROOT = /tmp/Pearl.dst; GCC_PREFIX_HEADER = "../Pearl/Pearl-Prefix.pch"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/../../../External/Pearl/Pearl-Crypto\"", + ); OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; }; - name = Debug; + name = "Debug-iOS"; }; - DAC77CB6148291A600BCF976 /* AdHoc */ = { + DAC77CB6148291A600BCF976 /* AdHoc-iOS */ = { isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_OBJC_ARC = YES; DSTROOT = /tmp/Pearl.dst; GCC_PREFIX_HEADER = "../Pearl/Pearl-Prefix.pch"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/../../../External/Pearl/Pearl-Crypto\"", + ); OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; }; - name = AdHoc; + name = "AdHoc-iOS"; }; - DAD3127A15528CD200A3F9ED /* Debug */ = { + DAD3127A15528CD200A3F9ED /* Debug-iOS */ = { isa = XCBuildConfiguration; buildSettings = { GCC_WARN_INHIBIT_ALL_WARNINGS = YES; }; - name = Debug; + name = "Debug-iOS"; }; - DAD3127B15528CD200A3F9ED /* AdHoc */ = { + DAD3127B15528CD200A3F9ED /* AdHoc-iOS */ = { isa = XCBuildConfiguration; buildSettings = { GCC_WARN_INHIBIT_ALL_WARNINGS = YES; }; - name = AdHoc; + name = "AdHoc-iOS"; }; - DAD3127C15528CD200A3F9ED /* AppStore */ = { + DAD3127C15528CD200A3F9ED /* AppStore-iOS */ = { isa = XCBuildConfiguration; buildSettings = { GCC_WARN_INHIBIT_ALL_WARNINGS = YES; }; - name = AppStore; + name = "AppStore-iOS"; }; /* End XCBuildConfiguration section */ @@ -5482,112 +5429,112 @@ DA3EF18815A47744003ABF4E /* Build configuration list for PBXNativeTarget "Tests" */ = { isa = XCConfigurationList; buildConfigurations = ( - DA3EF18915A47744003ABF4E /* Debug */, - DA3EF18A15A47744003ABF4E /* AdHoc */, - DA3EF18B15A47744003ABF4E /* AppStore */, + DA3EF18915A47744003ABF4E /* Debug-iOS */, + DA3EF18A15A47744003ABF4E /* AdHoc-iOS */, + DA3EF18B15A47744003ABF4E /* AppStore-iOS */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = AdHoc; + defaultConfigurationName = "AdHoc-iOS"; }; DA4425D31557BED40052177D /* Build configuration list for PBXNativeTarget "UbiquityStoreManager" */ = { isa = XCConfigurationList; buildConfigurations = ( - DA4425D41557BED40052177D /* Debug */, - DA4425D51557BED40052177D /* AdHoc */, - DA4425D61557BED40052177D /* AppStore */, + DA4425D41557BED40052177D /* Debug-iOS */, + DA4425D51557BED40052177D /* AdHoc-iOS */, + DA4425D61557BED40052177D /* AppStore-iOS */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = AdHoc; + defaultConfigurationName = "AdHoc-iOS"; }; DA497BA015E8C90E00B52167 /* Build configuration list for PBXNativeTarget "Google+" */ = { isa = XCConfigurationList; buildConfigurations = ( - DA497BA115E8C90E00B52167 /* Debug */, - DA497BA215E8C90E00B52167 /* AdHoc */, - DA497BA315E8C90E00B52167 /* AppStore */, + DA497BA115E8C90E00B52167 /* Debug-iOS */, + DA497BA215E8C90E00B52167 /* AdHoc-iOS */, + DA497BA315E8C90E00B52167 /* AppStore-iOS */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = AdHoc; + defaultConfigurationName = "AdHoc-iOS"; }; DA5BFA3E147E415C00F98B1E /* Build configuration list for PBXProject "MasterPassword-iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( - DA5BFA6B147E415C00F98B1E /* Debug */, - DA5BFA6C147E415C00F98B1E /* AdHoc */, - DA95D60914DF3F3B008D1B94 /* AppStore */, + DA5BFA6B147E415C00F98B1E /* Debug-iOS */, + DA5BFA6C147E415C00F98B1E /* AdHoc-iOS */, + DA95D60914DF3F3B008D1B94 /* AppStore-iOS */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = AdHoc; + defaultConfigurationName = "AdHoc-iOS"; }; DA5BFA6D147E415C00F98B1E /* Build configuration list for PBXNativeTarget "MasterPassword" */ = { isa = XCConfigurationList; buildConfigurations = ( - DA5BFA6E147E415C00F98B1E /* Debug */, - DA5BFA6F147E415C00F98B1E /* AdHoc */, - DA95D60A14DF3F3B008D1B94 /* AppStore */, + DA5BFA6E147E415C00F98B1E /* Debug-iOS */, + DA5BFA6F147E415C00F98B1E /* AdHoc-iOS */, + DA95D60A14DF3F3B008D1B94 /* AppStore-iOS */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = AdHoc; + defaultConfigurationName = "AdHoc-iOS"; }; DA829E59159847E0002417D3 /* Build configuration list for PBXNativeTarget "FontReplacer" */ = { isa = XCConfigurationList; buildConfigurations = ( - DA829E5A159847E0002417D3 /* Debug */, - DA829E5B159847E0002417D3 /* AdHoc */, - DA829E5C159847E0002417D3 /* AppStore */, + DA829E5A159847E0002417D3 /* Debug-iOS */, + DA829E5B159847E0002417D3 /* AdHoc-iOS */, + DA829E5C159847E0002417D3 /* AppStore-iOS */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = AdHoc; + defaultConfigurationName = "AdHoc-iOS"; }; DA95D5A414DF063C008D1B94 /* Build configuration list for PBXNativeTarget "InAppSettingsKit" */ = { isa = XCConfigurationList; buildConfigurations = ( - DA95D5A514DF063C008D1B94 /* Debug */, - DA95D5A614DF063C008D1B94 /* AdHoc */, - DA95D60E14DF3F3B008D1B94 /* AppStore */, + DA95D5A514DF063C008D1B94 /* Debug-iOS */, + DA95D5A614DF063C008D1B94 /* AdHoc-iOS */, + DA95D60E14DF3F3B008D1B94 /* AppStore-iOS */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = AdHoc; + defaultConfigurationName = "AdHoc-iOS"; }; DAC632651486805C0075AEA5 /* Build configuration list for PBXNativeTarget "uicolor-utilities" */ = { isa = XCConfigurationList; buildConfigurations = ( - DAC632661486805C0075AEA5 /* Debug */, - DAC632671486805C0075AEA5 /* AdHoc */, - DA95D60C14DF3F3B008D1B94 /* AppStore */, + DAC632661486805C0075AEA5 /* Debug-iOS */, + DAC632671486805C0075AEA5 /* AdHoc-iOS */, + DA95D60C14DF3F3B008D1B94 /* AppStore-iOS */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = AdHoc; + defaultConfigurationName = "AdHoc-iOS"; }; DAC63274148680650075AEA5 /* Build configuration list for PBXNativeTarget "jrswizzle" */ = { isa = XCConfigurationList; buildConfigurations = ( - DAC63275148680650075AEA5 /* Debug */, - DAC63276148680650075AEA5 /* AdHoc */, - DA95D60D14DF3F3B008D1B94 /* AppStore */, + DAC63275148680650075AEA5 /* Debug-iOS */, + DAC63276148680650075AEA5 /* AdHoc-iOS */, + DA95D60D14DF3F3B008D1B94 /* AppStore-iOS */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = AdHoc; + defaultConfigurationName = "AdHoc-iOS"; }; DAC77CB7148291A600BCF976 /* Build configuration list for PBXNativeTarget "Pearl" */ = { isa = XCConfigurationList; buildConfigurations = ( - DAC77CB5148291A600BCF976 /* Debug */, - DAC77CB6148291A600BCF976 /* AdHoc */, - DA95D60B14DF3F3B008D1B94 /* AppStore */, + DAC77CB5148291A600BCF976 /* Debug-iOS */, + DAC77CB6148291A600BCF976 /* AdHoc-iOS */, + DA95D60B14DF3F3B008D1B94 /* AppStore-iOS */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = AdHoc; + defaultConfigurationName = "AdHoc-iOS"; }; DAD3127915528CD200A3F9ED /* Build configuration list for PBXNativeTarget "Localytics" */ = { isa = XCConfigurationList; buildConfigurations = ( - DAD3127A15528CD200A3F9ED /* Debug */, - DAD3127B15528CD200A3F9ED /* AdHoc */, - DAD3127C15528CD200A3F9ED /* AppStore */, + DAD3127A15528CD200A3F9ED /* Debug-iOS */, + DAD3127B15528CD200A3F9ED /* AdHoc-iOS */, + DAD3127C15528CD200A3F9ED /* AppStore-iOS */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = AdHoc; + defaultConfigurationName = "AdHoc-iOS"; }; /* End XCConfigurationList section */ diff --git a/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword iOS (App Store).xcscheme b/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword iOS (App Store).xcscheme index 7351e1c4..f4fd5fda 100644 --- a/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword iOS (App Store).xcscheme +++ b/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword iOS (App Store).xcscheme @@ -1,10 +1,17 @@ - + + buildForTesting = "YES" + buildForRunning = "YES" + buildForProfiling = "YES" + buildForArchiving = "YES" + buildForAnalyzing = "YES"> + + + + + buildConfiguration = "AppStore-iOS" + ignoresPersistentStateOnLaunch = "NO" + debugDocumentVersioning = "YES" + allowLocationSimulation = "YES"> + + + + + + + + diff --git a/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword iOS (Development).xcscheme b/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword iOS (Development).xcscheme index 729e4ee9..ce9bfe3a 100644 --- a/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword iOS (Development).xcscheme +++ b/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword iOS (Development).xcscheme @@ -1,5 +1,6 @@ + buildConfiguration = "Debug-iOS"> @@ -43,7 +44,7 @@ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" launchStyle = "0" useCustomWorkingDirectory = "NO" - buildConfiguration = "Debug" + buildConfiguration = "Debug-iOS" ignoresPersistentStateOnLaunch = "NO" debugDocumentVersioning = "YES" allowLocationSimulation = "YES"> @@ -63,7 +64,7 @@ shouldUseLaunchSchemeArgsEnv = "YES" savedToolIdentifier = "" useCustomWorkingDirectory = "NO" - buildConfiguration = "Debug" + buildConfiguration = "Debug-iOS" debugDocumentVersioning = "YES"> + buildConfiguration = "Debug-iOS">