From 360de1eed61bc733acd471710cb881e102a7e2e2 Mon Sep 17 00:00:00 2001
From: Peter Saint-Andre <stpeter@jabber.org>
Date: Tue, 20 Nov 2007 02:49:38 +0000
Subject: [PATCH] 1.5pre8

git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@1403 4b5297f7-1745-476d-ba37-a9c6900126ab
---
 xep-0115.xml | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/xep-0115.xml b/xep-0115.xml
index adf95b98..ecf611e6 100644
--- a/xep-0115.xml
+++ b/xep-0115.xml
@@ -28,10 +28,10 @@
     &stpeter;
     &remko;
     <revision>
-      <version>1.5pre7</version>
-      <date>2007-11-08</date>
+      <version>1.5pre8</version>
+      <date>in progress, last updated 2007-11-19</date>
       <initials>jjh/psa</initials>
-      <remark><p>Required inclusion of the hash attribute in non-legacy mode; removed schema default for hash attribute; clarified meaning of node attribute; further specified security considerations; clarified handling of the legacy format to assist developers.</p></remark>
+      <remark><p>Removed hash attribute since only SHA-1 is used; clarified meaning of node attribute; further specified security considerations; clarified handling of the legacy format to assist developers.</p></remark>
     </revision>
     <revision>
       <version>1.4</version>
@@ -126,8 +126,7 @@
       <code><![CDATA[
 <presence from='romeo@montague.lit/orchard'>
   <c xmlns='http://jabber.org/protocol/caps' 
-     hash='sha-1'
-     node='http://code.google.com/p/exodus/;0.9.1'
+     node='http://code.google.com/p/exodus/'
      ver='8RovUdtOmiAjzj+xI7SK5BCw3A8='/>
 </presence>
       ]]></code>
@@ -159,8 +158,7 @@
       <code><![CDATA[
 <presence from='benvolio@capulet.lit/230193'>
   <c xmlns='http://jabber.org/protocol/caps' 
-     hash='sha-1'
-     node='http://psi-im.org/;0.11'
+     node='http://psi-im.org/'
      ver='8RovUdtOmiAjzj+xI7SK5BCw3A8='/>
 </presence>
       ]]></code>
@@ -169,7 +167,6 @@
       <code><![CDATA[
 <presence from='nurse@capulet.lit/chamber'>
   <c xmlns='http://jabber.org/protocol/caps' 
-     hash='sha-1'
      node='http://psi-im.org/;0.10'
      ver='uCoVCteRe3ty2wU2gHxkMaA7xhs='/>
 </presence>
@@ -178,8 +175,7 @@
       <code><![CDATA[
 <presence from='bard@shakespeare.lit/globe'>
   <c xmlns='http://jabber.org/protocol/caps' 
-     hash='sha-1'
-     node='http://www.chatopus.com/;2.2'
+     node='http://www.chatopus.com/'
      ver='zHyEOgxTrkpSdGcQKH8EFPLsriY='/>
 </presence>
       ]]></code>
@@ -225,11 +221,6 @@
         <td>A set of nametokens specifying additional feature bundles; this attribute is deprecated (see the <link url='#legacy'>Legacy Format</link> section of this document).</td>
         <td>DEPRECATED</td>
       </tr>
-      <tr>
-        <td>hash</td>
-        <td>The hashing algorithm used in generated the 'ver' attribute (see &ianahashes;). The value SHOULD be "sha-1".</td>
-        <td>REQUIRED</td>
-      </tr>
       <tr>
         <td>node</td>
         <td>A unique identifier for the software underlying the entity, typically a URL at the website of the project or company that produces the software. *</td>
@@ -275,8 +266,7 @@
       <example caption='Annotated presence sent'><![CDATA[
 <presence>
   <c xmlns='http://jabber.org/protocol/caps'
-     hash='sha-1'
-     node='http://code.google.com/p/exodus/;0.9.1'
+     node='http://code.google.com/p/exodus/'
      ver='8RovUdtOmiAjzj+xI7SK5BCw3A8='/>
 </presence>
       ]]></example>
@@ -321,7 +311,6 @@
       <example caption='Stream feature element including capabilities'><![CDATA[
 <stream:features>
   <c xmlns='http://jabber.org/protocol/caps'
-     hash='sha-1'
      node='http://jabberd.org/entity'
      ver='ItBTI0XLDFvVxZ72NQElAzKS9sU='>
 </stream:features>
@@ -400,7 +389,6 @@
       <xs:simpleContent>
         <xs:extension base='empty'>
           <xs:attribute name='ext' type='xs:NMTOKENS' use='optional'/>
-          <xs:attribute name='hash' type='xs:NMTOKEN' use='required'/>
           <xs:attribute name='node' type='xs:string' use='required'/>
           <xs:attribute name='ver' type='xs:string' use='required'/>
         </xs:extension>
@@ -426,7 +414,7 @@
       <li>When receiving caps information from a legacy entity, an application SHOULD check the 'node', 'ver', and 'ext' combinations as specified in the archived version 1.3 of this specification, and MAY cache the results.</li>
       <li>When sending a disco#info request to a legacy entity, an application SHOULD send the request to the entity's JID with a service discovery node of "node#ver".</li>
     </ul>
-    <p>If an application does not support the legacy format, it SHUOLD proceed as follows:</p>
+    <p>If an application does not support the legacy format, it SHOULD proceed as follows:</p>
     <ul>
       <li>When receiving caps information from a legacy entity, an application SHOULD ignore the 'ver' value entirely (since it cannot be verified) and SHOULD NOT cache it, since the application cannot validate the identity and features by checking the hash.</li>
       <li>When sending a disco#info request to a legacy entity, an application SHOULD send the request to the entity's JID without a service discovery node of "node#ver".</li>