From 39b380b938ee9221d03c45580273919f43c84e5c Mon Sep 17 00:00:00 2001 From: Maarten Billemont Date: Fri, 15 Jan 2016 00:19:07 -0500 Subject: [PATCH] Add TouchID to storeVersions and update crypto libs for bitcode. --- External/Pearl | 2 +- .../ObjC/iOS/MPStoreViewController.m | 3 ++- .../project.pbxproj | 20 +++++++++---------- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/External/Pearl b/External/Pearl index 1c02f689..8b6e3481 160000 --- a/External/Pearl +++ b/External/Pearl @@ -1 +1 @@ -Subproject commit 1c02f68934e0a32adf8f4901fe9e77cff43d93a3 +Subproject commit 8b6e3481d7963d08cd50fc5994702f2abdce3cc5 diff --git a/MasterPassword/ObjC/iOS/MPStoreViewController.m b/MasterPassword/ObjC/iOS/MPStoreViewController.m index bc7c645b..fb920198 100644 --- a/MasterPassword/ObjC/iOS/MPStoreViewController.m +++ b/MasterPassword/ObjC/iOS/MPStoreViewController.m @@ -28,7 +28,8 @@ PearlEnum( MPDevelopmentFuelConsumption, NSMutableString *features = [NSMutableString string]; NSArray *storeVersions = @[ - @"Generated Usernames\nSecurity Question Answers" + @"Generated Usernames\nSecurity Question Answers", + @"TouchID Support" ]; NSInteger storeVersion = [[NSUserDefaults standardUserDefaults] integerForKey:@"storeVersion"]; for (; storeVersion < [storeVersions count]; ++storeVersion) diff --git a/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj b/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj index 3414118a..9fffa646 100644 --- a/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj +++ b/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj @@ -599,7 +599,6 @@ DA29992D19C86F5700AF7DF1 /* thumb_generated_login@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "thumb_generated_login@2x.png"; sourceTree = ""; }; DA29992E19C86F5700AF7DF1 /* thumb_generated_login.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = thumb_generated_login.png; sourceTree = ""; }; DA29993119C9132F00AF7DF1 /* thumb_generated_login@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "thumb_generated_login@3x.png"; sourceTree = ""; }; - DA2C3D5E1BD95DEF001137B3 /* libscryptenc-ios-dev.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libscryptenc-ios-dev.a"; sourceTree = ""; }; DA2C3D601BD95EEE001137B3 /* Fabric.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Fabric.framework; path = ../../../External/iOS/Fabric.framework; sourceTree = ""; }; DA2C3D621BD96126001137B3 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; }; DA2C3D641BD9612F001137B3 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; @@ -665,7 +664,8 @@ DA67460C18DE7F0C00DFE240 /* Exo2.0-Bold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Exo2.0-Bold.otf"; sourceTree = ""; }; DA6774351A4749CC004F356A /* mpw-tests.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "mpw-tests.c"; sourceTree = ""; }; DA70EC7F1811B13C00F65DB2 /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; }; - DA72BD7719C137D500E6ACFE /* libopensslcrypto-ios-dev.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libopensslcrypto-ios-dev.a"; sourceTree = ""; }; + DA7F2C5E1C48B70D00404A26 /* libopensslcrypto-ios-sim.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libopensslcrypto-ios-sim.a"; sourceTree = ""; }; + DA7F2C5F1C48B70D00404A26 /* libscryptenc-ios-sim.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libscryptenc-ios-sim.a"; sourceTree = ""; }; DA854C8118D4CFBF00106317 /* avatar-add@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "avatar-add@2x.png"; sourceTree = ""; }; DA854C8218D4CFBF00106317 /* avatar-add.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "avatar-add.png"; sourceTree = ""; }; DA92614C1BE1A57500369DE5 /* MPAppDelegate_InApp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPAppDelegate_InApp.h; sourceTree = ""; }; @@ -1795,9 +1795,9 @@ isa = PBXGroup; children = ( DA5E5C6417248959003798D8 /* include */, - DA72BD7719C137D500E6ACFE /* libopensslcrypto-ios-dev.a */, + DA7F2C5E1C48B70D00404A26 /* libopensslcrypto-ios-sim.a */, DAE8E65119867AB500416A0F /* libopensslcrypto-ios.a */, - DA2C3D5E1BD95DEF001137B3 /* libscryptenc-ios-dev.a */, + DA7F2C5F1C48B70D00404A26 /* libscryptenc-ios-sim.a */, DAFFC63E17EDDA7C007BB020 /* libscryptenc-ios.a */, ); path = lib; @@ -4046,8 +4046,8 @@ ); "OTHER_LDFLAGS[sdk=iphonesimulator*]" = ( "$(inherited)", - "-lscryptenc-ios-dev", - "-lopensslcrypto-ios-dev", + "-lscryptenc-ios-sim", + "-lopensslcrypto-ios-sim", ); PRODUCT_BUNDLE_IDENTIFIER = com.lyndir.lhunath.MasterPassword; SKIP_INSTALL = NO; @@ -4083,8 +4083,8 @@ ); "OTHER_LDFLAGS[sdk=iphonesimulator*]" = ( "$(inherited)", - "-lscryptenc-ios-dev", - "-lopensslcrypto-ios-dev", + "-lscryptenc-ios-sim", + "-lopensslcrypto-ios-sim", ); PRODUCT_BUNDLE_IDENTIFIER = com.lyndir.lhunath.MasterPassword; SKIP_INSTALL = NO; @@ -4206,8 +4206,8 @@ ); "OTHER_LDFLAGS[sdk=iphonesimulator*]" = ( "$(inherited)", - "-lscryptenc-ios-dev", - "-lopensslcrypto-ios-dev", + "-lscryptenc-ios-sim", + "-lopensslcrypto-ios-sim", ); PRODUCT_BUNDLE_IDENTIFIER = com.lyndir.lhunath.MasterPassword; SKIP_INSTALL = NO;