Skip to content

Commit 0a30219

Browse files
mikewestmikewest
committed
CSP: Fix links (changes SHA2 to FIPS 180)
1 parent 5db9b16 commit 0a30219

File tree

5 files changed

+37
-44
lines changed

5 files changed

+37
-44
lines changed

‎specs/CSP2/index.html

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
<h1 class="p-name no-ref" id="title">Content Security Policy Level 2</h1>
112112

113113
<h2 class="no-num no-toc no-ref heading settled" id="subtitle"><span class="content">Editor’s Draft,
114-
<time class="dt-updated" datetime="2015-07-01">1 July 2015</time></span></h2>
114+
<time class="dt-updated" datetime="2015-07-20">20 July 2015</time></span></h2>
115115

116116
<div data-fill-with="spec-metadata">
117117
<dl>
@@ -740,7 +740,7 @@ <h3 class="heading settled" data-level="2.2" id="terms-defined-by-reference"><sp
740740

741741

742742
<dd>
743-
These digest algorithms are defined by the NIST. <a data-link-type="biblio" href="#biblio-sha2">[SHA2]</a>
743+
These digest algorithms are defined by the NIST. <a data-link-type="biblio" href="#biblio-fips180">[FIPS180]</a>
744744

745745

746746

@@ -816,15 +816,9 @@ <h2 class="heading settled" data-level="3" id="policy-delivery"><span class="sec
816816

817817

818818
<p>The server delivers a <a data-link-type="dfn" href="#security-policy">policy</a> to the user agent via an HTTP response
819-
header (defined in <a href="#content-security-policy-header-field">§3.1
820-
Content-Security-Policy Header Field
821-
</a> and
822-
<a href="#content-security-policy-report-only-header-field">§3.2
823-
Content-Security-Policy-Report-Only Header Field
824-
</a>) or an HTML
825-
<code><a data-link-type="element" href="http://www.w3.org/TR/html5/document-metadata.html#the-meta-element">meta</a></code> element (defined in <a href="#delivery-html-meta-element">§3.3
826-
HTML meta Element
827-
</a>).</p>
819+
header (defined in <a href="#content-security-policy-header-field">§3.1 Content-Security-Policy Header Field</a> and
820+
<a href="#content-security-policy-report-only-header-field">§3.2 Content-Security-Policy-Report-Only Header Field</a>) or an HTML
821+
<code><a data-link-type="element" href="http://www.w3.org/TR/html5/document-metadata.html#the-meta-element">meta</a></code> element (defined in <a href="#delivery-html-meta-element">§3.3 HTML meta Element</a>).</p>
828822

829823

830824
<p>Servers are informed that requests are coming from a <a data-link-type="dfn" href="#protected-resource">protected resource</a>
@@ -1279,7 +1273,7 @@ <h3 class="heading settled" data-level="3.6" id="which-policy-applies"><span cla
12791273

12801274

12811275

1282-
<td>SVG, inlined via <code><a data-link-type="element" href="http://www.w3.org/TR/html5/http://www.w3.org/TR/SVG2/struct.html#SVGElement">svg</a></code>
1276+
<td>SVG, inlined via <code><a data-link-type="element" href="http://www.w3.org/TR/SVG2/struct.html#SVGElement">svg</a></code>
12831277

12841278

