<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[285475] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/285475">285475</a></dd>
<dt>Author</dt> <dd>j_pascoe@apple.com</dd>
<dt>Date</dt> <dd>2021-11-08 17:37:58 -0800 (Mon, 08 Nov 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[WebAuthn] challenge does not get passed to -[_WKWebAuthenticationPanel getAssertionWithChallenge:origin:options:completionHandler:]
https://bugs.webkit.org/show_bug.cgi?id=232836
rdar://85163927

Reviewed by Brent Fulgham.

-[_WKWebAuthenticationPanel getAssertionWithChallenge:origin:options:completionHandler:] receives
Source/WebCore:

an empty challenge, causing _WKWebAuthenticationPanel to immediately close when using the new UNIFIED_ASC_AUTH_UI.

This change encodes/decodes challenge in PublicKeyCredentialRequestOptions. Before this
field was not used after xpc, but with the new UNIFIED_ASC_AUTH_UI it is.

* Modules/webauthn/PublicKeyCredentialCreationOptions.h:
(WebCore::PublicKeyCredentialCreationOptions::encode const):
(WebCore::PublicKeyCredentialCreationOptions::decode):
* Modules/webauthn/PublicKeyCredentialRequestOptions.h:
(WebCore::PublicKeyCredentialRequestOptions::encode const):
(WebCore::PublicKeyCredentialRequestOptions::decode):
Add new challengeVector field to both options structs and include it
in decoding / encoding.

Source/WebKit:

an empty challenge, causing _WKWebAuthenticationPanel to immediately close when using the new UNIFIED_ASC_AUTH_UI.

This change encodes/decodes challenge in PublicKeyCredentialRequestOptions.
Before this field was not used after xpc, but with the new UNIFIED_ASC_AUTH_UI it is.

* UIProcess/WebAuthentication/Cocoa/WebAuthenticatorCoordinatorProxy.mm:
(WebKit::configureRegistrationRequestContext):
(WebKit::configurationAssertionRequestContext):
Use challengeVector instead of challenge as it's available after being passed via xpc.

Tools:

an empty challenge, causing _WKWebAuthenticationPanel to immediately close when using the new UNIFIED_ASC_AUTH_UI.

This change encodes/decodes challenge in PublicKeyCredentialRequestOptions. Before this
field was not used after xpc, but with the new UNIFIED_ASC_AUTH_UI it is.
This change also adds an empty value for tests.

* TestWebKitAPI/Tests/WebCore/CtapRequestTest.cpp:
(TestWebKitAPI::TEST):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModuleswebauthnPublicKeyCredentialCreationOptionsh">trunk/Source/WebCore/Modules/webauthn/PublicKeyCredentialCreationOptions.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebauthnPublicKeyCredentialRequestOptionsh">trunk/Source/WebCore/Modules/webauthn/PublicKeyCredentialRequestOptions.h</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitUIProcessWebAuthenticationCocoaWebAuthenticatorCoordinatorProxymm">trunk/Source/WebKit/UIProcess/WebAuthentication/Cocoa/WebAuthenticatorCoordinatorProxy.mm</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebCoreCtapRequestTestcpp">trunk/Tools/TestWebKitAPI/Tests/WebCore/CtapRequestTest.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (285474 => 285475)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-11-09 01:29:21 UTC (rev 285474)
+++ trunk/Source/WebCore/ChangeLog      2021-11-09 01:37:58 UTC (rev 285475)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2021-11-08  J Pascoe  <j_pascoe@apple.com>
+
+        [WebAuthn] challenge does not get passed to -[_WKWebAuthenticationPanel getAssertionWithChallenge:origin:options:completionHandler:]
+        https://bugs.webkit.org/show_bug.cgi?id=232836
+        rdar://85163927
+
+        Reviewed by Brent Fulgham.
+
+        -[_WKWebAuthenticationPanel getAssertionWithChallenge:origin:options:completionHandler:] receives
+        an empty challenge, causing _WKWebAuthenticationPanel to immediately close when using the new UNIFIED_ASC_AUTH_UI.
+
+        This change encodes/decodes challenge in PublicKeyCredentialRequestOptions. Before this
+        field was not used after xpc, but with the new UNIFIED_ASC_AUTH_UI it is.
+
+        * Modules/webauthn/PublicKeyCredentialCreationOptions.h:
+        (WebCore::PublicKeyCredentialCreationOptions::encode const):
+        (WebCore::PublicKeyCredentialCreationOptions::decode):
+        * Modules/webauthn/PublicKeyCredentialRequestOptions.h:
+        (WebCore::PublicKeyCredentialRequestOptions::encode const):
+        (WebCore::PublicKeyCredentialRequestOptions::decode):
+        Add new challengeVector field to both options structs and include it
+        in decoding / encoding.
+
</ins><span class="cx"> 2021-11-08  Chris Dumez  <cdumez@apple.com>
</span><span class="cx"> 
</span><span class="cx">         REGRESSION (r283935): [ macOS wk1 ] imported/w3c/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-autofocus-multiple-times.html is a flaky failure
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebauthnPublicKeyCredentialCreationOptionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webauthn/PublicKeyCredentialCreationOptions.h (285474 => 285475)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webauthn/PublicKeyCredentialCreationOptions.h       2021-11-09 01:29:21 UTC (rev 285474)
+++ trunk/Source/WebCore/Modules/webauthn/PublicKeyCredentialCreationOptions.h  2021-11-09 01:37:58 UTC (rev 285475)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx">     RpEntity rp;
</span><span class="cx">     UserEntity user;
</span><span class="cx"> 
</span><del>-    BufferSource challenge;
</del><ins>+    BufferSource challenge; // challenge becomes challengeVector once it is passed to UIProcess.
</ins><span class="cx">     Vector<Parameters> pubKeyCredParams;
</span><span class="cx"> 
</span><span class="cx">     std::optional<unsigned> timeout;
</span><span class="lines">@@ -85,6 +85,8 @@
</span><span class="cx">     AttestationConveyancePreference attestation;
</span><span class="cx">     mutable std::optional<AuthenticationExtensionsClientInputs> extensions;
</span><span class="cx"> 
</span><ins>+    Vector<uint8_t> challengeVector;
+
</ins><span class="cx">     template<class Encoder> void encode(Encoder&) const;
</span><span class="cx">     template<class Decoder> static std::optional<PublicKeyCredentialCreationOptions> decode(Decoder&);
</span><span class="cx"> #endif // ENABLE(WEB_AUTHN)
</span><span class="lines">@@ -144,6 +146,8 @@
</span><span class="cx">     encoder << static_cast<uint64_t>(user.id.length());
</span><span class="cx">     encoder.encodeFixedLengthData(user.id.data(), user.id.length(), 1);
</span><span class="cx">     encoder << user.displayName << user.name << user.icon << pubKeyCredParams << timeout << excludeCredentials << authenticatorSelection << attestation << extensions;
</span><ins>+    encoder << static_cast<uint64_t>(challenge.length());
+    encoder.encodeFixedLengthData(challenge.data(), challenge.length(), 1);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> template<class Decoder>
</span><span class="lines">@@ -194,6 +198,9 @@
</span><span class="cx">         return std::nullopt;
</span><span class="cx">     result.extensions = WTFMove(*extensions);
</span><span class="cx"> 
</span><ins>+    if (!decoder.decode(result.challengeVector))
+        return std::nullopt;
+
</ins><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> #endif // ENABLE(WEB_AUTHN)
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebauthnPublicKeyCredentialRequestOptionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webauthn/PublicKeyCredentialRequestOptions.h (285474 => 285475)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webauthn/PublicKeyCredentialRequestOptions.h        2021-11-09 01:29:21 UTC (rev 285474)
+++ trunk/Source/WebCore/Modules/webauthn/PublicKeyCredentialRequestOptions.h   2021-11-09 01:37:58 UTC (rev 285475)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> 
</span><span class="cx"> struct PublicKeyCredentialRequestOptions {
</span><span class="cx"> #if ENABLE(WEB_AUTHN)
</span><del>-    BufferSource challenge;
</del><ins>+    BufferSource challenge; // challenge becomes challengeVector once it is passed to UIProcess.
</ins><span class="cx">     std::optional<unsigned> timeout;
</span><span class="cx">     mutable String rpId;
</span><span class="cx">     Vector<PublicKeyCredentialDescriptor> allowCredentials;
</span><span class="lines">@@ -46,6 +46,8 @@
</span><span class="cx">     std::optional<AuthenticatorAttachment> authenticatorAttachment;
</span><span class="cx">     mutable std::optional<AuthenticationExtensionsClientInputs> extensions;
</span><span class="cx"> 
</span><ins>+    Vector<uint8_t> challengeVector;
+
</ins><span class="cx">     template<class Encoder> void encode(Encoder&) const;
</span><span class="cx">     template<class Decoder> static std::optional<PublicKeyCredentialRequestOptions> decode(Decoder&);
</span><span class="cx"> #endif // ENABLE(WEB_AUTHN)
</span><span class="lines">@@ -57,6 +59,8 @@
</span><span class="cx"> void PublicKeyCredentialRequestOptions::encode(Encoder& encoder) const
</span><span class="cx"> {
</span><span class="cx">     encoder << timeout << rpId << allowCredentials << userVerification << extensions;
</span><ins>+    encoder << static_cast<uint64_t>(challenge.length());
+    encoder.encodeFixedLengthData(challenge.data(), challenge.length(), 1);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> template<class Decoder>
</span><span class="lines">@@ -87,6 +91,9 @@
</span><span class="cx">         return std::nullopt;
</span><span class="cx">     result.extensions = WTFMove(*extensions);
</span><span class="cx"> 
</span><ins>+    if (!decoder.decode(result.challengeVector))
+        return std::nullopt;
+
</ins><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> #endif // ENABLE(WEB_AUTHN)
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (285474 => 285475)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2021-11-09 01:29:21 UTC (rev 285474)
+++ trunk/Source/WebKit/ChangeLog       2021-11-09 01:37:58 UTC (rev 285475)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2021-11-08  J Pascoe  <j_pascoe@apple.com>
+
+        [WebAuthn] challenge does not get passed to -[_WKWebAuthenticationPanel getAssertionWithChallenge:origin:options:completionHandler:]
+        https://bugs.webkit.org/show_bug.cgi?id=232836
+        rdar://85163927
+
+        Reviewed by Brent Fulgham.
+
+        -[_WKWebAuthenticationPanel getAssertionWithChallenge:origin:options:completionHandler:] receives
+        an empty challenge, causing _WKWebAuthenticationPanel to immediately close when using the new UNIFIED_ASC_AUTH_UI.
+
+        This change encodes/decodes challenge in PublicKeyCredentialRequestOptions.
+        Before this field was not used after xpc, but with the new UNIFIED_ASC_AUTH_UI it is.
+
+        * UIProcess/WebAuthentication/Cocoa/WebAuthenticatorCoordinatorProxy.mm:
+        (WebKit::configureRegistrationRequestContext):
+        (WebKit::configurationAssertionRequestContext):
+        Use challengeVector instead of challenge as it's available after being passed via xpc.
+
</ins><span class="cx"> 2021-11-08  Devin Rousso  <drousso@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [Payment Request] Add a new payment method for showing AMS UI
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessWebAuthenticationCocoaWebAuthenticatorCoordinatorProxymm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/WebAuthentication/Cocoa/WebAuthenticatorCoordinatorProxy.mm (285474 => 285475)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/WebAuthentication/Cocoa/WebAuthenticatorCoordinatorProxy.mm        2021-11-09 01:29:21 UTC (rev 285474)
+++ trunk/Source/WebKit/UIProcess/WebAuthentication/Cocoa/WebAuthenticatorCoordinatorProxy.mm   2021-11-09 01:37:58 UTC (rev 285475)
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx"> 
</span><span class="cx">     auto credentialCreationOptions = adoptNS([allocASCPublicKeyCredentialCreationOptionsInstance() init]);
</span><span class="cx"> 
</span><del>-    [credentialCreationOptions setChallenge:toNSData(options.challenge).get()];
</del><ins>+    [credentialCreationOptions setChallenge:toNSData(options.challengeVector).get()];
</ins><span class="cx">     [credentialCreationOptions setRelyingPartyIdentifier:options.rp.id];
</span><span class="cx">     [credentialCreationOptions setUserName:options.user.name];
</span><span class="cx">     [credentialCreationOptions setUserIdentifier:toNSData(options.user.id).get()];
</span><span class="lines">@@ -236,7 +236,7 @@
</span><span class="cx">     auto requestContext = adoptNS([allocASCCredentialRequestContextInstance() initWithRequestTypes:requestTypes]);
</span><span class="cx">     [requestContext setRelyingPartyIdentifier:options.rpId];
</span><span class="cx"> 
</span><del>-    auto challenge = toNSData(options.challenge);
</del><ins>+    auto challenge = toNSData(options.challengeVector);
</ins><span class="cx"> 
</span><span class="cx">     if (requestTypes & ASCCredentialRequestTypePlatformPublicKeyAssertion)
</span><span class="cx">         [requestContext setPlatformKeyCredentialAssertionOptions:[allocASCPublicKeyCredentialAssertionOptionsInstance() initWithKind:ASCPublicKeyCredentialKindPlatform relyingPartyIdentifier:options.rpId challenge:challenge.get() userVerificationPreference:userVerification.get() allowedCredentials:allowedCredentials.get()]];
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (285474 => 285475)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2021-11-09 01:29:21 UTC (rev 285474)
+++ trunk/Tools/ChangeLog       2021-11-09 01:37:58 UTC (rev 285475)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2021-11-08  J Pascoe  <j_pascoe@apple.com>
+
+        [WebAuthn] challenge does not get passed to -[_WKWebAuthenticationPanel getAssertionWithChallenge:origin:options:completionHandler:]
+        https://bugs.webkit.org/show_bug.cgi?id=232836
+        rdar://85163927
+
+        Reviewed by Brent Fulgham.
+
+        -[_WKWebAuthenticationPanel getAssertionWithChallenge:origin:options:completionHandler:] receives
+        an empty challenge, causing _WKWebAuthenticationPanel to immediately close when using the new UNIFIED_ASC_AUTH_UI. 
+
+        This change encodes/decodes challenge in PublicKeyCredentialRequestOptions. Before this
+        field was not used after xpc, but with the new UNIFIED_ASC_AUTH_UI it is.
+        This change also adds an empty value for tests.
+
+        * TestWebKitAPI/Tests/WebCore/CtapRequestTest.cpp:
+        (TestWebKitAPI::TEST):
+
</ins><span class="cx"> 2021-11-08  Alex Christensen  <achristensen@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         Parse redirect and modify-headers actions for WKContentRuleList
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCoreCtapRequestTestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/CtapRequestTest.cpp (285474 => 285475)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebCore/CtapRequestTest.cpp      2021-11-09 01:29:21 UTC (rev 285474)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/CtapRequestTest.cpp 2021-11-09 01:37:58 UTC (rev 285475)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx">     Vector<PublicKeyCredentialCreationOptions::Parameters> params { { PublicKeyCredentialType::PublicKey, 7 }, { PublicKeyCredentialType::PublicKey, 257 } };
</span><span class="cx">     PublicKeyCredentialCreationOptions::AuthenticatorSelectionCriteria selection { AuthenticatorAttachment::Platform, true, UserVerificationRequirement::Preferred };
</span><span class="cx"> 
</span><del>-    PublicKeyCredentialCreationOptions options { rp, user, { }, params, std::nullopt, { }, selection, AttestationConveyancePreference::None, std::nullopt };
</del><ins>+    PublicKeyCredentialCreationOptions options { rp, user, { }, params, std::nullopt, { }, selection, AttestationConveyancePreference::None, std::nullopt, { } };
</ins><span class="cx">     Vector<uint8_t> hash;
</span><span class="cx">     hash.append(TestData::kClientDataHash, sizeof(TestData::kClientDataHash));
</span><span class="cx">     auto serializedData = encodeMakeCredenitalRequestAsCBOR(hash, options, AuthenticatorSupportedOptions::UserVerificationAvailability::kSupportedAndConfigured);
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx">     Vector<PublicKeyCredentialCreationOptions::Parameters> params { { PublicKeyCredentialType::PublicKey, 7 }, { PublicKeyCredentialType::PublicKey, 257 } };
</span><span class="cx">     PublicKeyCredentialCreationOptions::AuthenticatorSelectionCriteria selection { AuthenticatorAttachment::Platform, false, UserVerificationRequirement::Discouraged };
</span><span class="cx"> 
</span><del>-    PublicKeyCredentialCreationOptions options { rp, user, { }, params, std::nullopt, { }, selection, AttestationConveyancePreference::None, std::nullopt };
</del><ins>+    PublicKeyCredentialCreationOptions options { rp, user, { }, params, std::nullopt, { }, selection, AttestationConveyancePreference::None, std::nullopt, { } };
</ins><span class="cx">     Vector<uint8_t> hash;
</span><span class="cx">     hash.append(TestData::kClientDataHash, sizeof(TestData::kClientDataHash));
</span><span class="cx">     auto serializedData = encodeMakeCredenitalRequestAsCBOR(hash, options, AuthenticatorSupportedOptions::UserVerificationAvailability::kSupportedAndConfigured);
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx">     Vector<PublicKeyCredentialCreationOptions::Parameters> params { { PublicKeyCredentialType::PublicKey, 7 }, { PublicKeyCredentialType::PublicKey, 257 } };
</span><span class="cx">     PublicKeyCredentialCreationOptions::AuthenticatorSelectionCriteria selection { AuthenticatorAttachment::Platform, false, UserVerificationRequirement::Required };
</span><span class="cx"> 
</span><del>-    PublicKeyCredentialCreationOptions options { rp, user, { }, params, std::nullopt, { }, selection, AttestationConveyancePreference::None, std::nullopt };
</del><ins>+    PublicKeyCredentialCreationOptions options { rp, user, { }, params, std::nullopt, { }, selection, AttestationConveyancePreference::None, std::nullopt, { } };
</ins><span class="cx">     Vector<uint8_t> hash;
</span><span class="cx">     hash.append(TestData::kClientDataHash, sizeof(TestData::kClientDataHash));
</span><span class="cx">     auto serializedData = encodeMakeCredenitalRequestAsCBOR(hash, options, AuthenticatorSupportedOptions::UserVerificationAvailability::kNotSupported);
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx">     pin.protocol = pin::kProtocolVersion;
</span><span class="cx">     pin.auth.append(TestData::kCtap2PinAuth, sizeof(TestData::kCtap2PinAuth));
</span><span class="cx"> 
</span><del>-    PublicKeyCredentialCreationOptions options { rp, user, { }, params, std::nullopt, { }, selection, AttestationConveyancePreference::None, std::nullopt };
</del><ins>+    PublicKeyCredentialCreationOptions options { rp, user, { }, params, std::nullopt, { }, selection, AttestationConveyancePreference::None, std::nullopt, { } };
</ins><span class="cx">     Vector<uint8_t> hash;
</span><span class="cx">     hash.append(TestData::kClientDataHash, sizeof(TestData::kClientDataHash));
</span><span class="cx">     auto serializedData = encodeMakeCredenitalRequestAsCBOR(hash, options, AuthenticatorSupportedOptions::UserVerificationAvailability::kSupportedAndConfigured, pin);
</span></span></pre>
</div>
</div>

</body>
</html>