W3C home > Mailing lists > Public > public-webauthn@w3.org > August 2022

[webauthn] Pull Request: Fix merge conflicts in PR #1658

From: Emil Lundberg via GitHub <sysbot+gh@w3.org>
Date: Mon, 01 Aug 2022 13:42:04 +0000
To: public-webauthn@w3.org
Message-ID: <pull_request.opened-1013894933-1659361321-sysbot+gh@w3.org>
emlun has just submitted a new pull request for https://github.com/w3c/webauthn:

== Fix merge conflicts in PR #1658 ==
This would merge into PR #1658, not the main branch.

In writing https://github.com/w3c/webauthn/pull/1663#pullrequestreview-1057229775 I had already done most of the work of working out what the merge conflicts are and how to resolve them, so I figured I might as well submit a pull request.

Summary of changes:

- Move affected steps from [§5.1.4. Use an Existing Credential to Make an Assertion](https://pr-preview.s3.amazonaws.com/w3c/webauthn/pull/1663.html#sctn-getAssertion) to the new [§5.1.4.2. Issuing a Credential Request to an Authenticator](https://w3c.github.io/webauthn/#sctn-issuing-cred-request-to-authenticator) section (see #1576)

  Where to see this change: [diff from main to this PR](https://github.com/w3c/webauthn/compare/f9036060b6f7d84f9d9fec58471f2c6fbf12e64e..832c2e880c6040034d8594223614ccdc2c4ff7e1#diff-5e793325cd2bfc452e268a4aa2f02b4024dd9584bd1db3c2595f61f1ecf7b985L2512-L2527)

- Add steps for computing `|enterpriseAttestationPossible|` and `|attestationFormats|` to [§5.1.4.2. Issuing a Credential Request to an Authenticator](https://w3c.github.io/webauthn/#sctn-issuing-cred-request-to-authenticator)

  Where to see this change: [diff from main to this PR](https://github.com/w3c/webauthn/compare/f9036060b6f7d84f9d9fec58471f2c6fbf12e64e..832c2e880c6040034d8594223614ccdc2c4ff7e1#diff-5e793325cd2bfc452e268a4aa2f02b4024dd9584bd1db3c2595f61f1ecf7b985R2508)

- Fix heading level of `devicePubKey` section (parallel of #1781)

  Where to see this change: [diff from PR #1658 to this PR](https://github.com/w3c/webauthn/compare/6fbfccf747a2af0e6893fa9abe7435310f2f2938..832c2e880c6040034d8594223614ccdc2c4ff7e1#diff-5e793325cd2bfc452e268a4aa2f02b4024dd9584bd1db3c2595f61f1ecf7b985R6744)

See https://github.com/w3c/webauthn/pull/1787


-- 
Sent via github-notify-ml as configured in https://github.com/w3c/github-notify-ml-config
Received on Monday, 1 August 2022 13:42:06 UTC

This archive was generated by hypermail 2.4.0 : Monday, 1 August 2022 13:42:07 UTC