mirror of https://github.com/oxen-io/session-ios
Bug fixes + Keychain store
Frederic Jacobs
11 years ago
parent
a813ecbffd
commit
021da47a99
@ -0,0 +1,41 @@
|
|||||||
|
//
|
||||||
|
// SGNKeychainUtil.h
|
||||||
|
// Signal
|
||||||
|
//
|
||||||
|
// Created by Frederic Jacobs on 09/07/14.
|
||||||
|
// Copyright (c) 2014 Open Whisper Systems. All rights reserved.
|
||||||
|
//
|
||||||
|
|
||||||
|
#import <Foundation/Foundation.h>
|
||||||
|
#import "PhoneNumber.h"
|
||||||
|
#import "Zid.h"
|
||||||
|
|
||||||
|
@interface SGNKeychainUtil : NSObject
|
||||||
|
|
||||||
|
+(void)generateKeyingMaterial;
|
||||||
|
+(void)wipeKeychain;
|
||||||
|
|
||||||
|
#pragma mark Registered Phone Number
|
||||||
|
|
||||||
|
+(PhoneNumber*)localNumber;
|
||||||
|
+(void)setLocalNumberTo:(PhoneNumber*)localNumber;
|
||||||
|
|
||||||
|
#pragma mark Signaling Key
|
||||||
|
|
||||||
|
+(int64_t)getAndIncrementOneTimeCounter;
|
||||||
|
|
||||||
|
#pragma mark Zid
|
||||||
|
|
||||||
|
+(Zid*)zid;
|
||||||
|
|
||||||
|
#pragma mark Server Auth
|
||||||
|
|
||||||
|
+(NSString*)serverAuthPassword;
|
||||||
|
|
||||||
|
#pragma mark Signaling
|
||||||
|
|
||||||
|
+(NSData*)signalingMacKey;
|
||||||
|
+(NSData*)signalingCipherKey;
|
||||||
|
+(NSData*)signalingExtraKey;
|
||||||
|
|
||||||
|
@end
|
||||||
@ -0,0 +1,141 @@
|
|||||||
|
//
|
||||||
|
// SGNKeychainUtil.m
|
||||||
|
// Signal
|
||||||
|
//
|
||||||
|
// Created by Frederic Jacobs on 09/07/14.
|
||||||
|
// Copyright (c) 2014 Open Whisper Systems. All rights reserved.
|
||||||
|
//
|
||||||
|
#import "CryptoTools.h"
|
||||||
|
#import "SGNKeychainUtil.h"
|
||||||
|
#import <UICKeyChainStore/UICKeyChainStore.h>
|
||||||
|
#import "Constraints.h"
|
||||||
|
#import "Util.h"
|
||||||
|
|
||||||
|
#define LOCAL_NUMBER_KEY @"Number"
|
||||||
|
#define PASSWORD_COUNTER_KEY @"PasswordCounter"
|
||||||
|
#define SAVED_PASSWORD_KEY @"Password"
|
||||||
|
#define SIGNALING_MAC_KEY @"Signaling Mac Key"
|
||||||
|
#define SIGNALING_CIPHER_KEY @"Signaling Cipher Key"
|
||||||
|
#define ZID_KEY @"ZID"
|
||||||
|
#define ZID_LENGTH 12
|
||||||
|
#define SIGNALING_EXTRA_KEY @"Signaling Extra Key"
|
||||||
|
|
||||||
|
#define SIGNALING_MAC_KEY_LENGTH 20
|
||||||
|
#define SIGNALING_CIPHER_KEY_LENGTH 16
|
||||||
|
#define SAVED_PASSWORD_LENGTH 18
|
||||||
|
#define SIGNALING_EXTRA_KEY_LENGTH 4
|
||||||
|
|
||||||
|
@implementation SGNKeychainUtil
|
||||||
|
|
||||||
|
+ (void)generateKeyingMaterial{
|
||||||
|
[self storeData:[CryptoTools generateSecureRandomData:SIGNALING_MAC_KEY_LENGTH] forKey:SIGNALING_MAC_KEY];
|
||||||
|
[self storeData:[CryptoTools generateSecureRandomData:SIGNALING_CIPHER_KEY_LENGTH] forKey:SIGNALING_CIPHER_KEY];
|
||||||
|
[self storeData:[CryptoTools generateSecureRandomData:SIGNALING_EXTRA_KEY_LENGTH] forKey:SIGNALING_EXTRA_KEY];
|
||||||
|
|
||||||
|
[self storeData:[CryptoTools generateSecureRandomData:ZID_LENGTH] forKey:ZID_KEY];
|
||||||
|
[self storeString:[[CryptoTools generateSecureRandomData:SAVED_PASSWORD_LENGTH] encodedAsBase64] forKey:SAVED_PASSWORD_KEY];
|
||||||
|
}
|
||||||
|
|
||||||
|
+(void)wipeKeychain{
|
||||||
|
[UICKeyChainStore removeAllItems];
|
||||||
|
}
|
||||||
|
|
||||||
|
+(int64_t) getAndIncrementOneTimeCounter {
|
||||||
|
__block int64_t oldCounter;
|
||||||
|
oldCounter = [[UICKeyChainStore stringForKey:PASSWORD_COUNTER_KEY] longLongValue];
|
||||||
|
int64_t newCounter = (oldCounter == INT64_MAX)?INT64_MIN:(oldCounter + 1);
|
||||||
|
[self storeString:[[NSNumber numberWithLongLong:newCounter] stringValue] forKey:PASSWORD_COUNTER_KEY];
|
||||||
|
return newCounter;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ (void)setLocalNumberTo:(PhoneNumber *)localNumber{
|
||||||
|
require(localNumber != nil);
|
||||||
|
require([localNumber toE164]!= nil);
|
||||||
|
|
||||||
|
NSString *e164 = [localNumber toE164];
|
||||||
|
[self storeString:e164 forKey:LOCAL_NUMBER_KEY];
|
||||||
|
}
|
||||||
|
|
||||||
|
+ (PhoneNumber *)localNumber{
|
||||||
|
NSString *lnString = [self stringForKey:LOCAL_NUMBER_KEY];
|
||||||
|
checkOperation(lnString != nil );
|
||||||
|
PhoneNumber *num = [PhoneNumber tryParsePhoneNumberFromE164:lnString];
|
||||||
|
return num;
|
||||||
|
}
|
||||||
|
|
||||||
|
+(Zid *)zid{
|
||||||
|
NSData *data = [self dataForKey:ZID_KEY];
|
||||||
|
if ([data length] != ZID_LENGTH) {
|
||||||
|
DDLogError(@"ZID length is incorrect. Is %lu, should be %d", (unsigned long)[data length], ZID_LENGTH);
|
||||||
|
}
|
||||||
|
Zid *zid = [Zid zidWithData:data];
|
||||||
|
return zid;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
+(NSData *)signalingCipherKey{
|
||||||
|
return [self dataForKey:SIGNALING_CIPHER_KEY andVerifyLength:SIGNALING_CIPHER_KEY_LENGTH];
|
||||||
|
}
|
||||||
|
|
||||||
|
+(NSData *)signalingMacKey{
|
||||||
|
return [self dataForKey:SIGNALING_MAC_KEY andVerifyLength:SIGNALING_MAC_KEY_LENGTH];
|
||||||
|
}
|
||||||
|
|
||||||
|
+ (NSData *)signalingExtraKey{
|
||||||
|
return [self dataForKey:SIGNALING_EXTRA_KEY andVerifyLength:SIGNALING_EXTRA_KEY_LENGTH];
|
||||||
|
}
|
||||||
|
|
||||||
|
+(NSString *)serverAuthPassword{
|
||||||
|
NSString *password = [self stringForKey:SAVED_PASSWORD_KEY];
|
||||||
|
NSData *data = [password decodedAsBase64Data];
|
||||||
|
if ([data length] != SAVED_PASSWORD_LENGTH) {
|
||||||
|
DDLogError(@"The server password has incorrect length. Is %lu but should be %d", (unsigned long)[data length], SAVED_PASSWORD_LENGTH);
|
||||||
|
}
|
||||||
|
return password;
|
||||||
|
}
|
||||||
|
|
||||||
|
#pragma mark Keychain wrapper methods
|
||||||
|
|
||||||
|
+(BOOL)storeData:(NSData*)data forKey:(NSString*)key{
|
||||||
|
BOOL success = [UICKeyChainStore setData:data forKey:key];
|
||||||
|
if (!success) {
|
||||||
|
DDLogError(@"Failed to set value for key: %@", key);
|
||||||
|
}
|
||||||
|
return success;
|
||||||
|
}
|
||||||
|
|
||||||
|
+(NSData*)dataForKey:(NSString*)key andVerifyLength:(uint)length{
|
||||||
|
NSData *data = [self dataForKey:key];
|
||||||
|
|
||||||
|
if ([data length] != length) {
|
||||||
|
DDLogError(@"Length of data not matching. Got %lu, expected %u", [data length], length);
|
||||||
|
}
|
||||||
|
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
|
||||||
|
+(NSData*)dataForKey:(NSString*)key{
|
||||||
|
NSData *data = [UICKeyChainStore dataForKey:key];
|
||||||
|
if (!data) {
|
||||||
|
DDLogError(@"Failed to get value for key: %@", key);
|
||||||
|
}
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
|
||||||
|
+(NSString*)stringForKey:(NSString*)key{
|
||||||
|
NSString *string = [UICKeyChainStore stringForKey:key];
|
||||||
|
if (!string) {
|
||||||
|
DDLogError(@"Failed to get value for key: %@", key);
|
||||||
|
}
|
||||||
|
return string;
|
||||||
|
}
|
||||||
|
|
||||||
|
+(BOOL)storeString:(NSString*)string forKey:(NSString*)key{
|
||||||
|
BOOL success = [UICKeyChainStore setString:string forKey:key];
|
||||||
|
if (!success) {
|
||||||
|
DDLogError(@"Failed to set value for key: %@", key);
|
||||||
|
}
|
||||||
|
return success;
|
||||||
|
}
|
||||||
|
|
||||||
|
@end
|
||||||
Loading…
Reference in New Issue