Skip to content

Pin protocol v2 fixes in YKFFIDO2Session #175

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

Merged
merged 2 commits into from
Apr 14, 2025
Merged

Pin protocol v2 fixes in YKFFIDO2Session #175

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5cf1978
Fixes pin protocol v2 issues in FIDO.
jensutbult Apr 2, 2025
b4fb51e
Fixes issues with the demo application.
jensutbult Apr 9, 2025
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
10 changes: 5 additions & 5 deletions YubiKit/YubiKit/Connections/Shared/Sessions/FIDO2/YKFFIDO2Session.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,18 +271,18 @@ - (void)changePin:(nonnull NSString *)oldPin to:(nonnull NSString *)newPin compl
NSData *oldPinData = [oldPin dataUsingEncoding:NSUTF8StringEncoding];
NSData *newPinData = [[newPin dataUsingEncoding:NSUTF8StringEncoding] ykf_fido2PaddedPinData];

changePinRequest.pinProtocol = 1;
changePinRequest.pinProtocol = self.pinProtocol;
changePinRequest.subCommand = YKFFIDO2ClientPinRequestSubCommandChangePIN;
changePinRequest.keyAgreement = cosePlatformPublicKey;

NSData *oldPinHash = [[oldPinData ykf_SHA256] subdataWithRange:NSMakeRange(0, 16)];
changePinRequest.pinHashEnc = [oldPinHash ykf_aes256EncryptedDataWithKey:sharedSecret];
changePinRequest.pinHashEnc = [oldPinHash ykf_encryptDataWithKey:sharedSecret pinProtocol:self.pinProtocol];

changePinRequest.pinEnc = [newPinData ykf_aes256EncryptedDataWithKey:sharedSecret];
changePinRequest.pinEnc = [newPinData ykf_encryptDataWithKey:sharedSecret pinProtocol:self.pinProtocol];

NSMutableData *pinAuthData = [NSMutableData dataWithData:changePinRequest.pinEnc];
[pinAuthData appendData:changePinRequest.pinHashEnc];
changePinRequest.pinAuth = [[pinAuthData ykf_fido2HMACWithKey:sharedSecret] subdataWithRange:NSMakeRange(0, 16)];
changePinRequest.pinAuth = [pinAuthData ykf_authenticateDataWithKey:sharedSecret pinProtocol:self.pinProtocol];

[strongSelf executeClientPinRequest:changePinRequest completion:^(YKFFIDO2ClientPinResponse *response, NSError *error) {
if (error) {
Expand Down Expand Up @@ -340,7 +340,7 @@ - (void)getPinRetriesWithCompletion:(YKFFIDO2SessionGetPinRetriesCompletionBlock
YKFParameterAssertReturn(completion);

YKFFIDO2ClientPinRequest *pinRetriesRequest = [[YKFFIDO2ClientPinRequest alloc] init];
pinRetriesRequest.pinProtocol = 1;
pinRetriesRequest.pinProtocol = self.pinProtocol;
pinRetriesRequest.subCommand = YKFFIDO2ClientPinRequestSubCommandGetRetries;

[self executeClientPinRequest:pinRetriesRequest completion:^(YKFFIDO2ClientPinResponse *response, NSError *error) {
Expand Down
Loading