mirror of
https://github.com/moparisthebest/xeps
synced 2024-11-21 16:55:07 -05:00
1.5pre18
git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@1609 4b5297f7-1745-476d-ba37-a9c6900126ab
This commit is contained in:
parent
56bc2651ca
commit
cf46425d9b
14
xep-0115.xml
14
xep-0115.xml
@ -34,8 +34,8 @@
|
||||
<jid>jajcus@jabber.bnet.pl</jid>
|
||||
</author>
|
||||
<revision>
|
||||
<version>1.5pre17</version>
|
||||
<date>in progress, last updated 2008-01-28</date>
|
||||
<version>1.5pre18</version>
|
||||
<date>in progress, last updated 2008-01-29</date>
|
||||
<initials>jjh/psa</initials>
|
||||
<remark>
|
||||
<ul>
|
||||
@ -45,6 +45,7 @@
|
||||
<li>More clearly specified security considerations</li>
|
||||
<li>More clearly specified implementation notes</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>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>
|
||||
@ -190,7 +191,7 @@
|
||||
<c xmlns='http://jabber.org/protocol/caps'
|
||||
hash='sha-1'
|
||||
node='http://psi-im.org'
|
||||
ver='OSkaDqG4Q46zrXf5G6WSjfzgzGo='/>
|
||||
ver='8lu+88MRxmKM7yO3MEzY7YmTsWs='/>
|
||||
</presence>
|
||||
]]></code>
|
||||
<p>... or the following presence ...</p>
|
||||
@ -288,7 +289,8 @@
|
||||
</li>
|
||||
</ol>
|
||||
</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>
|
||||
</section2>
|
||||
<section2 topic='Simple Generation Example' anchor='ver-gen-simple'>
|
||||
@ -310,7 +312,7 @@
|
||||
to='juliet@capulet.lit/chamber'
|
||||
type='result'>
|
||||
<query xmlns='http://jabber.org/protocol/disco#info'
|
||||
node='http://psi-im.org#OSkaDqG4Q46zrXf5G6WSjfzgzGo='>
|
||||
node='http://psi-im.org#8lu+88MRxmKM7yO3MEzY7YmTsWs='>
|
||||
<identity xml:lang='en' category='client' name='Psi 0.9.1' type='pc'/>
|
||||
<identity xml:lang='el' category='client' name='Ψ 0.9.1' type='pc'/>
|
||||
<feature var='http://jabber.org/protocol/disco#info'/>
|
||||
@ -355,7 +357,7 @@
|
||||
<li>S = 'client/pc/el/Ψ 0.9.1<client/pc/en/Psi 0.9.1<http://jabber.org/protocol/caps
|
||||
<br/><http://jabber.org/protocol/disco#info<http://jabber.org/protocol/disco#items<http://jabber.org/protocol/muc
|
||||
<br/><urn:xmpp:dataforms:softwareinfo<ip_version<ipv4<ipv6<os<Mac<os_version<OS X 10.5.1<software<Psi<software_version<0.11<'</li>
|
||||
<li>ver = OSkaDqG4Q46zrXf5G6WSjfzgzGo=</li>
|
||||
<li>ver = 8lu+88MRxmKM7yO3MEzY7YmTsWs=</li>
|
||||
</ol>
|
||||
</section2>
|
||||
<section2 topic='Processing Method' anchor='ver-proc'>
|
||||
|
Loading…
Reference in New Issue
Block a user