Skip to content

Commit

Permalink
Merge branch 'master' into jeffh-redraw-fig3
Browse files Browse the repository at this point in the history
  • Loading branch information
JeffH authored and JeffH committed May 12, 2017
2 parents 87f5b0b + 177f1ec commit ae44843
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ This is the repository for the W3C WebAuthn Working Group, producing the draft *

# Contributing

To materially contribute to this specification, you must meet the requiements outlined in [CONTRIBUTING.md](/CONTRIBUTING.md). Also, before submitting feedback, please familiarize yourself with [our current issues list](https://github.com/w3c/webauthn/issues) and review the [mailing list discussion](https://lists.w3.org/Archives/Public/public-webauthn/).
To materially contribute to this specification, you must meet the requirements outlined in [CONTRIBUTING.md](/CONTRIBUTING.md). Also, before submitting feedback, please familiarize yourself with [our current issues list](https://github.com/w3c/webauthn/issues) and review the [mailing list discussion](https://lists.w3.org/Archives/Public/public-webauthn/).

# Building the Draft

Expand Down
4 changes: 2 additions & 2 deletions index.bs
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ spec: WebCryptoAPI; urlPrefix: https://www.w3.org/TR/WebCryptoAPI/
text: normalizing an algorithm; url: dfn-normalize-an-algorithm
text: recognized algorithm name
type: dictionary
text: AlgorithmIdentifier; url: dfn-AlgorithmIdentifierS
text: AlgorithmIdentifier; url: dfn-AlgorithmIdentifier

<!-- Remove these once Shepherd picks up the changes -->
spec: CREDENTIAL-MANAGEMENT-1; urlPrefix: https://w3c.github.io/webappsec-credential-management/
Expand Down Expand Up @@ -2245,7 +2245,7 @@ been used for the attestation=] is consistent with the fields of the attestation

Concatenate |authenticatorData| and |clientDataHash| to form |attToBeSigned|.

Request a Android Key Attestation by calling "keyStore.getCertificateChain(myKeyUUID)") providing |attToBeSigned| as the
Request an Android Key Attestation by calling "keyStore.getCertificateChain(myKeyUUID)") providing |attToBeSigned| as the
challenge value (e.g., by using
<a href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.Builder.html#setAttestationChallenge(byte%5B%5D)">
setAttestationChallenge</a>),
Expand Down

0 comments on commit ae44843

Please sign in to comment.