From f65952d400d274578d6e127723695cd084a73fe3 Mon Sep 17 00:00:00 2001 From: Yoshikazu Nojima Date: Wed, 22 May 2024 23:34:06 +0900 Subject: [PATCH] Catch up FIDO Conformance Tools v1.7.19-1 changes --- .../sample/app/config/WebSecurityBeanConfig.java | 12 ++++++------ .../sample/app/config/WebSecurityConfig.java | 1 + ...A512 Conformance Testing CTAP2 Authenticator.json | 2 +- ...IDO2 Conformance Testing CTAP2 Authenticator.json | 5 +++-- ...IDO2 Conformance Testing CTAP2 Authenticator.json | 5 +++-- ...IDO2 Conformance Testing CTAP2 Authenticator.json | 5 +++-- ...IDO2 Conformance Testing CTAP2 Authenticator.json | 5 +++-- ...ing CTAP2 Authenticator with TPM Attestation.json | 4 ++-- ...AP2 Authenticator with SafetyNet attestation.json | 2 +- ...ing CTAP2 Authenticator with TPM Attestation.json | 7 ++++--- ...IDO2 Conformance Testing CTAP2 Authenticator.json | 5 +++-- ...IDO2 Conformance Testing CTAP2 Authenticator.json | 5 +++-- ...IDO2 Conformance Testing CTAP2 Authenticator.json | 5 +++-- ...IDO2 Conformance Testing CTAP2 Authenticator.json | 2 +- ...2 Authenticator with Android Key Attestation.json | 4 ++-- ...thenticator with Apple Anonymous Attestation.json | 2 +- ...P2 Authenticator with Self Batch Referencing.json | 2 +- ...thenticator with Self(surrogate) attestation.json | 2 +- ...TAP2 Authenticator with supported extensions.json | 2 +- ...IDO2 Conformance Testing CTAP2 Authenticator.json | 5 +++-- ...IDO2 Conformance Testing CTAP2 Authenticator.json | 2 +- ...IDO2 Conformance Testing CTAP2 Authenticator.json | 5 +++-- ...IDO2 Conformance Testing CTAP2 Authenticator.json | 7 ++++--- 23 files changed, 54 insertions(+), 42 deletions(-) diff --git a/samples/fido-server-conformance-test-app/src/main/java/com/webauthn4j/springframework/security/webauthn/sample/app/config/WebSecurityBeanConfig.java b/samples/fido-server-conformance-test-app/src/main/java/com/webauthn4j/springframework/security/webauthn/sample/app/config/WebSecurityBeanConfig.java index 012531cb5..958ce9ced 100644 --- a/samples/fido-server-conformance-test-app/src/main/java/com/webauthn4j/springframework/security/webauthn/sample/app/config/WebSecurityBeanConfig.java +++ b/samples/fido-server-conformance-test-app/src/main/java/com/webauthn4j/springframework/security/webauthn/sample/app/config/WebSecurityBeanConfig.java @@ -159,15 +159,15 @@ MetadataStatementsBasedTrustAnchorRepository metadataStatementsBasedTrustAnchorR MetadataBLOBBasedTrustAnchorRepository metadataBLOBBasedTrustAnchorRepository(ObjectConverter objectConverter){ X509Certificate mds3RootCertificate = mds3TestRootCertificate(); MetadataBLOBProvider[] fidoMDS3MetadataBLOBProviders = Stream.of( - "https://mds3.certinfra.fidoalliance.org/execute/20e65bb0ac3a6bd1e2443b7ec7ba97590873378d7b0434f0d715bffbd5bf54e7", - "https://mds3.certinfra.fidoalliance.org/execute/629bc024763f164c78072d2af1af05bec35ff9fcc429bdc786d7b767e7fe2403", - "https://mds3.certinfra.fidoalliance.org/execute/9fb3821e5a8d375d701780434701d671ff7a363888c4196b7be530b8e7716510", - "https://mds3.certinfra.fidoalliance.org/execute/d178ac72328cc4218d3845a31795abfa5587d070f557a9f5987197650093cbfe", - "https://mds3.certinfra.fidoalliance.org/execute/fb966302cf343fafb38a1f09d4ac83db323bfe3d703996c604b67f54ac64b30b") + "https://mds3.fido.tools/execute/b64f714dd9efc2f7011fff6a208e8c170776c326a623788838e43e8c06dd4a4f", + "https://mds3.fido.tools/execute/c344a84746f6a0978d34cd060e4fab6347f9e86b92cc2adc89e7891a419709c6", + "https://mds3.fido.tools/execute/1680c9d899447608dd28eeb5779b70c5bdbdb5daef284f90496fc661975d37df", + "https://mds3.fido.tools/execute/8c7f6fa6e2d058fdef324c2ee435ef4332b968ad8b5a8721717601c100bfb929", + "https://mds3.fido.tools/execute/a90169bef3866ae087e16b22371721eb9cf1411dab197111807013ef4d8d53ec") .map(url -> { try{ FidoMDS3MetadataBLOBProvider fidoMDS3MetadataBLOBProvider = new FidoMDS3MetadataBLOBProvider(objectConverter, url, mds3RootCertificate); - fidoMDS3MetadataBLOBProvider.setRevocationCheckEnabled(false); // FIDO Conformance test env workaround + fidoMDS3MetadataBLOBProvider.setRevocationCheckEnabled(true); fidoMDS3MetadataBLOBProvider.refresh(); return fidoMDS3MetadataBLOBProvider; } diff --git a/samples/fido-server-conformance-test-app/src/main/java/com/webauthn4j/springframework/security/webauthn/sample/app/config/WebSecurityConfig.java b/samples/fido-server-conformance-test-app/src/main/java/com/webauthn4j/springframework/security/webauthn/sample/app/config/WebSecurityConfig.java index b0b561274..bc80df558 100644 --- a/samples/fido-server-conformance-test-app/src/main/java/com/webauthn4j/springframework/security/webauthn/sample/app/config/WebSecurityConfig.java +++ b/samples/fido-server-conformance-test-app/src/main/java/com/webauthn4j/springframework/security/webauthn/sample/app/config/WebSecurityConfig.java @@ -121,6 +121,7 @@ public SecurityFilterChain filterChain(HttpSecurity http, AuthenticationManager .and() .pubKeyCredParams( new PublicKeyCredentialParameters(PublicKeyCredentialType.PUBLIC_KEY, COSEAlgorithmIdentifier.ES256), + new PublicKeyCredentialParameters(PublicKeyCredentialType.PUBLIC_KEY, COSEAlgorithmIdentifier.RS256), new PublicKeyCredentialParameters(PublicKeyCredentialType.PUBLIC_KEY, COSEAlgorithmIdentifier.RS1), new PublicKeyCredentialParameters(PublicKeyCredentialType.PUBLIC_KEY, COSEAlgorithmIdentifier.EdDSA) ) diff --git a/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual FIDO2 EdDSA25519 SHA512 Conformance Testing CTAP2 Authenticator.json b/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual FIDO2 EdDSA25519 SHA512 Conformance Testing CTAP2 Authenticator.json index c2e2a48b3..4b67afe5e 100644 --- a/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual FIDO2 EdDSA25519 SHA512 Conformance Testing CTAP2 Authenticator.json +++ b/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual FIDO2 EdDSA25519 SHA512 Conformance Testing CTAP2 Authenticator.json @@ -27,7 +27,7 @@ "userVerificationDetails": [ [ { - "userVerification": "none" + "userVerificationMethod": "none" } ], [ diff --git a/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual RSA PCKS1.5 SHA1 FIDO2 Conformance Testing CTAP2 Authenticator.json b/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual RSA PCKS1.5 SHA1 FIDO2 Conformance Testing CTAP2 Authenticator.json index 842562783..e619fface 100644 --- a/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual RSA PCKS1.5 SHA1 FIDO2 Conformance Testing CTAP2 Authenticator.json +++ b/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual RSA PCKS1.5 SHA1 FIDO2 Conformance Testing CTAP2 Authenticator.json @@ -20,13 +20,14 @@ "cose" ], "attestationTypes": [ - "basic_full" + "basic_full", + "basic_surrogate" ], "schema": 3, "userVerificationDetails": [ [ { - "userVerification": "none" + "userVerificationMethod": "none" } ], [ diff --git a/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual RSA PCKS1.5 SHA256 FIDO2 Conformance Testing CTAP2 Authenticator.json b/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual RSA PCKS1.5 SHA256 FIDO2 Conformance Testing CTAP2 Authenticator.json index eb5f3dc8a..4adbb2560 100644 --- a/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual RSA PCKS1.5 SHA256 FIDO2 Conformance Testing CTAP2 Authenticator.json +++ b/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual RSA PCKS1.5 SHA256 FIDO2 Conformance Testing CTAP2 Authenticator.json @@ -20,13 +20,14 @@ "cose" ], "attestationTypes": [ - "basic_full" + "basic_full", + "basic_surrogate" ], "schema": 3, "userVerificationDetails": [ [ { - "userVerification": "none" + "userVerificationMethod": "none" } ], [ diff --git a/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual RSA PCKS1.5 SHA384 FIDO2 Conformance Testing CTAP2 Authenticator.json b/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual RSA PCKS1.5 SHA384 FIDO2 Conformance Testing CTAP2 Authenticator.json index 10f803a78..27097d9f9 100644 --- a/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual RSA PCKS1.5 SHA384 FIDO2 Conformance Testing CTAP2 Authenticator.json +++ b/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual RSA PCKS1.5 SHA384 FIDO2 Conformance Testing CTAP2 Authenticator.json @@ -20,13 +20,14 @@ "cose" ], "attestationTypes": [ - "basic_full" + "basic_full", + "basic_surrogate" ], "schema": 3, "userVerificationDetails": [ [ { - "userVerification": "none" + "userVerificationMethod": "none" } ], [ diff --git a/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual RSA PCKS1.5 SHA512 FIDO2 Conformance Testing CTAP2 Authenticator.json b/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual RSA PCKS1.5 SHA512 FIDO2 Conformance Testing CTAP2 Authenticator.json index 4f1808964..5f2542d49 100644 --- a/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual RSA PCKS1.5 SHA512 FIDO2 Conformance Testing CTAP2 Authenticator.json +++ b/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual RSA PCKS1.5 SHA512 FIDO2 Conformance Testing CTAP2 Authenticator.json @@ -20,13 +20,14 @@ "cose" ], "attestationTypes": [ - "basic_full" + "basic_full", + "basic_surrogate" ], "schema": 3, "userVerificationDetails": [ [ { - "userVerification": "none" + "userVerificationMethod": "none" } ], [ diff --git a/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual RSA PKCS 1.5 SHA1 FIDO2 Conformance Testing CTAP2 Authenticator with TPM Attestation.json b/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual RSA PKCS 1.5 SHA1 FIDO2 Conformance Testing CTAP2 Authenticator with TPM Attestation.json index 13ab5b790..6bc6aeded 100644 --- a/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual RSA PKCS 1.5 SHA1 FIDO2 Conformance Testing CTAP2 Authenticator with TPM Attestation.json +++ b/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual RSA PKCS 1.5 SHA1 FIDO2 Conformance Testing CTAP2 Authenticator with TPM Attestation.json @@ -20,13 +20,13 @@ "cose" ], "attestationTypes": [ - "basic_full" + "attca" ], "schema": 3, "userVerificationDetails": [ [ { - "userVerification": "none" + "userVerificationMethod": "none" } ], [ diff --git a/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual RSA PKCS 1.5 SHA256 FIDO2 Conformance Testing CTAP2 Authenticator with SafetyNet attestation.json b/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual RSA PKCS 1.5 SHA256 FIDO2 Conformance Testing CTAP2 Authenticator with SafetyNet attestation.json index f993f7ce2..33c736071 100644 --- a/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual RSA PKCS 1.5 SHA256 FIDO2 Conformance Testing CTAP2 Authenticator with SafetyNet attestation.json +++ b/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual RSA PKCS 1.5 SHA256 FIDO2 Conformance Testing CTAP2 Authenticator with SafetyNet attestation.json @@ -28,7 +28,7 @@ "userVerificationDetails": [ [ { - "userVerification": "none" + "userVerificationMethod": "none" } ], [ diff --git a/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual RSA PKCS 1.5 SHA256 FIDO2 Conformance Testing CTAP2 Authenticator with TPM Attestation.json b/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual RSA PKCS 1.5 SHA256 FIDO2 Conformance Testing CTAP2 Authenticator with TPM Attestation.json index 8a22dff48..4699bb722 100644 --- a/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual RSA PKCS 1.5 SHA256 FIDO2 Conformance Testing CTAP2 Authenticator with TPM Attestation.json +++ b/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual RSA PKCS 1.5 SHA256 FIDO2 Conformance Testing CTAP2 Authenticator with TPM Attestation.json @@ -20,13 +20,13 @@ "cose" ], "attestationTypes": [ - "basic_full" + "attca" ], "schema": 3, "userVerificationDetails": [ [ { - "userVerification": "none" + "userVerificationMethod": "none" } ], [ @@ -69,7 +69,8 @@ ], "tcDisplay": [], "attestationRootCertificates": [ - "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" ], "icon": "data:image/png;base64,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", "supportedExtensions": [ diff --git a/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual RSAPSS SHA256 FIDO2 Conformance Testing CTAP2 Authenticator.json b/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual RSAPSS SHA256 FIDO2 Conformance Testing CTAP2 Authenticator.json index 42893e4f2..38e64b29c 100644 --- a/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual RSAPSS SHA256 FIDO2 Conformance Testing CTAP2 Authenticator.json +++ b/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual RSAPSS SHA256 FIDO2 Conformance Testing CTAP2 Authenticator.json @@ -20,13 +20,14 @@ "cose" ], "attestationTypes": [ - "basic_full" + "basic_full", + "basic_surrogate" ], "schema": 3, "userVerificationDetails": [ [ { - "userVerification": "none" + "userVerificationMethod": "none" } ], [ diff --git a/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual RSAPSS SHA384 FIDO2 Conformance Testing CTAP2 Authenticator.json b/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual RSAPSS SHA384 FIDO2 Conformance Testing CTAP2 Authenticator.json index 684a328b6..d2a70b774 100644 --- a/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual RSAPSS SHA384 FIDO2 Conformance Testing CTAP2 Authenticator.json +++ b/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual RSAPSS SHA384 FIDO2 Conformance Testing CTAP2 Authenticator.json @@ -20,13 +20,14 @@ "cose" ], "attestationTypes": [ - "basic_full" + "basic_full", + "basic_surrogate" ], "schema": 3, "userVerificationDetails": [ [ { - "userVerification": "none" + "userVerificationMethod": "none" } ], [ diff --git a/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual RSAPSS SHA512 FIDO2 Conformance Testing CTAP2 Authenticator.json b/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual RSAPSS SHA512 FIDO2 Conformance Testing CTAP2 Authenticator.json index 18265bdf2..0d4fb3d9a 100644 --- a/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual RSAPSS SHA512 FIDO2 Conformance Testing CTAP2 Authenticator.json +++ b/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual RSAPSS SHA512 FIDO2 Conformance Testing CTAP2 Authenticator.json @@ -20,13 +20,14 @@ "cose" ], "attestationTypes": [ - "basic_full" + "basic_full", + "basic_surrogate" ], "schema": 3, "userVerificationDetails": [ [ { - "userVerification": "none" + "userVerificationMethod": "none" } ], [ diff --git a/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual Secp256K1 FIDO2 Conformance Testing CTAP2 Authenticator.json b/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual Secp256K1 FIDO2 Conformance Testing CTAP2 Authenticator.json index 5726a7dea..bcd8cc6a4 100644 --- a/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual Secp256K1 FIDO2 Conformance Testing CTAP2 Authenticator.json +++ b/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual Secp256K1 FIDO2 Conformance Testing CTAP2 Authenticator.json @@ -26,7 +26,7 @@ "userVerificationDetails": [ [ { - "userVerification": "none" + "userVerificationMethod": "none" } ], [ diff --git a/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual Secp256R1 FIDO2 Conformance Testing CTAP2 Authenticator with Android Key Attestation.json b/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual Secp256R1 FIDO2 Conformance Testing CTAP2 Authenticator with Android Key Attestation.json index 68d9ac1c2..37da44cef 100644 --- a/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual Secp256R1 FIDO2 Conformance Testing CTAP2 Authenticator with Android Key Attestation.json +++ b/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual Secp256R1 FIDO2 Conformance Testing CTAP2 Authenticator with Android Key Attestation.json @@ -20,13 +20,13 @@ "cose" ], "attestationTypes": [ - "anonca" + "basic_full" ], "schema": 3, "userVerificationDetails": [ [ { - "userVerification": "none" + "userVerificationMethod": "none" } ], [ diff --git a/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual Secp256R1 FIDO2 Conformance Testing CTAP2 Authenticator with Apple Anonymous Attestation.json b/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual Secp256R1 FIDO2 Conformance Testing CTAP2 Authenticator with Apple Anonymous Attestation.json index c9cf443c0..f1607959d 100644 --- a/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual Secp256R1 FIDO2 Conformance Testing CTAP2 Authenticator with Apple Anonymous Attestation.json +++ b/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual Secp256R1 FIDO2 Conformance Testing CTAP2 Authenticator with Apple Anonymous Attestation.json @@ -26,7 +26,7 @@ "userVerificationDetails": [ [ { - "userVerification": "none" + "userVerificationMethod": "none" } ], [ diff --git a/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual Secp256R1 FIDO2 Conformance Testing CTAP2 Authenticator with Self Batch Referencing.json b/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual Secp256R1 FIDO2 Conformance Testing CTAP2 Authenticator with Self Batch Referencing.json index dd80d170d..774fccba4 100644 --- a/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual Secp256R1 FIDO2 Conformance Testing CTAP2 Authenticator with Self Batch Referencing.json +++ b/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual Secp256R1 FIDO2 Conformance Testing CTAP2 Authenticator with Self Batch Referencing.json @@ -26,7 +26,7 @@ "userVerificationDetails": [ [ { - "userVerification": "none" + "userVerificationMethod": "none" } ], [ diff --git a/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual Secp256R1 FIDO2 Conformance Testing CTAP2 Authenticator with Self(surrogate) attestation.json b/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual Secp256R1 FIDO2 Conformance Testing CTAP2 Authenticator with Self(surrogate) attestation.json index 83d3568cd..b7aea4c07 100644 --- a/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual Secp256R1 FIDO2 Conformance Testing CTAP2 Authenticator with Self(surrogate) attestation.json +++ b/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual Secp256R1 FIDO2 Conformance Testing CTAP2 Authenticator with Self(surrogate) attestation.json @@ -26,7 +26,7 @@ "userVerificationDetails": [ [ { - "userVerification": "none" + "userVerificationMethod": "none" } ], [ diff --git a/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual Secp256R1 FIDO2 Conformance Testing CTAP2 Authenticator with supported extensions.json b/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual Secp256R1 FIDO2 Conformance Testing CTAP2 Authenticator with supported extensions.json index 9b4b72e06..0f53a8e2b 100644 --- a/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual Secp256R1 FIDO2 Conformance Testing CTAP2 Authenticator with supported extensions.json +++ b/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual Secp256R1 FIDO2 Conformance Testing CTAP2 Authenticator with supported extensions.json @@ -26,7 +26,7 @@ "userVerificationDetails": [ [ { - "userVerification": "none" + "userVerificationMethod": "none" } ], [ diff --git a/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual Secp256R1 FIDO2 Conformance Testing CTAP2 Authenticator.json b/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual Secp256R1 FIDO2 Conformance Testing CTAP2 Authenticator.json index 50d509b82..578510f35 100644 --- a/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual Secp256R1 FIDO2 Conformance Testing CTAP2 Authenticator.json +++ b/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual Secp256R1 FIDO2 Conformance Testing CTAP2 Authenticator.json @@ -20,13 +20,14 @@ "cose" ], "attestationTypes": [ - "basic_full" + "basic_full", + "basic_surrogate" ], "schema": 3, "userVerificationDetails": [ [ { - "userVerification": "none" + "userVerificationMethod": "none" } ], [ diff --git a/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual Secp256R1 Multiple Root Certificates FIDO2 Conformance Testing CTAP2 Authenticator.json b/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual Secp256R1 Multiple Root Certificates FIDO2 Conformance Testing CTAP2 Authenticator.json index b437e1125..739027131 100644 --- a/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual Secp256R1 Multiple Root Certificates FIDO2 Conformance Testing CTAP2 Authenticator.json +++ b/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual Secp256R1 Multiple Root Certificates FIDO2 Conformance Testing CTAP2 Authenticator.json @@ -26,7 +26,7 @@ "userVerificationDetails": [ [ { - "userVerification": "none" + "userVerificationMethod": "none" } ], [ diff --git a/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual Secp384r1 SHA384 FIDO2 Conformance Testing CTAP2 Authenticator.json b/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual Secp384r1 SHA384 FIDO2 Conformance Testing CTAP2 Authenticator.json index 397bb6e1b..2a950976e 100644 --- a/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual Secp384r1 SHA384 FIDO2 Conformance Testing CTAP2 Authenticator.json +++ b/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual Secp384r1 SHA384 FIDO2 Conformance Testing CTAP2 Authenticator.json @@ -20,13 +20,14 @@ "cose" ], "attestationTypes": [ - "basic_full" + "basic_full", + "basic_surrogate" ], "schema": 3, "userVerificationDetails": [ [ { - "userVerification": "none" + "userVerificationMethod": "none" } ], [ diff --git a/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual Secp521r1 SHA512 FIDO2 Conformance Testing CTAP2 Authenticator.json b/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual Secp521r1 SHA512 FIDO2 Conformance Testing CTAP2 Authenticator.json index ea867d7df..84f11d909 100644 --- a/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual Secp521r1 SHA512 FIDO2 Conformance Testing CTAP2 Authenticator.json +++ b/samples/fido-server-conformance-test-app/src/main/resources/metadata/test-tools/Virtual Secp521r1 SHA512 FIDO2 Conformance Testing CTAP2 Authenticator.json @@ -14,19 +14,20 @@ } ], "authenticationAlgorithms": [ - "secp521r1_ecdsa_sha256_raw" + "secp521r1_ecdsa_sha512_raw" ], "publicKeyAlgAndEncodings": [ "cose" ], "attestationTypes": [ - "basic_full" + "basic_full", + "basic_surrogate" ], "schema": 3, "userVerificationDetails": [ [ { - "userVerification": "none" + "userVerificationMethod": "none" } ], [