moparisthebest/xeps
1
0
Fork 0
mirror of https://github.com/moparisthebest/xeps synced 2024-11-25 18:52:23 -05:00
Code Issues Releases Wiki Activity

1.5pre18

Browse Source 
git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@1609 4b5297f7-1745-476d-ba37-a9c6900126ab
This commit is contained in:
Peter Saint-Andre 2008-01-29 19:03:43 +00:00
parent 56bc2651ca
commit cf46425d9b
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
xep-0115.xml
View File

@ -34,8 +34,8 @@
<jid>jajcus@jabber.bnet.pl</jid> <jid>jajcus@jabber.bnet.pl</jid>
</author> </author>
<revision> <revision>
<version>1.5pre17</version> <version>1.5pre18</version>
<date>in progress, last updated 2008-01-28</date> <date>in progress, last updated 2008-01-29</date>
<initials>jjh/psa</initials> <initials>jjh/psa</initials>
<remark> <remark>
<ul> <ul>
@ -45,6 +45,7 @@
<li>More clearly specified security considerations</li> <li>More clearly specified security considerations</li>
<li>More clearly specified implementation notes</li> <li>More clearly specified implementation notes</li>
<li>Modified generation method to incorporate service discovery extensions</li> <li>Modified generation method to incorporate service discovery extensions</li>
<li>More clearly specified processing method</li>
<li>Clarified meaning and construction of caps node attribute and disco node attribute</li> <li>Clarified meaning and construction of caps node attribute and disco node attribute</li>
<li>Specified that node attribute shall be included in disco#info request for backwards-compatibility</li> <li>Specified that node attribute shall be included in disco#info request for backwards-compatibility</li>
<li>Clarified handling of the legacy format to assist developers</li> <li>Clarified handling of the legacy format to assist developers</li>
@ -190,7 +191,7 @@
<c xmlns='http://jabber.org/protocol/caps' <c xmlns='http://jabber.org/protocol/caps'
hash='sha-1' hash='sha-1'
node='http://psi-im.org' node='http://psi-im.org'
ver='OSkaDqG4Q46zrXf5G6WSjfzgzGo='/> ver='8lu+88MRxmKM7yO3MEzY7YmTsWs='/>
</presence> </presence>
]]></code> ]]></code>
<p>... or the following presence ...</p> <p>... or the following presence ...</p>
@ -288,7 +289,8 @@
</li> </li>
</ol> </ol>
</li> </li>
<li>Compute ver by hashing S using the algorithm specified in the 'hash' attribute (e.g., SHA-1 as defined in &rfc3174;). The hashed data MUST be generated with binary output and encoded using Base64 as specified in Section 4 of &rfc4648; (note: the Base64 output MUST NOT include whitespace and MUST set padding bits to zero). <note>The OpenSSL command for producing such output with SHA-1 is "echo -n 'S' | openssl dgst -binary -sha1 | openssl enc -nopad -base64".</note></li> <li>Ensure that S is encoded according to the UTF-8 encoding (&rfc3269;).</li>
<li>Compute the verification string by hashing S using the algorithm specified in the 'hash' attribute (e.g., SHA-1 as defined in &rfc3174;). The hashed data MUST be generated with binary output and encoded using Base64 as specified in Section 4 of &rfc4648; (note: the Base64 output MUST NOT include whitespace and MUST set padding bits to zero). <note>The OpenSSL command for producing such output with SHA-1 is "echo -n 'S' | openssl dgst -binary -sha1 | openssl enc -nopad -base64".</note></li>
</ol> </ol>
</section2> </section2>
<section2 topic='Simple Generation Example' anchor='ver-gen-simple'> <section2 topic='Simple Generation Example' anchor='ver-gen-simple'>
@ -310,7 +312,7 @@
to='juliet@capulet.lit/chamber' to='juliet@capulet.lit/chamber'
type='result'&gt; type='result'&gt;
&lt;query xmlns='http://jabber.org/protocol/disco#info' &lt;query xmlns='http://jabber.org/protocol/disco#info'
node='http://psi-im.org#OSkaDqG4Q46zrXf5G6WSjfzgzGo='&gt; node='http://psi-im.org#8lu+88MRxmKM7yO3MEzY7YmTsWs='&gt;
&lt;identity xml:lang='en' category='client' name='Psi 0.9.1' type='pc'/&gt; &lt;identity xml:lang='en' category='client' name='Psi 0.9.1' type='pc'/&gt;
&lt;identity xml:lang='el' category='client' name='&#936; 0.9.1' type='pc'/&gt; &lt;identity xml:lang='el' category='client' name='&#936; 0.9.1' type='pc'/&gt;
&lt;feature var='http://jabber.org/protocol/disco#info'/&gt; &lt;feature var='http://jabber.org/protocol/disco#info'/&gt;
@ -355,7 +357,7 @@
<li>S = 'client/pc/el/&#936;&nbsp;0.9.1&lt;client/pc/en/Psi&nbsp;0.9.1&lt;http://jabber.org/protocol/caps <li>S = 'client/pc/el/&#936;&nbsp;0.9.1&lt;client/pc/en/Psi&nbsp;0.9.1&lt;http://jabber.org/protocol/caps
<br/>&lt;http://jabber.org/protocol/disco#info&lt;http://jabber.org/protocol/disco#items&lt;http://jabber.org/protocol/muc <br/>&lt;http://jabber.org/protocol/disco#info&lt;http://jabber.org/protocol/disco#items&lt;http://jabber.org/protocol/muc
<br/>&lt;urn:xmpp:dataforms:softwareinfo&lt;ip_version&lt;ipv4&lt;ipv6&lt;os&lt;Mac&lt;os_version&lt;OS X 10.5.1&lt;software&lt;Psi&lt;software_version&lt;0.11&lt;'</li> <br/>&lt;urn:xmpp:dataforms:softwareinfo&lt;ip_version&lt;ipv4&lt;ipv6&lt;os&lt;Mac&lt;os_version&lt;OS X 10.5.1&lt;software&lt;Psi&lt;software_version&lt;0.11&lt;'</li>
<li>ver = OSkaDqG4Q46zrXf5G6WSjfzgzGo=</li> <li>ver = 8lu+88MRxmKM7yO3MEzY7YmTsWs=</li>
</ol> </ol>
</section2> </section2>
<section2 topic='Processing Method' anchor='ver-proc'> <section2 topic='Processing Method' anchor='ver-proc'>