From 78bbafa14f80cd9be7c14204e0bd6fcf2f59106a Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Wed, 21 Sep 2022 16:16:20 +0200
Subject: [PATCH] XEP-0440 - make channel-binding a top level stream feature

---
 xep-0440.xml | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/xep-0440.xml b/xep-0440.xml
index 4baf68ec..8619d098 100644
--- a/xep-0440.xml
+++ b/xep-0440.xml
@@ -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>
+  <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>
-    <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>
 </stream:features>]]></example>