Clean up ahead of PR.
This commit is contained in:
parent
0cc7f3e00e
commit
d8f72dbec5
4
Podfile
4
Podfile
|
@ -7,8 +7,8 @@ def shared_pods
|
|||
# OWS Pods
|
||||
# pod 'SQLCipher', path: '../sqlcipher2'
|
||||
pod 'SQLCipher', :git => 'https://github.com/sqlcipher/sqlcipher.git', :commit => 'd5c2bec'
|
||||
pod 'YapDatabase/SQLCipher', path: '../YapDatabase'
|
||||
# pod 'YapDatabase/SQLCipher', :git => 'https://github.com/WhisperSystems/YapDatabase.git', branch: 'charlesmchen/signal'
|
||||
# pod 'YapDatabase/SQLCipher', path: '../YapDatabase'
|
||||
pod 'YapDatabase/SQLCipher', :git => 'https://github.com/WhisperSystems/YapDatabase.git', branch: 'charlesmchen/unencryptedHeaders'
|
||||
pod 'SignalServiceKit', path: '.'
|
||||
pod 'AxolotlKit', git: 'https://github.com/WhisperSystems/SignalProtocolKit.git', branch: 'mkirk/framework-friendly'
|
||||
#pod 'AxolotlKit', path: '../SignalProtocolKit'
|
||||
|
|
10
Podfile.lock
10
Podfile.lock
|
@ -141,7 +141,7 @@ DEPENDENCIES:
|
|||
- SocketRocket (from `https://github.com/facebook/SocketRocket.git`)
|
||||
- SQLCipher (from `https://github.com/sqlcipher/sqlcipher.git`, commit `d5c2bec`)
|
||||
- SSZipArchive
|
||||
- YapDatabase/SQLCipher (from `../YapDatabase`)
|
||||
- YapDatabase/SQLCipher (from `https://github.com/WhisperSystems/YapDatabase.git`, branch `charlesmchen/unencryptedHeaders`)
|
||||
- YYImage
|
||||
|
||||
EXTERNAL SOURCES:
|
||||
|
@ -167,7 +167,8 @@ EXTERNAL SOURCES:
|
|||
:commit: d5c2bec
|
||||
:git: https://github.com/sqlcipher/sqlcipher.git
|
||||
YapDatabase:
|
||||
:path: ../YapDatabase
|
||||
:branch: charlesmchen/unencryptedHeaders
|
||||
:git: https://github.com/WhisperSystems/YapDatabase.git
|
||||
|
||||
CHECKOUT OPTIONS:
|
||||
AxolotlKit:
|
||||
|
@ -191,6 +192,9 @@ CHECKOUT OPTIONS:
|
|||
SQLCipher:
|
||||
:commit: d5c2bec
|
||||
:git: https://github.com/sqlcipher/sqlcipher.git
|
||||
YapDatabase:
|
||||
:commit: 373f0d4de7407068dcfac457be2cd8113c3b9b30
|
||||
:git: https://github.com/WhisperSystems/YapDatabase.git
|
||||
|
||||
SPEC CHECKSUMS:
|
||||
AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67
|
||||
|
@ -217,6 +221,6 @@ SPEC CHECKSUMS:
|
|||
YapDatabase: 299a32de9d350d37a9ac5b0532609d87d5d2a5de
|
||||
YYImage: 1e1b62a9997399593e4b9c4ecfbbabbf1d3f3b54
|
||||
|
||||
PODFILE CHECKSUM: f53f05410c2a8e39055a1513f5d9fd7289f62e0d
|
||||
PODFILE CHECKSUM: a1bdffc2e8729b9e1b1b91e5ef69a58f753fee3a
|
||||
|
||||
COCOAPODS: 1.3.1
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
//
|
||||
// Copyright (c) 2018 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import "sqlite3.h"
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
NSData *_Nullable ExtractDatabaseKeySpec(sqlite3 *db);
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
|
@ -1,29 +0,0 @@
|
|||
//
|
||||
// Copyright (c) 2018 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import "OWSDatabaseUtils.h"
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
extern "C" {
|
||||
extern void sqlite3CodecGetKey(sqlite3 *db, int nDb, void **zKey, int *nKey);
|
||||
}
|
||||
|
||||
NSData *_Nullable ExtractDatabaseKeySpec(sqlite3 *db)
|
||||
{
|
||||
char *keySpecBytes = NULL;
|
||||
int keySpecLength = 0;
|
||||
sqlite3CodecGetKey(db, 0, (void **)&keySpecBytes, &keySpecLength);
|
||||
if (!keySpecBytes || keySpecLength < 1) {
|
||||
return nil;
|
||||
}
|
||||
NSData *_Nullable keySpecData = [NSData dataWithBytes:keySpecBytes length:(NSUInteger)keySpecLength];
|
||||
if (!keySpecData) {
|
||||
return nil;
|
||||
}
|
||||
|
||||
return keySpecData;
|
||||
}
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
Loading…
Reference in New Issue