12851279
<td>Policy of the including context
@@ -5664,6 +5658,8 @@ <h3 class="no-num heading settled" id="normative"><span class="content">Normativ
56645658
<dd>Jatinder Mann; Alois Reitbauer. <a href="http://www.w3.org/TR/beacon/">Beacon</a>. WD. URL: <a href="http://www.w3.org/TR/beacon/">http://www.w3.org/TR/beacon/</a>
56655659
<dt id="biblio-ecma-262"><a class="self-link" href="#biblio-ecma-262"></a>[ECMA-262]
56665660
<dd>Allen Wirfs-Brock. <a href="http://www.ecma-international.org/ecma-262/6.0/">ECMA-262 6th Edition, The ECMAScript 2015 Language Specification</a>. June 2015. Standard. URL: <a href="http://www.ecma-international.org/ecma-262/6.0/">http://www.ecma-international.org/ecma-262/6.0/</a>
5661+
<dt id="biblio-fips180"><a class="self-link" href="#biblio-fips180"></a>[FIPS180]
5662+
<dd><a href="http://csrc.nist.gov/publications/fips/fips180-4/fips-180-4.pdf">Secure Hash Standard</a>. URL: <a href="http://csrc.nist.gov/publications/fips/fips180-4/fips-180-4.pdf">http://csrc.nist.gov/publications/fips/fips180-4/fips-180-4.pdf</a>
56675663
<dt id="biblio-html-imports"><a class="self-link" href="#biblio-html-imports"></a>[HTML-IMPORTS]
56685664
<dd>Dmitri Glazkov; Hajime Morrita. <a href="http://www.w3.org/TR/html-imports/">HTML Imports</a>. WD. URL: <a href="http://www.w3.org/TR/html-imports/">http://www.w3.org/TR/html-imports/</a>
56695665
<dt id="biblio-rfc3492"><a class="self-link" href="#biblio-rfc3492"></a>[RFC3492]
@@ -5680,8 +5676,6 @@ <h3 class="no-num heading settled" id="normative"><span class="content">Normativ
56805676
<dd>Roy T. Fielding; Julian F. Reschke. <a href="http://www.ietf.org/rfc/rfc7230.txt">HTTP/1.1 Message Syntax and Routing</a>. RFC. URL: <a href="http://www.ietf.org/rfc/rfc7230.txt">http://www.ietf.org/rfc/rfc7230.txt</a>
56815677
<dt id="biblio-rfc7231"><a class="self-link" href="#biblio-rfc7231"></a>[RFC7231]
56825678
<dd>Roy T. Fielding; Julian F. Reschke. <a href="http://www.ietf.org/rfc/rfc7231.txt">HTTP/1.1 Semantics and Content</a>. RFC. URL: <a href="http://www.ietf.org/rfc/rfc7231.txt">http://www.ietf.org/rfc/rfc7231.txt</a>
5683-
<dt id="biblio-sha2"><a class="self-link" href="#biblio-sha2"></a>[SHA2]
5684-
<dd><a href="http://csrc.nist.gov/groups/STM/cavp/documents/shs/sha256-384-512.pdf">Descriptions of SHA-256, SHA-384, and SHA-512</a>. URL: <a href="http://csrc.nist.gov/groups/STM/cavp/documents/shs/sha256-384-512.pdf">http://csrc.nist.gov/groups/STM/cavp/documents/shs/sha256-384-512.pdf</a>
56855679
<dt id="biblio-url"><a class="self-link" href="#biblio-url"></a>[URL]
56865680
<dd>Anne van Kesteren; Sam Ruby. <a href="http://www.w3.org/TR/url/">URL</a>. WD. URL: <a href="http://www.w3.org/TR/url/">http://www.w3.org/TR/url/</a>
56875681
<dt id="biblio-webidl"><a class="self-link" href="#biblio-webidl"></a>[WebIDL]

‎specs/CSP2/index.src.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ <h1>Content Security Policy Level 2</h1>
133133
urlPrefix: obsolete.html
134134
text: applet; url: the-applet-element
135135
text: frame
136-
urlPrefix: http://www.w3.org/TR/SVG2/struct.html
137-
text: svg; url: SVGElement
136+
urlPrefix: http://www.w3.org/TR/SVG2/struct.html
137+
text: svg; url: SVGElement
138138
type: element-attr
139139
urlPrefix: http://www.w3.org/TR/html5/
140140
urlPrefix: document-metadata.html
@@ -464,7 +464,7 @@ <h3 id="terms-defined-by-reference">Terms defined by reference</h3>
464464
<dt><dfn>SHA-384</dfn></dt>
465465
<dt><dfn>SHA-512</dfn></dt>
466466
<dd>
467-
These digest algorithms are defined by the NIST. [[!SHA2]]
467+
These digest algorithms are defined by the NIST. [[!FIPS180]]
468468
</dd>
469469
</dl>
470470

