From 099bea05ba1fb20a372c3d511a22c3ff6c4323c3 Mon Sep 17 00:00:00 2001 From: Frederic Jacobs Date: Fri, 20 Mar 2015 00:57:26 +0100 Subject: [PATCH] OpenSSL 1.0.2a --- Podfile | 17 +++++++++-------- Podfile.lock | 18 +++++++++--------- Pods | 2 +- .../src/textsecure/Storage/TSStorageManager.m | 15 ++++++--------- 4 files changed, 25 insertions(+), 27 deletions(-) diff --git a/Podfile b/Podfile index 82207a915..75eab6af8 100644 --- a/Podfile +++ b/Podfile @@ -4,19 +4,20 @@ inhibit_all_warnings! link_with ["Signal", "SignalTests"] -pod 'SocketRocket', :git => 'https://github.com/FredericJacobs/SocketRocket.git', :commit => '73d8a19' -pod 'OpenSSL', '~> 1.0.200' +pod 'OpenSSL', '~> 1.0.201' pod 'libPhoneNumber-iOS', '~> 0.8.2' pod 'AxolotlKit', '~> 0.6.2' pod 'PastelogKit', '~> 1.2' pod 'TwistedOakCollapsingFutures','~> 1.0' -pod 'YapDatabase/SQLCipher' pod 'AFNetworking', '~> 2.5.1' pod 'Mantle', '~> 1.5' -pod 'SSKeychain' -pod 'JSQMessagesViewController', :git => 'https://github.com/WhisperSystems/JSQMessagesViewController', :branch => 'JSignalQ' +pod 'FFCircularProgressView', '>= 0.1' +pod 'SCWaveformView', '~> 1.0' +pod 'YapDatabase/SQLCipher' +pod 'SSKeychain' pod 'DJWActionSheet' + +pod 'SocketRocket', :git => 'https://github.com/FredericJacobs/SocketRocket.git', :commit => '73d8a19' +pod 'JSQMessagesViewController', :git => 'https://github.com/WhisperSystems/JSQMessagesViewController', :branch => 'JSignalQ' +pod 'APDropDownNavToolbar', :git => 'https://github.com/corbett/APDropDownNavToolbar.git', :branch => 'master' pod 'UICKeyChainStore', :podspec => 'Podspecs/UICKeyChainStore.podspec' -pod 'APDropDownNavToolbar', :git => 'https://github.com/corbett/APDropDownNavToolbar.git', :branch => 'master' -pod 'FFCircularProgressView', '>= 0.1' -pod 'SCWaveformView' diff --git a/Podfile.lock b/Podfile.lock index 95e1aa81b..b9480db06 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -37,11 +37,11 @@ PODS: - JSQMessagesViewController (6.1.3): - JSQSystemSoundPlayer (~> 2.0.1) - JSQSystemSoundPlayer (2.0.1) - - libPhoneNumber-iOS (0.8.2) + - libPhoneNumber-iOS (0.8.4) - Mantle (1.5.4): - Mantle/extobjc (= 1.5.4) - Mantle/extobjc (1.5.4) - - OpenSSL (1.0.200) + - OpenSSL (1.0.201) - PastelogKit (1.2): - CocoaLumberjack (~> 1.9) - ProtocolBuffers (1.9.7) @@ -55,9 +55,9 @@ PODS: - UnionFind (~> 1.0) - UICKeyChainStore (1.0.7) - UnionFind (1.0.1) - - YapDatabase/common (2.5.4): + - YapDatabase/common (2.6): - CocoaLumberjack (~> 1) - - YapDatabase/SQLCipher (2.5.4): + - YapDatabase/SQLCipher (2.6): - SQLCipher/fts - YapDatabase/common @@ -70,9 +70,9 @@ DEPENDENCIES: - JSQMessagesViewController (from `https://github.com/WhisperSystems/JSQMessagesViewController`, branch `JSignalQ`) - libPhoneNumber-iOS (~> 0.8.2) - Mantle (~> 1.5) - - OpenSSL (~> 1.0.200) + - OpenSSL (~> 1.0.201) - PastelogKit (~> 1.2) - - SCWaveformView + - SCWaveformView (~> 1.0) - SocketRocket (from `https://github.com/FredericJacobs/SocketRocket.git`, commit `73d8a19`) - SSKeychain - TwistedOakCollapsingFutures (~> 1.0) @@ -114,9 +114,9 @@ SPEC CHECKSUMS: HKDFKit: 5998cf1bbb611e7ecc6bd3eaaef8c7a7da7be949 JSQMessagesViewController: 4cc4ff3b26599e8743166b7e8e908528c8f01a80 JSQSystemSoundPlayer: 55528c699a283aae2220d3ae7b8b527d2ecef4b4 - libPhoneNumber-iOS: 2b5a6aeb7fd720ae856f133aea9937336bd47819 + libPhoneNumber-iOS: dbfc7b4128510a4955df3e5a6f125393fc9ebc2f Mantle: d5fbaf30fbc58031223af13812c060e15934a1fe - OpenSSL: 4c7be3eca71139f52984542d8c4c0752154d26c3 + OpenSSL: 4e990d04b14015c49c800c400b86ae44a4818a5c PastelogKit: 8bab71b1d187617a83e7124cffe9eb1a600e6695 ProtocolBuffers: 37fdd327d36856f965ea9029b5ec0c7120e3a452 SCWaveformView: 55f0cd6e80df1a46ff70892bc4041f5b7d8ad43c @@ -126,6 +126,6 @@ SPEC CHECKSUMS: TwistedOakCollapsingFutures: 07aab84fd3958dc94d55ef705b12857d9fbe61d1 UICKeyChainStore: eef407137f0397e95a3df32cdf05f7e2ddd99647 UnionFind: 45777a8b6878d3a602af3654cc3a09b87389d356 - YapDatabase: c1d6912df1b4a160f7373ee7657d360e29bb00fd + YapDatabase: e8da76280ae7f41b24bf0cc7d7e2e7aafac9e473 COCOAPODS: 0.35.0 diff --git a/Pods b/Pods index 9aac93648..fd73394e7 160000 --- a/Pods +++ b/Pods @@ -1 +1 @@ -Subproject commit 9aac93648cd42d0a94d9b04b8456f7183a8c3b8e +Subproject commit fd73394e70509ee4e86e3ae1677c44e4fed5cbc5 diff --git a/Signal/src/textsecure/Storage/TSStorageManager.m b/Signal/src/textsecure/Storage/TSStorageManager.m index e8da4fc51..5390b5e94 100644 --- a/Signal/src/textsecure/Storage/TSStorageManager.m +++ b/Signal/src/textsecure/Storage/TSStorageManager.m @@ -54,19 +54,16 @@ static NSString * keychainDBPassAccount = @"TSDatabasePass"; YapDatabaseOptions *options = [[YapDatabaseOptions alloc] init]; options.corruptAction = YapDatabaseCorruptAction_Fail; - options.passphraseBlock = ^{ + options.cipherKeyBlock = ^{ return [self databasePassword]; }; _database = [[YapDatabase alloc] initWithPath:[self dbPath] - objectSerializer:NULL - objectDeserializer:NULL - metadataSerializer:NULL - metadataDeserializer:NULL - objectSanitizer:NULL - metadataSanitizer:NULL + serializer:NULL + deserializer:NULL options:options]; _dbConnection = self.newDatabaseConnection; + return self; } @@ -141,7 +138,7 @@ static NSString * keychainDBPassAccount = @"TSDatabasePass"; return databasePath; } -- (NSString*)databasePassword { +- (NSData*)databasePassword { [SSKeychain setAccessibilityType:kSecAttrAccessibleAfterFirstUnlockThisDeviceOnly]; NSString *dbPassword = [SSKeychain passwordForService:keychainService account:keychainDBPassAccount]; @@ -151,7 +148,7 @@ static NSString * keychainDBPassAccount = @"TSDatabasePass"; DDLogError(@"Set new password from keychain ..."); } - return dbPassword; + return [dbPassword dataUsingEncoding:NSUTF8StringEncoding]; } #pragma mark convenience methods