From 5de295da3e5f9ae7e4de6cfe009e2d0ad4e6a08b Mon Sep 17 00:00:00 2001
From: manuroe <manu@matrix.org>
Date: Wed, 13 Mar 2019 14:54:04 +0100
Subject: OLMKit: add Short Authentication String verification

(cherry picked from commit 3e954ca2729d3333ea853c878602d1696f616573)
---
 xcode/OLMKitTests/OLMKitSASTests.m | 69 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 xcode/OLMKitTests/OLMKitSASTests.m

(limited to 'xcode/OLMKitTests/OLMKitSASTests.m')

diff --git a/xcode/OLMKitTests/OLMKitSASTests.m b/xcode/OLMKitTests/OLMKitSASTests.m
new file mode 100644
index 0000000..08a2490
--- /dev/null
+++ b/xcode/OLMKitTests/OLMKitSASTests.m
@@ -0,0 +1,69 @@
+/*
+ Copyright 2019 New Vector Ltd
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+#import <XCTest/XCTest.h>
+#import <OLMKit/OLMKit.h>
+
+@interface OLMKitSASTests : XCTestCase {
+    OLMSAS *alice;
+    OLMSAS *bob;
+}
+
+@end
+
+@implementation OLMKitSASTests
+
+- (void)setUp {
+    alice = [OLMSAS new];
+    bob = [OLMSAS new];
+}
+
+- (void)tearDown {
+    alice = nil;
+    bob = nil;
+}
+
+- (void)testSASRandomness
+{
+    XCTAssertNotEqualObjects(alice.publicKey, bob.publicKey);
+}
+
+- (void)testSASBytesMatch {
+    [alice setTheirPublicKey:bob.publicKey];
+    [bob setTheirPublicKey:alice.publicKey];
+
+    NSString *sas = @"SAS";
+    NSUInteger length = 5;
+
+    XCTAssertEqualObjects([alice generateBytes:sas length:length],
+                          [bob generateBytes:sas length:length]);
+}
+
+- (void)testMACsMatch {
+    [alice setTheirPublicKey:bob.publicKey];
+    [bob setTheirPublicKey:alice.publicKey];
+
+    NSString *string = @"test";
+    NSString *info = @"MAC";
+
+    NSError *aliceError, *bobError;
+    XCTAssertEqualObjects([alice calculateMac:string info:info error:&aliceError],
+                          [bob calculateMac:string info:info error:&bobError]);
+    XCTAssertNil(aliceError);
+    XCTAssertNil(bobError);
+}
+
+@end
-- 
cgit v1.2.3


From 4057f59453d0276a7dbfeee284892c46786c156b Mon Sep 17 00:00:00 2001
From: manuroe <manu@matrix.org>
Date: Mon, 8 Apr 2019 18:48:09 +0200
Subject: OLMKit: SAS: Added macLongKdf support

(cherry picked from commit 934d516eb35c488ee197e1bab78a4c81e3c8241d)
---
 xcode/OLMKitTests/OLMKitSASTests.m | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'xcode/OLMKitTests/OLMKitSASTests.m')

diff --git a/xcode/OLMKitTests/OLMKitSASTests.m b/xcode/OLMKitTests/OLMKitSASTests.m
index 08a2490..e250a67 100644
--- a/xcode/OLMKitTests/OLMKitSASTests.m
+++ b/xcode/OLMKitTests/OLMKitSASTests.m
@@ -66,4 +66,21 @@
     XCTAssertNil(bobError);
 }
 
+- (void)testMACLongKdfsMatch {
+    [alice setTheirPublicKey:bob.publicKey];
+    [bob setTheirPublicKey:alice.publicKey];
+
+    NSString *string = @"test";
+    NSString *info = @"MAC";
+
+    NSError *aliceError, *bobError;
+    XCTAssertEqualObjects([alice calculateMacLongKdf:string info:info error:&aliceError],
+                          [bob calculateMacLongKdf:string info:info error:&bobError]);
+    XCTAssertNotEqualObjects([alice calculateMacLongKdf:string info:info error:&aliceError],
+                             [bob calculateMac:string info:info error:&bobError]);
+    XCTAssertNil(aliceError);
+    XCTAssertNil(bobError);
+}
+
+
 @end
-- 
cgit v1.2.3