Skip to content

Commit 29d27a7

Browse files
committed
Use web safe encoding when decoding second and first.
1 parent e529515 commit 29d27a7

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

YubiKit/YubiKit/Connections/Shared/Sessions/FIDO2/YKFFIDO2Session.m

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -507,8 +507,8 @@ - (void)getAssertionWithClientDataHash:(NSData *)clientDataHash
507507
NSString *base64EncodedFirst = extensions[@"prf"][@"eval"][@"first"];
508508
NSString *base64EncodedSecond = extensions[@"prf"][@"eval"][@"second"];
509509

510-
NSData *first = [[[NSData alloc] initWithBase64EncodedString:base64EncodedFirst options:0] ykf_prfSaltData];
511-
NSData *second = [[[NSData alloc] initWithBase64EncodedString:base64EncodedSecond options:0] ykf_prfSaltData];
510+
NSData *first = [[[NSData alloc] ykf_initWithWebsafeBase64EncodedString:base64EncodedFirst dataLength:base64EncodedFirst.length] ykf_prfSaltData];
511+
NSData *second = [[[NSData alloc] ykf_initWithWebsafeBase64EncodedString:base64EncodedSecond dataLength:base64EncodedFirst.length] ykf_prfSaltData];
512512

513513
if (first.length != 32 || (second && second.length != 32)) {
514514
[NSException raise:@"Invalid input" format:@"Salt is not 32 bytes long."];
@@ -559,6 +559,11 @@ - (void)getAssertionWithClientDataHash:(NSData *)clientDataHash
559559
ykf_weak_self();
560560
[self executeFIDO2Command:apdu retryCount:0 completion:^(NSData * _Nullable data, NSError * _Nullable error) {
561561
ykf_safe_strong_self();
562+
if (error) {
563+
completion(nil, error);
564+
return;
565+
}
566+
562567
NSLog(@"%@", data.ykf_hexadecimalString);
563568
NSData *cborData = [strongSelf cborFromKeyResponseData:data];
564569
YKFFIDO2GetAssertionResponse *getAssertionResponse = [[YKFFIDO2GetAssertionResponse alloc] initWithCBORData:cborData sharedSecret:sharedSecret];

0 commit comments

Comments
 (0)