Skip to content

CTAP 2.2 #176

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

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

CTAP 2.2 #176

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b395e60
add CTAP2.2 info fields
AdamVe May 16, 2025
a6f0595
implement support for PPUAT and encIdentifier
AdamVe May 16, 2025
6cc75b5
implement hmac-secret-mc
AdamVe May 20, 2025
037b36a
thirdPartyPayment ctap extension
AdamVe May 21, 2025
9438423
Merge branch 'main' into adamve/ctap2.2
AdamVe Jun 23, 2025
627a951
remove duplicate annotations
AdamVe Jun 23, 2025
8db7254
review fixes
AdamVe Jun 23, 2025
c31a9ca
use primitive data type
AdamVe Jun 23, 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
32 changes: 17 additions & 15 deletions fido/src/main/java/com/yubico/yubikit/fido/ctap/Ctap2Session.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -686,14 +686,14 @@ public static class InfoData {
private final Map<String, Object> certifications;
@Nullable private final Integer remainingDiscoverableCredentials;
@Nullable private final List<Integer> vendorPrototypeConfigCommands;
@Nullable private final List<String> attestationFormats;
private final List<String> attestationFormats;
@Nullable private final Integer uvCountSinceLastPinEntry;
@Nullable private final Boolean longTouchForReset;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

longTouchForReset can default to false and does then not need to be nullable.

@Nullable private final byte[] encIdentifier;
@Nullable private final List<String> transportsForReset;
private final List<String> transportsForReset;
@Nullable private final Boolean pinComplexityPolicy;
@Nullable private final byte[] pinComplexityPolicyURL;
@Nullable private final Integer maxPINLength;
private final Integer maxPinLength;

private InfoData(
List<String> versions,
Expand All @@ -717,14 +717,14 @@ private InfoData(
Map<String, Object> certifications,
@Nullable Integer remainingDiscoverableCredentials,
@Nullable List<Integer> vendorPrototypeConfigCommands,
@Nullable List<String> attestationFormats,
List<String> attestationFormats,
@Nullable Integer uvCountSinceLastPinEntry,
@Nullable Boolean longTouchForReset,
@Nullable byte[] encIdentifier,
@Nullable List<String> transportsForReset,
List<String> transportsForReset,
@Nullable Boolean pinComplexityPolicy,
@Nullable byte[] pinComplexityPolicyURL,
@Nullable Integer maxPINLength) {
Integer maxPinLength) {
this.versions = versions;
this.extensions = extensions;
this.aaguid = aaguid;
Expand Down Expand Up @@ -753,7 +753,7 @@ private InfoData(
this.transportsForReset = transportsForReset;
this.pinComplexityPolicy = pinComplexityPolicy;
this.pinComplexityPolicyURL = pinComplexityPolicyURL;
this.maxPINLength = maxPINLength;
this.maxPinLength = maxPinLength;
}

@SuppressWarnings("unchecked")
Expand Down Expand Up @@ -802,14 +802,18 @@ private static InfoData fromData(Map<Integer, ?> data) {
: Collections.emptyMap(),
(Integer) data.get(RESULT_REMAINING_DISCOVERABLE_CREDENTIALS),
(List<Integer>) data.get(RESULT_VENDOR_PROTOTYPE_CONFIG_COMMANDS),
(List<String>) data.get(RESULT_ATTESTATION_FORMATS),
data.containsKey(RESULT_ATTESTATION_FORMATS)
? (List<String>) data.get(RESULT_ATTESTATION_FORMATS)
: Collections.emptyList(),
(Integer) data.get(RESULT_UV_COUNT_SINCE_LAST_PIN_ENTRY),
(Boolean) data.get(RESULT_LONG_TOUCH_FOR_RESET),
(byte[]) data.get(RESULT_ENC_IDENTIFIER),
(List<String>) data.get(RESULT_TRANSPORTS_FOR_RESET),
data.containsKey(RESULT_TRANSPORTS_FOR_RESET)
? (List<String>) data.get(RESULT_TRANSPORTS_FOR_RESET)
: Collections.emptyList(),
(Boolean) data.get(RESULT_PIN_COMPLEXITY_POLICY),
(byte[]) data.get(RESULT_PIN_COMPLEXITY_POLICY_URL),
(Integer) data.get(RESULT_MAX_PIN_LENGTH));
data.containsKey(RESULT_MAX_PIN_LENGTH) ? (Integer) data.get(RESULT_MAX_PIN_LENGTH) : 63);
}

/**
Expand Down Expand Up @@ -1070,7 +1074,6 @@ public List<Integer> getVendorPrototypeConfigCommands() {
* href="https://www.iana.org/assignments/webauthn/webauthn.xhtml#webauthn-attestation-statement-format-ids">WebAuthn
* attestation statement format IDs</a>
*/
@Nullable
public List<String> getAttestationFormats() {
return attestationFormats;
}
Expand Down Expand Up @@ -1119,7 +1122,6 @@ public byte[] getEncIdentifier() {
* @see <a href="https://www.w3.org/TR/webauthn/#enumdef-authenticatortransport">WebAuthn
* Authenticator Transport Enumeration</a>
*/
@Nullable
public List<String> getTransportsForReset() {
return transportsForReset;
}
Expand Down Expand Up @@ -1160,8 +1162,8 @@ public byte[] getPinComplexityPolicyURL() {
* href="https://fidoalliance.org/specs/fido-v2.2-ps-20250228/fido-client-to-authenticator-protocol-v2.2-ps-20250228.html#getinfo-maxpinlength">maxPinLength</a>
*/
@Nullable
public Integer getMaxPINLength() {
return maxPINLength;
public Integer getMaxPinLength() {
return maxPinLength;
}

@Nullable
Expand Down Expand Up @@ -1245,7 +1247,7 @@ public String toString() {
+ ", pinComplexityPolicyURL="
+ (pinComplexityPolicyURL != null ? StringUtils.bytesToHex(pinComplexityPolicyURL) : null)
+ ", maxPINLength="
+ maxPINLength
+ maxPinLength
+ '}';
}
}
Expand Down