‎specs/biblio.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,9 @@
135135
"status": "WD",
136136
"publisher": "W3C"
137137
},
138-
"SHA2": {
139-
"href": "http://csrc.nist.gov/groups/STM/cavp/documents/shs/sha256-384-512.pdf",
140-
"title": "Descriptions of SHA-256, SHA-384, and SHA-512",
138+
"FIPS180": {
139+
"href": "http://csrc.nist.gov/publications/fips/fips180-4/fips-180-4.pdf",
140+
"title": "Secure Hash Standard",
141141
"publisher": "NIST"
142142
},
143143
"STOCK": {

‎specs/content-security-policy/index.html

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
<h1 class="p-name no-ref" id="title">Content Security Policy</h1>
112112

113113
<h2 class="no-num no-toc no-ref heading settled" id="subtitle"><span class="content">Editor’s Draft,
114-
<time class="dt-updated" datetime="2015-07-01">1 July 2015</time></span></h2>
114+
<time class="dt-updated" datetime="2015-07-20">20 July 2015</time></span></h2>
115115

116116
<div data-fill-with="spec-metadata">
117117
<dl>
@@ -701,15 +701,9 @@ <h2 class="heading settled" data-level="3" id="policy-delivery"><span class="sec
701701

702702

703703
<p>The server delivers a <a data-link-type="dfn" href="#security-policy">policy</a> to the user agent via an HTTP response
704-
header (defined in <a href="#content-security-policy-header-field">§3.1
705-
Content-Security-Policy Header Field
706-
</a> and
707-
<a href="#content-security-policy-report-only-header-field">§3.2
708-
Content-Security-Policy-Report-Only Header Field
709-
</a>) or an HTML
710-
<code><a data-link-type="element" href="http://www.w3.org/TR/html5/document-metadata.html#the-meta-element">meta</a></code> element (defined in <a href="#delivery-html-meta-element">§3.3
711-
HTML meta Element
712-
</a>).</p>
704+
header (defined in <a href="#content-security-policy-header-field">§3.1 Content-Security-Policy Header Field</a> and
705+
<a href="#content-security-policy-report-only-header-field">§3.2 Content-Security-Policy-Report-Only Header Field</a>) or an HTML
706+
<code><a data-link-type="element" href="http://www.w3.org/TR/html5/document-metadata.html#the-meta-element">meta</a></code> element (defined in <a href="#delivery-html-meta-element">§3.3 HTML meta Element</a>).</p>
713707

714708

715709
<p>Servers are informed that requests are coming from a <a data-link-type="dfn" href="#protected-resource">protected resource</a>
@@ -1165,7 +1159,7 @@ <h3 class="heading settled" data-level="3.6" id="which-policy-applies"><span cla
11651159

11661160

11671161

1168-
<td>SVG, inlined via <code><a data-link-type="element" href="http://www.w3.org/TR/html5/http://www.w3.org/TR/SVG2/struct.html#SVGElement">svg</a></code>
1162+
<td>SVG, inlined via <code><a data-link-type="element" href="http://www.w3.org/TR/SVG2/struct.html#SVGElement">svg</a></code>
11691163

11701164

11711165
<td>Policy of the including context
@@ -2088,19 +2082,19 @@ <h4 class="heading settled" data-level="4.2.5" id="source-list-valid-hashes"><sp
20882082

20892083
<ul>
20902084

2091-
<li><a data-link-type="dfn" href="http://csrc.nist.gov/groups/STM/cavp/documents/shs/sha256-384-512.pdf#sha_256">SHA-256</a> if the <code><a data-link-type="dfn" href="#hash_algo">hash-algo</a></code>
2085+
<li><a data-link-type="dfn" href="http://csrc.nist.gov/publications/fips/fips180-4/fips-180-4.pdf#sha_256">SHA-256</a> if the <code><a data-link-type="dfn" href="#hash_algo">hash-algo</a></code>
20922086
component of <var>hash</var> is an <a data-link-type="dfn" href="http://www.w3.org/TR/html5/infrastructure.html#ascii-case-insensitive">ASCII case-insensitive
20932087
match</a> for the string "sha256"
20942088

20952089

20962090

2097-
<li><a data-link-type="dfn" href="http://csrc.nist.gov/groups/STM/cavp/documents/shs/sha256-384-512.pdf#sha_384">SHA-384</a> if the <code><a data-link-type="dfn" href="#hash_algo">hash-algo</a></code>
2091+
<li><a data-link-type="dfn" href="http://csrc.nist.gov/publications/fips/fips180-4/fips-180-4.pdf#sha_384">SHA-384</a> if the <code><a data-link-type="dfn" href="#hash_algo">hash-algo</a></code>
20982092
component of <var>hash</var> is an <a data-link-type="dfn" href="http://www.w3.org/TR/html5/infrastructure.html#ascii-case-insensitive">ASCII case-insensitive
20992093
match</a> for the string "sha384"
21002094

21012095

21022096

2103-
<li><a data-link-type="dfn" href="http://csrc.nist.gov/groups/STM/cavp/documents/shs/sha256-384-512.pdf#sha_512">SHA-512</a> if the <code><a data-link-type="dfn" href="#hash_algo">hash-algo</a></code>
2097+
<li><a data-link-type="dfn" href="http://csrc.nist.gov/publications/fips/fips180-4/fips-180-4.pdf#sha_512">SHA-512</a> if the <code><a data-link-type="dfn" href="#hash_algo">hash-algo</a></code>
21042098
component of <var>hash</var> is an <a data-link-type="dfn" href="http://www.w3.org/TR/html5/infrastructure.html#ascii-case-insensitive">ASCII case-insensitive
21052099
match</a> for the string "sha512"
21062100

@@ -5873,6 +5867,12 @@ <h3 class="no-num heading settled" id="index-defined-elsewhere"><span class="con
58735867
<ul>
58745868
<li><a href="https://fetch.spec.whatwg.org/#request">Request</a>
58755869
</ul>
5870+
<li><a data-link-type="biblio" href="#biblio-fips180">[FIPS180]</a> defines the following terms:
5871+
<ul>
5872+
<li><a href="http://csrc.nist.gov/publications/fips/fips180-4/fips-180-4.pdf#sha_256">sha-256</a>
5873+
<li><a href="http://csrc.nist.gov/publications/fips/fips180-4/fips-180-4.pdf#sha_384">sha-384</a>
5874+
<li><a href="http://csrc.nist.gov/publications/fips/fips180-4/fips-180-4.pdf#sha_512">sha-512</a>
5875+
</ul>
58765876
<li><a data-link-type="biblio" href="#biblio-html5">[html5]</a> defines the following terms:
58775877
<ul>
58785878
<li><a href="http://www.w3.org/TR/html5/scripting-1.html#htmlscriptelement">HTMLScriptElement</a>
@@ -5943,7 +5943,6 @@ <h3 class="no-num heading settled" id="index-defined-elsewhere"><span class="con
59435943
<li><a href="http://www.w3.org/TR/html5/infrastructure.html#strictly-split-a-string">strictly split a string</a>
59445944
<li><a href="http://www.w3.org/TR/html5/infrastructure.html#strip-leading-and-trailing-whitespace">strip leading and trailing whitespace</a>
59455945
<li><a href="http://www.w3.org/TR/html5/document-metadata.html#the-style-element">style</a>
5946-
<li><a href="http://www.w3.org/TR/html5/http://www.w3.org/TR/SVG2/struct.html#SVGElement">svg</a>
59475946
<li><a href="http://www.w3.org/TR/html5/webappapis.html#task-source">task source</a>
59485947
<li><a href="http://www.w3.org/TR/html5/webappapis.html#concept-task">tasks</a>
59495948
<li><a href="http://www.w3.org/TR/html5/dom.html#the-documents-address">the document's address</a>
@@ -5984,11 +5983,9 @@ <h3 class="no-num heading settled" id="index-defined-elsewhere"><span class="con
59845983
<li><a href="https://tools.ietf.org/html/rfc7231#section-3">representations</a>
59855984
<li><a href="https://tools.ietf.org/html/rfc7231#section-3">resource representation</a>
59865985
</ul>
5987-
<li><a data-link-type="biblio" href="#biblio-sha2">[SHA2]</a> defines the following terms:
5986+
<li><a data-link-type="biblio" href="#biblio-svg2">[SVG2]</a> defines the following terms:
59885987
<ul>
5989-
<li><a href="http://csrc.nist.gov/groups/STM/cavp/documents/shs/sha256-384-512.pdf#sha_256">sha-256</a>
5990-
<li><a href="http://csrc.nist.gov/groups/STM/cavp/documents/shs/sha256-384-512.pdf#sha_384">sha-384</a>
5991-
<li><a href="http://csrc.nist.gov/groups/STM/cavp/documents/shs/sha256-384-512.pdf#sha_512">sha-512</a>
5988+
<li><a href="http://www.w3.org/TR/SVG2/struct.html#SVGElement">svg</a>
59925989
</ul>
59935990
<li><a data-link-type="biblio" href="#biblio-url">[URL]</a> defines the following terms:
59945991
<ul>
@@ -6037,6 +6034,8 @@ <h3 class="no-num heading settled" id="normative"><span class="content">Normativ
60376034
<dd>Allen Wirfs-Brock. <a href="http://www.ecma-international.org/ecma-262/6.0/">ECMA-262 6th Edition, The ECMAScript 2015 Language Specification</a>. June 2015. Standard. URL: <a href="http://www.ecma-international.org/ecma-262/6.0/">http://www.ecma-international.org/ecma-262/6.0/</a>
60386035
<dt id="biblio-fetch"><a class="self-link" href="#biblio-fetch"></a>[FETCH]
60396036
<dd>Anne van Kesteren. <a href="https://fetch.spec.whatwg.org/">Fetch</a>. Living Standard. URL: <a href="https://fetch.spec.whatwg.org/">https://fetch.spec.whatwg.org/</a>
6037+
<dt id="biblio-fips180"><a class="self-link" href="#biblio-fips180"></a>[FIPS180]
6038+
<dd><a href="http://csrc.nist.gov/publications/fips/fips180-4/fips-180-4.pdf">Secure Hash Standard</a>. URL: <a href="http://csrc.nist.gov/publications/fips/fips180-4/fips-180-4.pdf">http://csrc.nist.gov/publications/fips/fips180-4/fips-180-4.pdf</a>
60406039
<dt id="biblio-html-imports"><a class="self-link" href="#biblio-html-imports"></a>[HTML-IMPORTS]
60416040
<dd>Dmitri Glazkov; Hajime Morrita. <a href="http://www.w3.org/TR/html-imports/">HTML Imports</a>. WD. URL: <a href="http://www.w3.org/TR/html-imports/">http://www.w3.org/TR/html-imports/</a>
60426041
<dt id="biblio-manifest"><a class="self-link" href="#biblio-manifest"></a>[MANIFEST]
@@ -6053,8 +6052,8 @@ <h3 class="no-num heading settled" id="normative"><span class="content">Normativ
60536052
<dd>Roy T. Fielding; Julian F. Reschke. <a href="http://www.ietf.org/rfc/rfc7230.txt">HTTP/1.1 Message Syntax and Routing</a>. RFC. URL: <a href="http://www.ietf.org/rfc/rfc7230.txt">http://www.ietf.org/rfc/rfc7230.txt</a>
60546053
<dt id="biblio-rfc7231"><a class="self-link" href="#biblio-rfc7231"></a>[RFC7231]
60556054
<dd>Roy T. Fielding; Julian F. Reschke. <a href="http://www.ietf.org/rfc/rfc7231.txt">HTTP/1.1 Semantics and Content</a>. RFC. URL: <a href="http://www.ietf.org/rfc/rfc7231.txt">http://www.ietf.org/rfc/rfc7231.txt</a>
6056-
<dt id="biblio-sha2"><a class="self-link" href="#biblio-sha2"></a>[SHA2]
6057-
<dd><a href="http://csrc.nist.gov/groups/STM/cavp/documents/shs/sha256-384-512.pdf">Descriptions of SHA-256, SHA-384, and SHA-512</a>. URL: <a href="http://csrc.nist.gov/groups/STM/cavp/documents/shs/sha256-384-512.pdf">http://csrc.nist.gov/groups/STM/cavp/documents/shs/sha256-384-512.pdf</a>
6055+
<dt id="biblio-svg2"><a class="self-link" href="#biblio-svg2"></a>[SVG2]
6056+
<dd>Nikos Andronikos; et al. <a href="http://www.w3.org/TR/SVG2/">Scalable Vector Graphics (SVG) 2</a>. 9 April 2015. WD. URL: <a href="http://www.w3.org/TR/SVG2/">http://www.w3.org/TR/SVG2/</a>
60586057
<dt id="biblio-url"><a class="self-link" href="#biblio-url"></a>[URL]
60596058
<dd>Anne van Kesteren; Sam Ruby. <a href="http://www.w3.org/TR/url/">URL</a>. WD. URL: <a href="http://www.w3.org/TR/url/">http://www.w3.org/TR/url/</a>
60606059
<dt id="biblio-webidl"><a class="self-link" href="#biblio-webidl"></a>[WEBIDL]

‎specs/content-security-policy/index.src.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ <h1>Content Security Policy</h1>
133133
urlPrefix: obsolete.html
134134
text: applet; url: the-applet-element
135135
text: frame
136-
urlPrefix: http://www.w3.org/TR/SVG2/struct.html; spec: SVG2
137-
text: svg; url: SVGElement
136+
urlPrefix: http://www.w3.org/TR/SVG2/struct.html; spec: SVG2
137+
text: svg; url: SVGElement
138138
type: element-attr
139139
urlPrefix: http://www.w3.org/TR/html5/; spec: HTML5
140140
urlPrefix: document-metadata.html
@@ -232,7 +232,7 @@ <h1>Content Security Policy</h1>
232232
type: dfn
233233
text: JSON object; url: section-2
234234
text: JSON stringification; url: section-2
235-
spec: SHA2; urlPrefix: http://csrc.nist.gov/groups/STM/cavp/documents/shs/sha256-384-512.pdf
235+
spec: FIPS180; urlPrefix: http://csrc.nist.gov/publications/fips/fips180-4/fips-180-4.pdf
236236
type: dfn
237237
text: SHA-256
238238
text: SHA-384

0 commit comments

Comments
 (0)