1
0
mirror of https://github.com/moparisthebest/xeps synced 2024-12-22 23:58:51 -05:00

Merge branch 'xep-0440' into premerge

This commit is contained in:
Jonas Schäfer 2022-09-23 17:35:01 +02:00
commit aecee26322

View File

@ -23,6 +23,14 @@
<supersededby/>
<shortname>sasl-cb-types</shortname>
&flow;
<revision>
<version>0.4.0</version>
<date>2022-09-21</date>
<initials>dg</initials>
<remark>
Make sasl-channel-binding element a top level stream feature
</remark>
</revision>
<revision>
<version>0.3.0</version>
<date>2022-08-29</date>
@ -71,9 +79,9 @@
<section1 topic='Announcing the SASL Channel-Binding Type Capability' anchor='sasl-cb-type'>
<p>This protocol consists of a single optional extension element
named 'sasl-channel-binding' qualified by the 'urn:xmpp:sasl-cb:0'
namespace. The 'sasl-channel-binding' element MUST contain one or
<p>This protocol consists of a stream feature named 'sasl-channel-binding'
qualified by the 'urn:xmpp:sasl-cb:0' namespace.
The 'sasl-channel-binding' element MUST contain one or
more 'channel-binding' elements, of which each MUST have an
attribute with the name 'type'. The value of the 'type' attribute
SHOULD be the "Channel-binding unique prefix" of a channel-binding
@ -81,25 +89,25 @@
<p>A server declares that it supports particular channel-binding
types by listing the supported types via the 'sasl-channel-binding'
element defined herein. The 'sasl-channel-binding' element could
appear as child element to the SASL &lt;mechanisms/&gt;
stream feature defined herein. The 'sasl-channel-binding' element could
appear next to the SASL &lt;mechanisms/&gt;
stream-feature element, qualified by the
'urn:ietf:params:xml:ns:xmpp-sasl' namespace, as specified in
&rfc6120;. Another potential appearance of
&lt;sasl-channel-binding&gt; is as child element of the
&lt;mechanisms/&gt; stream-feature element as specified in the
&lt;sasl-channel-binding&gt; is next to the
&lt;authentication/&gt; stream-feature element as specified in the
&xep0388;.</p>
<example caption='Example &lt;mechanisms/&gt; stream feature with SASL Channel-Binding Type Capability.'><![CDATA[
<stream:features>
<mechanisms xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>
<mechanism>EXTERNAL</mechanism>
<mechanism>SCRAM-SHA-1-PLUS</mechanism>
<mechanism>PLAIN</mechanism>
<sasl-channel-binding xmlns='urn:xmpp:sasl-cb:0'>
<channel-binding type='tls-server-end-point'/>
<channel-binding type='tls-exporter'/>
</sasl-channel-binding>
<mechanisms xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>
<mechanism>EXTERNAL</mechanism>
<mechanism>SCRAM-SHA-1-PLUS</mechanism>
<mechanism>PLAIN</mechanism>
</mechanisms>
</stream:features>]]></example>