1
0
mirror of https://github.com/moparisthebest/xeps synced 2024-12-22 15:48:52 -05:00

Merge branch 'xep-0231' into premerge

This commit is contained in:
Jonas Schäfer 2022-08-30 15:29:25 +02:00
commit ef599c41d7

View File

@ -30,6 +30,12 @@
</schemaloc>
&stpeter;
&pavlix;
<revision>
<version>1.1</version>
<date>2022-07-25</date>
<initials>ssw</initials>
<remark><p>Mention where to get textual names of hash functions.</p></remark>
</revision>
<revision>
<version>1.0</version>
<date>2008-09-03</date>
@ -210,7 +216,7 @@
</tr>
<tr>
<td>cid</td>
<td>A Content-ID that can be mapped to a cid: URL as specified in &rfc2111;. The 'cid' value SHOULD be of the form algo+hash@bob.xmpp.org, where the "algo" is the hashing algorithm used (e.g., "sha1" for the SHA-1 algorithm as specified in &rfc3174;) and the "hash" is the hex output of the algorithm applied to the binary data itself.</td>
<td>A Content-ID that can be mapped to a cid: URL as specified in &rfc2111;. The 'cid' value SHOULD be of the form algo+hash@bob.xmpp.org, where the "algo" is the hashing algorithm used (e.g., "sha1" for the SHA-1 algorithm as specified in &rfc3174;, for more information see the next section) and the "hash" is the hex output of the algorithm applied to the binary data itself.</td>
<td>REQUIRED</td>
</tr>
<tr>
@ -240,6 +246,15 @@
]]></example>
</section2>
<section2 topic='Algorithm Names' anchor='algo'>
<p>
The value of the 'algo' parameter MUST be one of the values from the
&ianahashes; maintained by &IANA;, or one of the values
defined in &xep0300; unless the hash is SHA-1 in which case the label
"sha1" MUST be used for historical reasons.
</p>
</section2>
</section1>
<section1 topic='Determining Support' anchor='support'>