Skip to content
Permalink
Browse files

Fix libsqlfs SQLCipher cipher compat version

  • Loading branch information...
chrisballinger committed Jul 13, 2019
1 parent 0a01e52 commit 1a9a26b31923aa2b4da6407a8fb4d203c6a84664
Showing with 15 additions and 10 deletions.
  1. +3 −0 .gitmodules
  2. +4 −1 ChatSecure/Classes/Controllers/OTRMediaFileManager.m
  3. +3 −1 Podfile
  4. +3 −7 Podfile.lock
  5. +1 −1 Submodules/IOCipher
  6. +1 −0 Submodules/libsqlfs
@@ -37,3 +37,6 @@
[submodule "Submodules/YapTaskQueue"]
path = Submodules/YapTaskQueue
url = git@github.com:ChatSecure/YapTaskQueue.git
[submodule "Submodules/libsqlfs"]
path = Submodules/libsqlfs
url = git@github.com:ChatSecure/libsqlfs.git
@@ -52,7 +52,10 @@ - (instancetype)init
- (BOOL)setupWithPath:(NSString *)path password:(NSString *)password
{
_ioCipher = [[IOCipher alloc] initWithPath:path password:password];
return _ioCipher != nil;
if (!_ioCipher) {
return NO;
}
return [_ioCipher setCipherCompatibility:3];
}

- (void)copyDataFromFilePath:(NSString *)filePath
@@ -66,7 +66,9 @@ abstract_target 'ChatSecureCorePods' do
pod 'Mantle', :podspec => 'Podspecs/Mantle.podspec.json'

# The upstream 1.3.2 has a regression https://github.com/ChatSecure/ChatSecure-iOS/issues/1075
pod 'libsqlfs/SQLCipher', :git => 'https://github.com/ChatSecure/libsqlfs.git', :branch => '1.3.2-chatsecure'
# pod 'libsqlfs/SQLCipher', :git => 'https://github.com/ChatSecure/libsqlfs.git', :branch => '1.3.2-chatsecure'
pod 'libsqlfs/SQLCipher', :path => 'Submodules/libsqlfs/libsqlfs.podspec'

pod 'IOCipher/GCDWebServer', :path => 'Submodules/IOCipher/IOCipher.podspec'
# pod 'YapTaskQueue/SQLCipher', :git => 'https://github.com/ChatSecure/YapTaskQueue.git', :branch => 'swift4'
pod 'YapTaskQueue/SQLCipher', :path => 'Submodules/YapTaskQueue/YapTaskQueue.podspec'
@@ -272,7 +272,7 @@ DEPENDENCIES:
- JSQMessagesViewController (from `Submodules/JSQMessagesViewController/JSQMessagesViewController.podspec`)
- JTSImageViewController (~> 1.4)
- Kvitto (~> 1.0)
- libsqlfs/SQLCipher (from `https://github.com/ChatSecure/libsqlfs.git`, branch `1.3.2-chatsecure`)
- libsqlfs/SQLCipher (from `Submodules/libsqlfs/libsqlfs.podspec`)
- LicensePlist
- LumberjackConsole (from `Submodules/LumberjackConsole/LumberjackConsole.podspec`)
- Mantle (from `Podspecs/Mantle.podspec.json`)
@@ -340,8 +340,7 @@ EXTERNAL SOURCES:
JSQMessagesViewController:
:path: Submodules/JSQMessagesViewController/JSQMessagesViewController.podspec
libsqlfs:
:branch: 1.3.2-chatsecure
:git: https://github.com/ChatSecure/libsqlfs.git
:path: Submodules/libsqlfs/libsqlfs.podspec
LumberjackConsole:
:path: Submodules/LumberjackConsole/LumberjackConsole.podspec
Mantle:
@@ -363,9 +362,6 @@ EXTERNAL SOURCES:
:path: Submodules/YapTaskQueue/YapTaskQueue.podspec

CHECKOUT OPTIONS:
libsqlfs:
:commit: 36b9d6a56a5918be3a97695063ca32dbf963e887
:git: https://github.com/ChatSecure/libsqlfs.git
Mantle:
:commit: 4c1a09cb0c0811956cd35262340e42b940971cbb
:git: https://github.com/ChatSecure/Mantle.git
@@ -424,6 +420,6 @@ SPEC CHECKSUMS:
YapTaskQueue: f3b23875bead71a7ee57b65637ce9c0e98b68c34
ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb

PODFILE CHECKSUM: 1b808a272fcdf8975849b0c9e9686125fe2debaf
PODFILE CHECKSUM: 8e8e3602306b4364cad1ea5fa7a6e7ff5ff685db

COCOAPODS: 1.7.4
Submodule libsqlfs added at 4456f8

0 comments on commit 1a9a26b

Please sign in to comment.
You can’t perform that action at this time.