Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add token protect checks for iOS #283

Merged
merged 1 commit into from
Jan 17, 2018
Merged

add token protect checks for iOS #283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions tests/objcthemis/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
PODS:
- GRKOpenSSLFramework (1.0.1.20.4)
- themis (0.9.5):
- themis (0.9.6):
- GRKOpenSSLFramework (= 1.0.1.20.4)
- themis/core (= 0.9.5)
- themis/objcwrapper (= 0.9.5)
- themis/core (0.9.5):
- themis/core (= 0.9.6)
- themis/objcwrapper (= 0.9.6)
- themis/core (0.9.6):
- GRKOpenSSLFramework (= 1.0.1.20.4)
- themis/objcwrapper (0.9.5):
- themis/objcwrapper (0.9.6):
- GRKOpenSSLFramework (= 1.0.1.20.4)
- themis/core

Expand All @@ -19,12 +19,12 @@ EXTERNAL SOURCES:

CHECKOUT OPTIONS:
themis:
:commit: a666818d029290c06140d8bf2a1697f872b6219b
:commit: 8090c5067368a29e835cf25538d60ddafd625f31
:git: https://github.com/cossacklabs/themis.git

SPEC CHECKSUMS:
GRKOpenSSLFramework: b6172cc34db9b999002483878772a4bf2a1687ba
themis: 426fc731cd7be9542bbaaf0a3f3f0f916b5153f5
themis: 470fc7b5532b7ff098664185d389fbb1a5ac3603

PODFILE CHECKSUM: 88edddd6333586b5b3690dd262564d9b4bb3c36c

Expand Down
7 changes: 5 additions & 2 deletions tests/objcthemis/objthemis/SecureCellTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,11 +184,13 @@ - (void)testSecureCellTokenProtectModeWithContext {
XCTAssertNil(encryptedMessage, @"encryption without data-to-encrypt, without context should return nil data");

themisError = nil;
encryptedMessage = [cellToken wrapData:[message dataUsingEncoding:NSUTF8StringEncoding]
NSData * messageData = [message dataUsingEncoding:NSUTF8StringEncoding];
encryptedMessage = [cellToken wrapData:messageData
context:[context dataUsingEncoding:NSUTF8StringEncoding]
error:&themisError];
XCTAssertNil(themisError, @"encryption with data and context should be successful");
XCTAssertNotNil(encryptedMessage, @"encryption with data and context should be successful");
XCTAssertEqual([messageData length], [encryptedMessage.cipherText length], @"encrypted data length should be the same as message length");

themisError = nil;
NSData *decryptedMessage = [cellToken unwrapData:encryptedMessage
Expand All @@ -215,14 +217,15 @@ - (void)testSecureCellTokenProtectModeWithoutContext {
NSString *message = @"Roses are grey. Violets are grey.";
NSString *context = @"I'm a dog";
NSError *themisError;

NSData *messageData = [message dataUsingEncoding:NSUTF8StringEncoding];

TSCellTokenEncryptedData *encryptedMessageNoContext = [cellToken
wrapData:[message dataUsingEncoding:NSUTF8StringEncoding]
context:nil
error:&themisError];
XCTAssertNil(themisError, @"encryption without data-to-encrypt, without context should be successful");
XCTAssertNotNil(encryptedMessageNoContext, @"encryption without data-to-encrypt, without context should be successful");
XCTAssertEqual([messageData length], [encryptedMessageNoContext.cipherText length], @"encrypted data length should be the same as message length");

themisError = nil;
NSData *decryptedMessageNoContext = [cellToken unwrapData:encryptedMessageNoContext
Expand Down
12 changes: 7 additions & 5 deletions tests/objcthemis/objthemis/SecureCellTestsSwift.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,12 @@ class SecureCellTestsSwift: XCTestCase {
let cellToken: TSCellToken = TSCellToken(key: masterKeyData)!
let message: String = "Roses are grey. Violets are grey."
let context: String = "I'm a dog"

let encryptedMessage = try? cellToken.wrap(message.data(using: .utf8)!,
let messageData: Data = message.data(using: .utf8)!

let encryptedMessage = try? cellToken.wrap(messageData,
context: context.data(using: .utf8)!)
XCTAssertNotNil(encryptedMessage, "encryption with data and context should be successful")

XCTAssertEqual(encryptedMessage?.cipherText.length, messageData.count)

var decryptedMessage = try? cellToken.unwrapData(encryptedMessage!,
context: nil)
Expand All @@ -140,11 +141,12 @@ class SecureCellTestsSwift: XCTestCase {
let cellToken: TSCellToken = TSCellToken(key: masterKeyData)!
let message: String = "Roses are grey. Violets are grey."
let context: String = "I'm a dog"
let messageData: Data = message.data(using: .utf8)!

let encryptedMessageNoContext = try? cellToken.wrap(message.data(using: .utf8)!,
let encryptedMessageNoContext = try? cellToken.wrap(messageData,
context: nil)
XCTAssertNotNil(encryptedMessageNoContext, "encryption without data-to-encrypt, without context should be successful")

XCTAssertEqual(encryptedMessageNoContext?.cipherText.length, messageData.count)

var decryptedMessageNoContext = try? cellToken.unwrapData(encryptedMessageNoContext!,
context: context.data(using: .utf8))
Expand Down