mirror of
https://github.com/moparisthebest/xeps
synced 2024-08-13 16:53:48 -04:00
0.2
git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@885 4b5297f7-1745-476d-ba37-a9c6900126ab
This commit is contained in:
parent
5bab540f13
commit
706994fe3b
40
xep-0200.xml
40
xep-0200.xml
@ -2,20 +2,6 @@
|
|||||||
<!DOCTYPE xep SYSTEM 'xep.dtd' [
|
<!DOCTYPE xep SYSTEM 'xep.dtd' [
|
||||||
<!ENTITY % ents SYSTEM 'xep.ent'>
|
<!ENTITY % ents SYSTEM 'xep.ent'>
|
||||||
%ents;
|
%ents;
|
||||||
<!ENTITY setA "{&KCsubB; &KMsubB; x}">
|
|
||||||
<!ENTITY setB "{&KCsubA; &KMsubA; y}">
|
|
||||||
<!ENTITY esupy "e<span class='super'>y</span>">
|
|
||||||
<!ENTITY dsupx "d<span class='super'>x</span>">
|
|
||||||
<!ENTITY gsupx "g<span class='super'>x</span>">
|
|
||||||
<!ENTITY gsupy "g<span class='super'>y</span>">
|
|
||||||
<!ENTITY CsubA "C<span class='sub'>A</span>">
|
|
||||||
<!ENTITY CsubB "C<span class='sub'>B</span>">
|
|
||||||
<!ENTITY KMsubA "KM<span class='sub'>A</span>">
|
|
||||||
<!ENTITY KMsubB "KM<span class='sub'>B</span>">
|
|
||||||
<!ENTITY KCsubA "KC<span class='sub'>A</span>">
|
|
||||||
<!ENTITY KCsubB "KC<span class='sub'>B</span>">
|
|
||||||
<!ENTITY twosup32 "2<span class='super'>32</span>">
|
|
||||||
<!ENTITY twosup2n "2<span class='super'>2n-1</span>">
|
|
||||||
]>
|
]>
|
||||||
<?xml-stylesheet type='text/xsl' href='xep.xsl'?>
|
<?xml-stylesheet type='text/xsl' href='xep.xsl'?>
|
||||||
<xep>
|
<xep>
|
||||||
@ -35,13 +21,13 @@
|
|||||||
</dependencies>
|
</dependencies>
|
||||||
<supersedes>None</supersedes>
|
<supersedes>None</supersedes>
|
||||||
<supersededby>None</supersededby>
|
<supersededby>None</supersededby>
|
||||||
<shortname>crypt</shortname>
|
<shortname>TO BE ASSIGNED</shortname>
|
||||||
&ianpaterson;
|
&ianpaterson;
|
||||||
<revision>
|
<revision>
|
||||||
<version>0.2</version>
|
<version>0.2</version>
|
||||||
<date>2007-05-30</date>
|
<date>2007-05-30</date>
|
||||||
<initials>ip</initials>
|
<initials>ip</initials>
|
||||||
<remark><p>Added reference to Simplified Encrypted Session Negotiation</p></remark>
|
<remark><p>Added reference to Simplified Encrypted Session Negotiation; modified namespaces to reflect XMPP Registrar procedures regarding URN issuance.</p></remark>
|
||||||
</revision>
|
</revision>
|
||||||
<revision>
|
<revision>
|
||||||
<version>0.1</version>
|
<version>0.1</version>
|
||||||
@ -148,7 +134,7 @@
|
|||||||
<li><p>&THREAD; elements <note>Applications typically use &THREAD; elements internally to route stanzas to the process handling a session. The content of thread elements MUST be opaque with no semantic meaning and only exact comparisons MAY be made against it.</note></p></li>
|
<li><p>&THREAD; elements <note>Applications typically use &THREAD; elements internally to route stanzas to the process handling a session. The content of thread elements MUST be opaque with no semantic meaning and only exact comparisons MAY be made against it.</note></p></li>
|
||||||
<li><p><amp/> elements (see &xep0079;)</p></li>
|
<li><p><amp/> elements (see &xep0079;)</p></li>
|
||||||
</ul>
|
</ul>
|
||||||
<p>A stanza MUST NOT contain more than one <c xmlns='urn:xmpp:crypt'/> element, and it MUST be an immediate child of the stanza wrapper element. There is only one exception to those two rules, if the stanza is type 'error' then its <error/> child element MAY also contain a <c xmlns='urn:xmpp:crypt'/> element.</p>
|
<p>A stanza MUST NOT contain more than one <c xmlns='http://www.xmpp.org/extensions/xep-0200.html#ns'/> element, and it MUST be an immediate child of the stanza wrapper element. There is only one exception to those two rules, if the stanza is type 'error' then its <error/> child element MAY also contain a <c xmlns='http://www.xmpp.org/extensions/xep-0200.html#ns'/> element.</p>
|
||||||
<example caption='Plain Message Stanza'><![CDATA[
|
<example caption='Plain Message Stanza'><![CDATA[
|
||||||
<message from='alice@example.org/pda'
|
<message from='alice@example.org/pda'
|
||||||
to='bob@example.com/laptop'
|
to='bob@example.com/laptop'
|
||||||
@ -192,7 +178,7 @@
|
|||||||
<presence from='alice@example.org/pda'
|
<presence from='alice@example.org/pda'
|
||||||
to='bob@example.com/laptop'
|
to='bob@example.com/laptop'
|
||||||
type='available'>
|
type='available'>
|
||||||
<c xmlns='urn:xmpp:crypt'>
|
<c xmlns='http://www.xmpp.org/extensions/xep-0200.html#ns'>
|
||||||
<data> ** Base64 encoded m_final ** </data>
|
<data> ** Base64 encoded m_final ** </data>
|
||||||
<mac> ** Base64 encoded a_mac ** </mac>
|
<mac> ** Base64 encoded a_mac ** </mac>
|
||||||
</c>
|
</c>
|
||||||
@ -223,13 +209,13 @@
|
|||||||
to='bob@example.com/laptop'
|
to='bob@example.com/laptop'
|
||||||
id='publish1'
|
id='publish1'
|
||||||
type='error'>
|
type='error'>
|
||||||
<c xmlns='urn:xmpp:crypt'>
|
<c xmlns='http://www.xmpp.org/extensions/xep-0200.html#ns'>
|
||||||
<data> ** Base64 encoded m_final ** </data>
|
<data> ** Base64 encoded m_final ** </data>
|
||||||
<mac> ** Base64 encoded a_mac ** </mac>
|
<mac> ** Base64 encoded a_mac ** </mac>
|
||||||
</c>
|
</c>
|
||||||
<error type='modify'>
|
<error type='modify'>
|
||||||
<not-acceptable xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
|
<not-acceptable xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
|
||||||
<c xmlns='urn:xmpp:crypt'>
|
<c xmlns='http://www.xmpp.org/extensions/xep-0200.html#ns'>
|
||||||
<data> ** Base64 encoded m_final ** </data>
|
<data> ** Base64 encoded m_final ** </data>
|
||||||
<mac> ** Base64 encoded a_mac ** </mac>
|
<mac> ** Base64 encoded a_mac ** </mac>
|
||||||
</c>
|
</c>
|
||||||
@ -275,7 +261,7 @@
|
|||||||
to='bob@example.com/laptop'
|
to='bob@example.com/laptop'
|
||||||
type='chat'>
|
type='chat'>
|
||||||
<thread>ffd7076498744578d10edabfe7f4a866</thread>
|
<thread>ffd7076498744578d10edabfe7f4a866</thread>
|
||||||
<c xmlns='urn:xmpp:crypt'>
|
<c xmlns='http://www.xmpp.org/extensions/xep-0200.html#ns'>
|
||||||
<data> ** Base64 encoded m_final ** </data>
|
<data> ** Base64 encoded m_final ** </data>
|
||||||
<new>1</new>
|
<new>1</new>
|
||||||
<mac> ** Base64 encoded a_mac ** </mac>
|
<mac> ** Base64 encoded a_mac ** </mac>
|
||||||
@ -339,7 +325,7 @@
|
|||||||
<example caption='Alice Sends Re-Key Stanza'><![CDATA[
|
<example caption='Alice Sends Re-Key Stanza'><![CDATA[
|
||||||
<message from='alice@example.org/pda' to='bob@example.com/laptop'>
|
<message from='alice@example.org/pda' to='bob@example.com/laptop'>
|
||||||
<thread>ffd7076498744578d10edabfe7f4a866</thread>
|
<thread>ffd7076498744578d10edabfe7f4a866</thread>
|
||||||
<c xmlns='urn:xmpp:crypt'>
|
<c xmlns='http://www.xmpp.org/extensions/xep-0200.html#ns'>
|
||||||
<data> ** Base64 encoded m_final ** </data>
|
<data> ** Base64 encoded m_final ** </data>
|
||||||
<key> ** Base64 encoded value of new e ** </key>
|
<key> ** Base64 encoded value of new e ** </key>
|
||||||
<mac> ** Base64 encoded a_mac ** </mac>
|
<mac> ** Base64 encoded a_mac ** </mac>
|
||||||
@ -365,7 +351,7 @@
|
|||||||
<example caption='Publishing Expired MAC Keys'><![CDATA[
|
<example caption='Publishing Expired MAC Keys'><![CDATA[
|
||||||
<message from='alice@example.org/pda' to='bob@example.com/laptop'>
|
<message from='alice@example.org/pda' to='bob@example.com/laptop'>
|
||||||
<thread>ffd7076498744578d10edabfe7f4a866</thread>
|
<thread>ffd7076498744578d10edabfe7f4a866</thread>
|
||||||
<c xmlns='urn:xmpp:crypt'>
|
<c xmlns='http://www.xmpp.org/extensions/xep-0200.html#ns'>
|
||||||
<data> ** Base64 encoded m_final ** </data>
|
<data> ** Base64 encoded m_final ** </data>
|
||||||
<old> ** Base64 encoded old MAC key ** </old>
|
<old> ** Base64 encoded old MAC key ** </old>
|
||||||
<old> ** Base64 encoded old MAC key ** </old>
|
<old> ** Base64 encoded old MAC key ** </old>
|
||||||
@ -402,7 +388,9 @@
|
|||||||
</section1>
|
</section1>
|
||||||
|
|
||||||
<section1 topic='XMPP Registrar Considerations' anchor='registrar'>
|
<section1 topic='XMPP Registrar Considerations' anchor='registrar'>
|
||||||
<p>The ®ISTRAR; shall add 'urn:xmpp:crypt' to its registry of protocol namespaces.</p>
|
<section2 topic='Protocol Namespaces' anchor='ns'>
|
||||||
|
<p>Until this specification advances to a status of Draft, its associated namespace shall be "http://www.xmpp.org/extensions/xep-0200.html#ns"; upon advancement of this specification, the ®ISTRAR; shall issue a permanent namespace in accordance with the process defined in Section 4 of &xep0053;.</p>
|
||||||
|
</section2>
|
||||||
</section1>
|
</section1>
|
||||||
|
|
||||||
<section1 topic='XML Schemas' anchor='schema'>
|
<section1 topic='XML Schemas' anchor='schema'>
|
||||||
@ -411,8 +399,8 @@
|
|||||||
|
|
||||||
<xs:schema
|
<xs:schema
|
||||||
xmlns:xs='http://www.w3.org/2001/XMLSchema'
|
xmlns:xs='http://www.w3.org/2001/XMLSchema'
|
||||||
targetNamespace='urn:xmpp:crypt'
|
targetNamespace='http://www.xmpp.org/extensions/xep-0200.html#ns'
|
||||||
xmlns='urn:xmpp:crypt'
|
xmlns='http://www.xmpp.org/extensions/xep-0200.html#ns'
|
||||||
elementFormDefault='qualified'>
|
elementFormDefault='qualified'>
|
||||||
|
|
||||||
<xs:element name='data' type='xs:string'/>
|
<xs:element name='data' type='xs:string'/>
|
||||||
|
47
xep-0210.xml
47
xep-0210.xml
@ -2,51 +2,6 @@
|
|||||||
<!DOCTYPE xep SYSTEM 'xep.dtd' [
|
<!DOCTYPE xep SYSTEM 'xep.dtd' [
|
||||||
<!ENTITY % ents SYSTEM 'xep.ent'>
|
<!ENTITY % ents SYSTEM 'xep.ent'>
|
||||||
%ents;
|
%ents;
|
||||||
<!ENTITY esupy "e<span class='super'>y</span>">
|
|
||||||
<!ENTITY dsupx "d<span class='super'>x</span>">
|
|
||||||
<!ENTITY gsupx "g<span class='super'>x</span>">
|
|
||||||
<!ENTITY gsupy "g<span class='super'>y</span>">
|
|
||||||
<!ENTITY isPKsubA "isPK<span class='sub'>A</span>">
|
|
||||||
<!ENTITY isPKsubB "isPK<span class='sub'>B</span>">
|
|
||||||
<!ENTITY NsubA "N<span class='sub'>A</span>">
|
|
||||||
<!ENTITY NsubB "N<span class='sub'>B</span>">
|
|
||||||
<!ENTITY CsubA "C<span class='sub'>A</span>">
|
|
||||||
<!ENTITY CsubB "C<span class='sub'>B</span>">
|
|
||||||
<!ENTITY MsubA "M<span class='sub'>A</span>">
|
|
||||||
<!ENTITY MsubB "M<span class='sub'>B</span>">
|
|
||||||
<!ENTITY KMsubA "KM<span class='sub'>A</span>">
|
|
||||||
<!ENTITY KMsubB "KM<span class='sub'>B</span>">
|
|
||||||
<!ENTITY KCsubA "KC<span class='sub'>A</span>">
|
|
||||||
<!ENTITY KCsubB "KC<span class='sub'>B</span>">
|
|
||||||
<!ENTITY KSsubA "KS<span class='sub'>A</span>">
|
|
||||||
<!ENTITY KSsubB "KS<span class='sub'>B</span>">
|
|
||||||
<!ENTITY twosup32 "2<span class='super'>32</span>">
|
|
||||||
<!ENTITY twosup2n "2<span class='super'>2n-1</span>">
|
|
||||||
<!ENTITY CBeCAx2n1 "&CsubB; = &CsubA; XOR 2<span class='super'>n-1</span>">
|
|
||||||
<!ENTITY IDA "ID<span class='sub'>A</span>">
|
|
||||||
<!ENTITY IDB "ID<span class='sub'>B</span>">
|
|
||||||
<!ENTITY formA "form<span class='sub'>A</span>">
|
|
||||||
<!ENTITY formB "form<span class='sub'>B</span>">
|
|
||||||
<!ENTITY formA2 "form<span class='sub'>A2</span>">
|
|
||||||
<!ENTITY formB2 "form<span class='sub'>B2</span>">
|
|
||||||
<!ENTITY macA "mac<span class='sub'>A</span>">
|
|
||||||
<!ENTITY macB "mac<span class='sub'>B</span>">
|
|
||||||
<!ENTITY signA "sign<span class='sub'>A</span>">
|
|
||||||
<!ENTITY signB "sign<span class='sub'>B</span>">
|
|
||||||
<!ENTITY signsA "signs<span class='sub'>A</span>">
|
|
||||||
<!ENTITY signsB "signs<span class='sub'>B</span>">
|
|
||||||
<!ENTITY pubKeyA "pubKey<span class='sub'>A</span>">
|
|
||||||
<!ENTITY pubKeyB "pubKey<span class='sub'>B</span>">
|
|
||||||
<!ENTITY signKeyA "signKey<span class='sub'>A</span>">
|
|
||||||
<!ENTITY signKeyB "signKey<span class='sub'>B</span>">
|
|
||||||
<!ENTITY pubKeysA "pubKeys<span class='sub'>A</span>">
|
|
||||||
<!ENTITY signKeysA "signKeys<span class='sub'>A</span>">
|
|
||||||
<!ENTITY x1xZ "x<span class='sub'>1</span>...x<span class='sub'>Z</span>">
|
|
||||||
<!ENTITY e1eZ "e<span class='sub'>1</span>...e<span class='sub'>Z</span>">
|
|
||||||
<!ENTITY He1HeZ "He<span class='sub'>1</span>...He<span class='sub'>Z</span>">
|
|
||||||
<!ENTITY RS1ARSZA "RS<span class='sub'>1A</span>...RS<span class='sub'>ZA</span>">
|
|
||||||
<!ENTITY RS1BRSZB "RS<span class='sub'>1B</span>...RS<span class='sub'>ZB</span>">
|
|
||||||
<!ENTITY RSH1ARSHZA "RSH<span class='sub'>1A</span>...RSH<span class='sub'>ZA</span>">
|
|
||||||
]>
|
]>
|
||||||
<?xml-stylesheet type='text/xsl' href='xep.xsl'?>
|
<?xml-stylesheet type='text/xsl' href='xep.xsl'?>
|
||||||
<xep>
|
<xep>
|
||||||
@ -64,7 +19,7 @@
|
|||||||
</dependencies>
|
</dependencies>
|
||||||
<supersedes>None</supersedes>
|
<supersedes>None</supersedes>
|
||||||
<supersededby>None</supersededby>
|
<supersededby>None</supersededby>
|
||||||
<shortname>NOT YET ASSIGNED</shortname>
|
<shortname>N/A</shortname>
|
||||||
&ianpaterson;
|
&ianpaterson;
|
||||||
<revision>
|
<revision>
|
||||||
<version>0.2</version>
|
<version>0.2</version>
|
||||||
|
Loading…
Reference in New Issue
Block a user