timoreo/olm
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

OLMKit: Update obj-c wrapper to 2.0.0

Browse source
This commit is contained in:
manuroe 2016-11-07 17:27:09 +01:00
parent 5d1b66c350
commit 27a8c28da4
6 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OLMKit.podspec
View file

@ -1,8 +1,8 @@
Pod::Spec.new do |s| Pod::Spec.new do |s|
# The libolm version # The libolm version
MAJOR = 1 MAJOR = 2
MINOR = 3 MINOR = 0
PATCH = 0 PATCH = 0
s.name = "OLMKit" s.name = "OLMKit"

4
xcode/OLMKit.xcodeproj/project.pbxproj
View file

@ -273,7 +273,7 @@
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh; shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run \'pod install\' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
showEnvVarsInLog = 0; showEnvVarsInLog = 0;
}; };
793D0533290528B7C0E17CAD /* [CP] Copy Pods Resources */ = { 793D0533290528B7C0E17CAD /* [CP] Copy Pods Resources */ = {
@ -303,7 +303,7 @@
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh; shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run \'pod install\' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
showEnvVarsInLog = 0; showEnvVarsInLog = 0;
}; };
/* End PBXShellScriptBuildPhase section */ /* End PBXShellScriptBuildPhase section */

2
xcode/OLMKit/OLMInboundGroupSession.h
View file

@ -24,6 +24,6 @@
- (NSString*)sessionIdentifier; - (NSString*)sessionIdentifier;
/** base64 ciphertext -> UTF-8 plaintext */ /** base64 ciphertext -> UTF-8 plaintext */
- (NSString*)decryptMessage:(NSString*)message; - (NSString*)decryptMessage:(NSString*)message messageIndex:(NSUInteger*)messageIndex;
@end @end

4
xcode/OLMKit/OLMInboundGroupSession.m
View file

@ -79,7 +79,7 @@
return idString; return idString;
} }
- (NSString *)decryptMessage:(NSString *)message - (NSString *)decryptMessage:(NSString *)message messageIndex:(NSUInteger*)messageIndex
{ {
NSParameterAssert(message != nil); NSParameterAssert(message != nil);
NSData *messageData = [message dataUsingEncoding:NSUTF8StringEncoding]; NSData *messageData = [message dataUsingEncoding:NSUTF8StringEncoding];
@ -96,7 +96,7 @@
// message buffer is destroyed by olm_group_decrypt_max_plaintext_length // message buffer is destroyed by olm_group_decrypt_max_plaintext_length
mutMessage = messageData.mutableCopy; mutMessage = messageData.mutableCopy;
NSMutableData *plaintextData = [NSMutableData dataWithLength:maxPlaintextLength]; NSMutableData *plaintextData = [NSMutableData dataWithLength:maxPlaintextLength];
size_t plaintextLength = olm_group_decrypt(session, mutMessage.mutableBytes, mutMessage.length, plaintextData.mutableBytes, plaintextData.length); size_t plaintextLength = olm_group_decrypt(session, mutMessage.mutableBytes, mutMessage.length, plaintextData.mutableBytes, plaintextData.length, messageIndex);
if (plaintextLength == olm_error()) { if (plaintextLength == olm_error()) {
const char *error = olm_inbound_group_session_last_error(session); const char *error = olm_inbound_group_session_last_error(session);
NSAssert(NO, @"olm_group_decrypt error: %s", error); NSAssert(NO, @"olm_group_decrypt error: %s", error);

4
xcode/OLMKitTests/OLMKitGroupTests.m
View file

@ -55,8 +55,10 @@
OLMInboundGroupSession *bobSession = [[OLMInboundGroupSession alloc] initInboundGroupSessionWithSessionKey:sessionKey]; OLMInboundGroupSession *bobSession = [[OLMInboundGroupSession alloc] initInboundGroupSessionWithSessionKey:sessionKey];
XCTAssertEqualObjects(aliceSession.sessionIdentifier, bobSession.sessionIdentifier); XCTAssertEqualObjects(aliceSession.sessionIdentifier, bobSession.sessionIdentifier);
NSString *plaintext = [bobSession decryptMessage:aliceToBobMsg]; NSUInteger messageIndex;
NSString *plaintext = [bobSession decryptMessage:aliceToBobMsg messageIndex:&messageIndex];
XCTAssertEqualObjects(message, plaintext); XCTAssertEqualObjects(message, plaintext);
XCTAssertEqual(messageIndex, 0);
} }
- (void)testOutboundGroupSessionSerialization { - (void)testOutboundGroupSessionSerialization {

14
xcode/Podfile.lock
View file

@ -1,9 +1,9 @@
PODS: PODS:
- OLMKit (1.3.0): - OLMKit (2.0.0):
- OLMKit/olmc (= 1.3.0) - OLMKit/olmc (= 2.0.0)
- OLMKit/olmcpp (= 1.3.0) - OLMKit/olmcpp (= 2.0.0)
- OLMKit/olmc (1.3.0) - OLMKit/olmc (2.0.0)
- OLMKit/olmcpp (1.3.0) - OLMKit/olmcpp (2.0.0)
DEPENDENCIES: DEPENDENCIES:
- OLMKit (from `../OLMKit.podspec`) - OLMKit (from `../OLMKit.podspec`)
@ -13,8 +13,8 @@ EXTERNAL SOURCES:
:path: ../OLMKit.podspec :path: ../OLMKit.podspec
SPEC CHECKSUMS: SPEC CHECKSUMS:
OLMKit: 49b73677a77988cc25e51d023f39a8a3e451cb23 OLMKit: ed17cdf7695bc0de1e2bf98243eb65f5b9ddebc1
PODFILE CHECKSUM: 4e261dae61d833ec5585ced2473023b98909fd35 PODFILE CHECKSUM: 4e261dae61d833ec5585ced2473023b98909fd35
COCOAPODS: 1.0.1 COCOAPODS: 1.1.1