From 1037a12c9c3f60bb7f743d6d77ff62a4e314190f Mon Sep 17 00:00:00 2001 From: Dongsun Lee Date: Tue, 19 Mar 2024 12:01:01 +0900 Subject: [PATCH] remove is_conditional_mediation_available from API Change-Id: I78addbf3907abbda9fa9b8006da498b1a75a3c1a --- include/webauthn-types.h | 2 -- tests/serialization-test.cpp | 15 ++++----------- tests/webauthn-client-test.cpp | 11 ++++------- 3 files changed, 8 insertions(+), 20 deletions(-) diff --git a/include/webauthn-types.h b/include/webauthn-types.h index c983dff..4cf32f1 100644 --- a/include/webauthn-types.h +++ b/include/webauthn-types.h @@ -473,7 +473,6 @@ typedef struct __wauthn_pubkey_credential_attestaion { wauthn_authenticator_attestation_response_s *response; wauthn_authenticator_attachment_e authenticator_attachment; wauthn_authentication_exts_s *extensions; - bool is_conditional_mediation_available; wauthn_const_buffer_s *json_data; wauthn_hybrid_linked_data_s *linked_device; } wauthn_pubkey_credential_attestaion_s; @@ -495,7 +494,6 @@ typedef struct __wauthn_pubkey_credential_assertion { wauthn_authenticator_assertion_response_s *response; wauthn_authenticator_attachment_e authenticator_attachment; wauthn_authentication_exts_s *extensions; - bool is_conditional_mediation_available; wauthn_const_buffer_s *json_data; wauthn_hybrid_linked_data_s *linked_device; } wauthn_pubkey_credential_assertion_s; diff --git a/tests/serialization-test.cpp b/tests/serialization-test.cpp index 7549b85..abfc515 100644 --- a/tests/serialization-test.cpp +++ b/tests/serialization-test.cpp @@ -173,18 +173,15 @@ namespace SerializationTestData { wauthn_pubkey_cred_request_options_s emptyPubkeyCredRequestOptions = {nullptr, 0, nullptr, nullptr, UVR_NONE, nullptr, AP_NONE, nullptr, nullptr, nullptr}; - bool is_conditional_mediation_available = false; wauthn_pubkey_credential_attestaion_s pubkeyCredentialAttestation = {&bufferId, pubkeyCredType, &bufferId0, - &authenticatorAttestationResponse, attachment, &authenticationExts2, is_conditional_mediation_available, - &buffer1, &hybirdLinkedData}; + &authenticatorAttestationResponse, attachment, &authenticationExts2, &buffer1, &hybirdLinkedData}; wauthn_pubkey_credential_attestaion_s emptyPubkeyCredentialAttestation = {nullptr, pubkeyCredType, nullptr, - nullptr, attachment, nullptr, is_conditional_mediation_available, nullptr, nullptr}; + nullptr, attachment, nullptr, nullptr, nullptr}; wauthn_pubkey_credential_assertion_s pubkeyCredentialAssertion = {&bufferId, pubkeyCredType, &bufferId0, - &authenticatorAssertionResponse, attachment, &authenticationExts2, is_conditional_mediation_available, - &buffer1, &hybirdLinkedData}; + &authenticatorAssertionResponse, attachment, &authenticationExts2, &buffer1, &hybirdLinkedData}; wauthn_pubkey_credential_assertion_s emptyPubkeyCredentialAssertion = {nullptr, pubkeyCredType, nullptr, - nullptr, attachment, nullptr, is_conditional_mediation_available, nullptr, nullptr}; + nullptr, attachment, nullptr, nullptr, nullptr}; wauthn_hash_algorithm_e hashAlg = WAUTHN_HASH_ALGORITHM_SHA_256; wauthn_client_data_s clientData = {&bufferId, hashAlg}; @@ -1145,8 +1142,6 @@ bool __compareWAuthnPubkeyCredentialAttestionS(const wauthn_pubkey_credential_at return false; if(__compareWAuthnAuthenticationExtsS(expected->extensions, actual->extensions) == false) return false; - if (expected->is_conditional_mediation_available != actual->is_conditional_mediation_available) - return false; if(__compareWAuthnBuffers(expected->json_data, actual->json_data) == false) return false; if(__compareWAuthnHybridLinkedDataS(expected->linked_device, actual->linked_device) == false) @@ -1207,8 +1202,6 @@ bool __compareWAuthnPubkeyCredentialAssertionS(const wauthn_pubkey_credential_as return false; if(__compareWAuthnAuthenticationExtsS(expected->extensions, actual->extensions) == false) return false; - if (expected->is_conditional_mediation_available != actual->is_conditional_mediation_available) - return false; if(__compareWAuthnBuffers(expected->json_data, actual->json_data) == false) return false; if(__compareWAuthnHybridLinkedDataS(expected->linked_device, actual->linked_device) == false) diff --git a/tests/webauthn-client-test.cpp b/tests/webauthn-client-test.cpp index 1382d44..5991a5e 100644 --- a/tests/webauthn-client-test.cpp +++ b/tests/webauthn-client-test.cpp @@ -182,18 +182,15 @@ namespace CommonTestData { wauthn_pubkey_cred_request_options_s emptyPubkeyCredRequestOptions = {nullptr, 0, nullptr, nullptr, UVR_NONE, nullptr, AP_NONE, nullptr, nullptr, nullptr}; - bool is_conditional_mediation_available = false; wauthn_pubkey_credential_attestaion_s pubkeyCredentialAttestation = {&bufferId, pubkeyCredType, &bufferId0, - &authenticatorAttestationResponse, attachment, &authenticationExts2, is_conditional_mediation_available, - &buffer1, &hybirdLinkedData}; + &authenticatorAttestationResponse, attachment, &authenticationExts2, &buffer1, &hybirdLinkedData}; wauthn_pubkey_credential_attestaion_s emptyPubkeyCredentialAttestation = {nullptr, pubkeyCredType, nullptr, - nullptr, attachment, nullptr, is_conditional_mediation_available, nullptr, nullptr}; + nullptr, attachment, nullptr, nullptr, nullptr}; wauthn_pubkey_credential_assertion_s pubkeyCredentialAssertion = {&bufferId, pubkeyCredType, &bufferId0, - &authenticatorAssertionResponse, attachment, &authenticationExts2, is_conditional_mediation_available, - &buffer1, &hybirdLinkedData}; + &authenticatorAssertionResponse, attachment, &authenticationExts2, &buffer1, &hybirdLinkedData}; wauthn_pubkey_credential_assertion_s emptyPubkeyCredentialAssertion = {nullptr, pubkeyCredType, nullptr, - nullptr, attachment, nullptr, is_conditional_mediation_available, nullptr, nullptr}; + nullptr, attachment, nullptr, nullptr, nullptr}; wauthn_hash_algorithm_e hashAlg = WAUTHN_HASH_ALGORITHM_SHA_256; wauthn_client_data_s clientData = {&bufferId, hashAlg}; -- 2.7.4