oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Debug: Logging new password creation.

This commit is contained in:
Frederic Jacobs 2014-12-12 17:13:38 +01:00
parent c11c4361eb
commit 80a8c39213
5 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Podfile
View File

@ -4,7 +4,6 @@ inhibit_all_warnings!
link_with ["Signal", "SignalTests"] link_with ["Signal", "SignalTests"]
pod 'UICKeyChainStore', :podspec => 'Podspecs/UICKeyChainStore.podspec'
pod 'SocketRocket', :git => 'https://github.com/square/SocketRocket.git', :commit => 'd0585af165' pod 'SocketRocket', :git => 'https://github.com/square/SocketRocket.git', :commit => 'd0585af165'
pod 'OpenSSL', '~> 1.0.110' pod 'OpenSSL', '~> 1.0.110'
pod 'libPhoneNumber-iOS', '~> 0.7' pod 'libPhoneNumber-iOS', '~> 0.7'
@ -14,6 +13,6 @@ pod 'TwistedOakCollapsingFutures','~> 1.0'
pod 'YapDatabase/SQLCipher' pod 'YapDatabase/SQLCipher'
pod 'AFNetworking', '~> 2.5' pod 'AFNetworking', '~> 2.5'
pod 'Mantle', '~> 1.5' pod 'Mantle', '~> 1.5'
pod 'SSKeychain'
pod 'JSQMessagesViewController', :git => 'https://github.com/dtsbourg/JSQMessagesViewController', :branch => 'JSignalQ' pod 'JSQMessagesViewController', :git => 'https://github.com/dtsbourg/JSQMessagesViewController', :branch => 'JSignalQ'
pod 'DJWActionSheet' pod 'DJWActionSheet'

8
Podfile.lock
View File

@ -47,9 +47,9 @@ PODS:
- SQLCipher/common (3.1.0) - SQLCipher/common (3.1.0)
- SQLCipher/fts (3.1.0): - SQLCipher/fts (3.1.0):
- SQLCipher/common - SQLCipher/common
- SSKeychain (1.2.2)
- TwistedOakCollapsingFutures (1.0.0): - TwistedOakCollapsingFutures (1.0.0):
- UnionFind (~> 1.0) - UnionFind (~> 1.0)
- UICKeyChainStore (1.0.7)
- UnionFind (1.0.1) - UnionFind (1.0.1)
- YapDatabase/common (2.5.4): - YapDatabase/common (2.5.4):
- CocoaLumberjack (~> 1) - CocoaLumberjack (~> 1)
@ -67,8 +67,8 @@ DEPENDENCIES:
- OpenSSL (~> 1.0.110) - OpenSSL (~> 1.0.110)
- PastelogKit (~> 1.2) - PastelogKit (~> 1.2)
- SocketRocket (from `https://github.com/square/SocketRocket.git`, commit `d0585af165`) - SocketRocket (from `https://github.com/square/SocketRocket.git`, commit `d0585af165`)
- SSKeychain
- TwistedOakCollapsingFutures (~> 1.0) - TwistedOakCollapsingFutures (~> 1.0)
- UICKeyChainStore (from `Podspecs/UICKeyChainStore.podspec`)
- YapDatabase/SQLCipher - YapDatabase/SQLCipher
EXTERNAL SOURCES: EXTERNAL SOURCES:
@ -78,8 +78,6 @@ EXTERNAL SOURCES:
SocketRocket: SocketRocket:
:commit: d0585af165 :commit: d0585af165
:git: https://github.com/square/SocketRocket.git :git: https://github.com/square/SocketRocket.git
UICKeyChainStore:
:podspec: Podspecs/UICKeyChainStore.podspec
CHECKOUT OPTIONS: CHECKOUT OPTIONS:
JSQMessagesViewController: JSQMessagesViewController:
@ -105,8 +103,8 @@ SPEC CHECKSUMS:
ProtocolBuffers: a834d6fe4ae0cc94d081b864e4948bdd483ad228 ProtocolBuffers: a834d6fe4ae0cc94d081b864e4948bdd483ad228
SocketRocket: 9cbe08469513356cddc0afcab1ff160bd190296a SocketRocket: 9cbe08469513356cddc0afcab1ff160bd190296a
SQLCipher: 981110217eb93c2779c34fb59e646a1c1da918d8 SQLCipher: 981110217eb93c2779c34fb59e646a1c1da918d8
SSKeychain: cc48bd3ad24fcd9125adb9e0d23dd50b8bbd08b9
TwistedOakCollapsingFutures: 07aab84fd3958dc94d55ef705b12857d9fbe61d1 TwistedOakCollapsingFutures: 07aab84fd3958dc94d55ef705b12857d9fbe61d1
UICKeyChainStore: eef407137f0397e95a3df32cdf05f7e2ddd99647
UnionFind: 45777a8b6878d3a602af3654cc3a09b87389d356 UnionFind: 45777a8b6878d3a602af3654cc3a09b87389d356
YapDatabase: c1d6912df1b4a160f7373ee7657d360e29bb00fd YapDatabase: c1d6912df1b4a160f7373ee7657d360e29bb00fd

2
Pods

@ -1 +1 @@
Subproject commit 9601c2be9292f740e40d530ec35ea7182d0a8441 Subproject commit a8bebaaf7290b4aa90621250a3ed64d9cb47da21

1
Signal/src/environment/PropertyListPreferences.m
View File

@ -1,6 +1,5 @@
#import "PropertyListPreferences.h" #import "PropertyListPreferences.h"
#import "Constraints.h" #import "Constraints.h"
#import <UICKeyChainStore/UICKeyChainStore.h>
#import "TSStorageManager.h" #import "TSStorageManager.h"
#define SignalDatabaseCollection @"SignalPreferences" #define SignalDatabaseCollection @"SignalPreferences"

8
Signal/src/textsecure/Storage/TSStorageManager.m
View File

@ -10,10 +10,10 @@
#import <YapDatabase/YapDatabase.h> #import <YapDatabase/YapDatabase.h>
#import <YapDatabase/YapDatabaseRelationship.h> #import <YapDatabase/YapDatabaseRelationship.h>
#import <CocoaLumberjack/DDLog.h> #import <CocoaLumberjack/DDLog.h>
#import <UICKeyChainStore/UICKeyChainStore.h>
#import "CryptoTools.h" #import "CryptoTools.h"
#import "NSData+Base64.h" #import "NSData+Base64.h"
#import <SSKeychain/SSKeychain.h>
#import "TSDatabaseView.h" #import "TSDatabaseView.h"
@ -138,11 +138,13 @@ static NSString * keychainDBPassAccount = @"TSDatabasePass";
} }
- (NSString*)databasePassword { - (NSString*)databasePassword {
NSString *dbPassword = [UICKeyChainStore stringForKey:keychainDBPassAccount]; [SSKeychain setAccessibilityType:kSecAttrAccessibleAfterFirstUnlockThisDeviceOnly];
NSString *dbPassword = [SSKeychain passwordForService:keychainService account:keychainDBPassAccount];
if (!dbPassword) { if (!dbPassword) {
dbPassword = [[CryptoTools generateSecureRandomData:30] base64EncodedString]; dbPassword = [[CryptoTools generateSecureRandomData:30] base64EncodedString];
[UICKeyChainStore setString:dbPassword forKey:keychainDBPassAccount]; [SSKeychain setPassword:dbPassword forService:keychainService account:keychainDBPassAccount];
DDLogError(@"Set new password from keychain ...");
} }
return dbPassword; return dbPassword;