-
Notifications
You must be signed in to change notification settings - Fork 47
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Removed unused label argument from key extraction. Ported keyFromAcco…
…untName() from android implementation. Fixed unit tests. Removed deprecated methods.
- Loading branch information
1 parent
eab2778
commit 7be88de
Showing
7 changed files
with
26 additions
and
122 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -21,11 +21,9 @@ - (void)test_WhenKeyContainsSlashAndPeriodExists_PeriodIsParsed { | |
NSUInteger period = 0; | ||
NSString *issuer = nil; | ||
NSString *account = nil; | ||
NSString *label = nil; | ||
|
||
[credentialKey ykf_OATHKeyExtractPeriod: &period issuer: &issuer account: &account label: &label]; | ||
[credentialKey ykf_OATHKeyExtractForType:YKFOATHCredentialTypeTOTP period:&period issuer:&issuer account:&account]; | ||
XCTAssertEqual(period, 60, @""); | ||
XCTAssertTrue([label isEqualToString:@"Yubico:[email protected]"], @""); | ||
} | ||
|
||
- (void)test_WhenKeyContainsSlashAndPeriodNotExists_PeriodIsZero { | ||
|
@@ -34,11 +32,9 @@ - (void)test_WhenKeyContainsSlashAndPeriodNotExists_PeriodIsZero { | |
NSUInteger period = 0; | ||
NSString *issuer = nil; | ||
NSString *account = nil; | ||
NSString *label = nil; | ||
|
||
[credentialKey ykf_OATHKeyExtractPeriod: &period issuer: &issuer account: &account label: &label]; | ||
[credentialKey ykf_OATHKeyExtractForType:YKFOATHCredentialTypeTOTP period:&period issuer:&issuer account:&account]; | ||
XCTAssertEqual(period, 0, @""); | ||
XCTAssertTrue([label isEqualToString:@"/Yubico:[email protected]"], @""); | ||
} | ||
|
||
- (void)test_WhenKeyContainsSlashInTheMiddleOfText_PeriodIsZero { | ||
|
@@ -47,11 +43,9 @@ - (void)test_WhenKeyContainsSlashInTheMiddleOfText_PeriodIsZero { | |
NSUInteger period = 0; | ||
NSString *issuer = nil; | ||
NSString *account = nil; | ||
NSString *label = nil; | ||
|
||
[credentialKey ykf_OATHKeyExtractPeriod: &period issuer: &issuer account: &account label: &label]; | ||
[credentialKey ykf_OATHKeyExtractForType:YKFOATHCredentialTypeTOTP period:&period issuer:&issuer account:&account]; | ||
XCTAssertEqual(period, 0, @""); | ||
XCTAssertTrue([label isEqualToString:@"Yubico/demo:[email protected]"], @""); | ||
} | ||
|
||
- (void)test_WhenKeyContainsSlashAndPeriodExistsAndIssuerNotExists_PeriodIsParsedAndIssuerIsNilAndAccountIsParsed { | ||
|
@@ -62,10 +56,9 @@ - (void)test_WhenKeyContainsSlashAndPeriodExistsAndIssuerNotExists_PeriodIsParse | |
NSString *account = nil; | ||
NSString *label = nil; | ||
|
||
[credentialKey ykf_OATHKeyExtractPeriod: &period issuer: &issuer account: &account label: &label]; | ||
[credentialKey ykf_OATHKeyExtractForType:YKFOATHCredentialTypeTOTP period:&period issuer:&issuer account:&account]; | ||
XCTAssertNil(issuer, @"Issuer parsed as nil"); | ||
XCTAssertNotNil(account, @"Account is parsed"); | ||
XCTAssertTrue([label isEqualToString:@"[email protected]"], @""); | ||
XCTAssertTrue([account isEqualToString:@"[email protected]"], @""); | ||
XCTAssertEqual(period, 60, @""); | ||
} | ||
|
@@ -76,12 +69,10 @@ - (void)test_WhenKeyPeriodNotExistsAndIssuerNotExists_PeriodIsZeroAndIssuerIsNil | |
NSUInteger period = 0; | ||
NSString *issuer = nil; | ||
NSString *account = nil; | ||
NSString *label = nil; | ||
|
||
[credentialKey ykf_OATHKeyExtractPeriod: &period issuer: &issuer account: &account label: &label]; | ||
[credentialKey ykf_OATHKeyExtractForType:YKFOATHCredentialTypeTOTP period:&period issuer:&issuer account:&account]; | ||
XCTAssertNil(issuer, @"Issuer parsed as nil"); | ||
XCTAssertNotNil(account, @"Account is parsed"); | ||
XCTAssertTrue([label isEqualToString:@"[email protected]"], @""); | ||
XCTAssertTrue([account isEqualToString:@"[email protected]"], @""); | ||
XCTAssertEqual(period, 0, @""); | ||
} | ||
|
@@ -92,14 +83,11 @@ - (void)test_WhenKeyAccountContainsColonAndPeriodNotExistsAndIssuerNotExists_Per | |
NSUInteger period = 0; | ||
NSString *issuer = nil; | ||
NSString *account = nil; | ||
NSString *label = nil; | ||
|
||
[credentialKey ykf_OATHKeyExtractPeriod: &period issuer: &issuer account: &account label: &label]; | ||
XCTAssertNotNil(issuer, @"Issuer is parsed"); | ||
[credentialKey ykf_OATHKeyExtractForType:YKFOATHCredentialTypeTOTP period:&period issuer:&issuer account:&account]; | ||
XCTAssertNil(issuer, @"Issuer is not nil"); | ||
XCTAssertNotNil(account, @"Account is parsed"); | ||
XCTAssertTrue([label isEqualToString:@":[email protected]"], @""); | ||
XCTAssertTrue([issuer isEqualToString:@""], @""); | ||
XCTAssertTrue([account isEqualToString:@"[email protected]"], @""); | ||
XCTAssertTrue([account isEqualToString:@":[email protected]"], @""); | ||
XCTAssertEqual(period, 0, @""); | ||
} | ||
|
||
|
@@ -109,12 +97,10 @@ - (void)test_WhenKeyPeriodNotExistsAndIssuerContainsColon_PeriodIsZeroAndLableIs | |
NSUInteger period = 0; | ||
NSString *issuer = nil; | ||
NSString *account = nil; | ||
NSString *label = nil; | ||
|
||
[credentialKey ykf_OATHKeyExtractPeriod: &period issuer: &issuer account: &account label: &label]; | ||
[credentialKey ykf_OATHKeyExtractForType:YKFOATHCredentialTypeTOTP period:&period issuer:&issuer account:&account]; | ||
XCTAssertNotNil(issuer, @"Issuer is parsed"); | ||
XCTAssertNotNil(account, @"Account is parsed"); | ||
XCTAssertTrue([label isEqualToString:@"Yubico:demo:[email protected]"], @""); | ||
XCTAssertTrue([issuer isEqualToString:@"Yubico"], @""); | ||
XCTAssertTrue([account isEqualToString:@"demo:[email protected]"], @""); | ||
XCTAssertEqual(period, 0, @""); | ||
|
@@ -126,12 +112,10 @@ - (void)test_WhenKeyPeriodExistsAndIssuerContainsColon_PeriodIsParsedAndLableIsP | |
NSUInteger period = 0; | ||
NSString *issuer = nil; | ||
NSString *account = nil; | ||
NSString *label = nil; | ||
|
||
[credentialKey ykf_OATHKeyExtractPeriod: &period issuer: &issuer account: &account label: &label]; | ||
[credentialKey ykf_OATHKeyExtractForType:YKFOATHCredentialTypeTOTP period:&period issuer:&issuer account:&account]; | ||
XCTAssertNotNil(issuer, @"Issuer is parsed"); | ||
XCTAssertNotNil(account, @"Account is parsed"); | ||
XCTAssertTrue([label isEqualToString:@"Yubico:demo:[email protected]"], @""); | ||
XCTAssertTrue([issuer isEqualToString:@"Yubico"], @""); | ||
XCTAssertTrue([account isEqualToString:@"demo:[email protected]"], @""); | ||
XCTAssertEqual(period, 15, @""); | ||
|
@@ -143,12 +127,10 @@ - (void)test_WhenKeyPeriodNotExistsAndAccountContainsSlash_PeriodIsZeroAndLableI | |
NSUInteger period = 0; | ||
NSString *issuer = nil; | ||
NSString *account = nil; | ||
NSString *label = nil; | ||
|
||
[credentialKey ykf_OATHKeyExtractPeriod: &period issuer: &issuer account: &account label: &label]; | ||
[credentialKey ykf_OATHKeyExtractForType:YKFOATHCredentialTypeTOTP period:&period issuer:&issuer account:&account]; | ||
XCTAssertNotNil(issuer, @"Issuer is parsed"); | ||
XCTAssertNotNil(account, @"Account is parsed"); | ||
XCTAssertTrue([label isEqualToString:@"YubicoDemo:account/test"], @""); | ||
XCTAssertTrue([issuer isEqualToString:@"YubicoDemo"], @""); | ||
XCTAssertTrue([account isEqualToString:@"account/test"], @""); | ||
XCTAssertEqual(period, 0, @""); | ||
|
@@ -160,12 +142,10 @@ - (void)test_WhenKeyPeriodNotExistsAndIssuerContainsSlashAndAccountContainsSlash | |
NSUInteger period = 0; | ||
NSString *issuer = nil; | ||
NSString *account = nil; | ||
NSString *label = nil; | ||
|
||
[credentialKey ykf_OATHKeyExtractPeriod: &period issuer: &issuer account: &account label: &label]; | ||
[credentialKey ykf_OATHKeyExtractForType:YKFOATHCredentialTypeTOTP period:&period issuer:&issuer account:&account]; | ||
XCTAssertNotNil(issuer, @"Issuer is parsed"); | ||
XCTAssertNotNil(account, @"Account is parsed"); | ||
XCTAssertTrue([label isEqualToString:@"Yubico/demo:account/test"], @""); | ||
XCTAssertTrue([issuer isEqualToString:@"Yubico/demo"], @""); | ||
XCTAssertTrue([account isEqualToString:@"account/test"], @""); | ||
XCTAssertEqual(period, 0, @""); | ||
|
@@ -177,12 +157,10 @@ - (void)test_WhenKeyPeriodExistsAndAccountContainsSlash_PeriodIsParsedAndLableIs | |
NSUInteger period = 0; | ||
NSString *issuer = nil; | ||
NSString *account = nil; | ||
NSString *label = nil; | ||
|
||
[credentialKey ykf_OATHKeyExtractPeriod: &period issuer: &issuer account: &account label: &label]; | ||
[credentialKey ykf_OATHKeyExtractForType:YKFOATHCredentialTypeTOTP period:&period issuer:&issuer account:&account]; | ||
XCTAssertNotNil(issuer, @"Issuer is parsed"); | ||
XCTAssertNotNil(account, @"Account is parsed"); | ||
XCTAssertTrue([label isEqualToString:@"YubicoDemo:account/test"], @""); | ||
XCTAssertTrue([issuer isEqualToString:@"YubicoDemo"], @""); | ||
XCTAssertTrue([account isEqualToString:@"account/test"], @""); | ||
XCTAssertEqual(period, 15, @""); | ||
|
@@ -194,12 +172,10 @@ - (void)test_WhenKeyPeriodExistsAndIssuerContainsSlashAndAccountContainsSlash_Pe | |
NSUInteger period = 0; | ||
NSString *issuer = nil; | ||
NSString *account = nil; | ||
NSString *label = nil; | ||
|
||
[credentialKey ykf_OATHKeyExtractPeriod: &period issuer: &issuer account: &account label: &label]; | ||
[credentialKey ykf_OATHKeyExtractForType:YKFOATHCredentialTypeTOTP period:&period issuer:&issuer account:&account]; | ||
XCTAssertNotNil(issuer, @"Issuer is parsed"); | ||
XCTAssertNotNil(account, @"Account is parsed"); | ||
XCTAssertTrue([label isEqualToString:@"Yubico/demo:account/test"], @""); | ||
XCTAssertTrue([issuer isEqualToString:@"Yubico/demo"], @""); | ||
XCTAssertTrue([account isEqualToString:@"account/test"], @""); | ||
XCTAssertEqual(period, 15, @""); | ||
|
@@ -211,12 +187,10 @@ - (void)test_WhenKeyPeriodNotExistsAccountContainsColon_PeriodIsZeroAndLableIsPa | |
NSUInteger period = 0; | ||
NSString *issuer = nil; | ||
NSString *account = nil; | ||
NSString *label = nil; | ||
|
||
[credentialKey ykf_OATHKeyExtractPeriod: &period issuer: &issuer account: &account label: &label]; | ||
[credentialKey ykf_OATHKeyExtractForType:YKFOATHCredentialTypeTOTP period:&period issuer:&issuer account:&account]; | ||
XCTAssertNotNil(issuer, @"Issuer is parsed"); | ||
XCTAssertNotNil(account, @"Account is parsed"); | ||
XCTAssertTrue([label isEqualToString:@"Yubico Demo:account:test"], @""); | ||
XCTAssertTrue([issuer isEqualToString:@"Yubico Demo"], @""); | ||
XCTAssertTrue([account isEqualToString:@"account:test"], @""); | ||
XCTAssertEqual(period, 0, @""); | ||
|