mirror of
https://github.com/moparisthebest/xeps
synced 2025-02-16 07:10:15 -05:00
0.8 (with schema fixes)
git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@2231 4b5297f7-1745-476d-ba37-a9c6900126ab
This commit is contained in:
parent
f333f92abf
commit
d2b1b17752
46
xep-0189.xml
46
xep-0189.xml
@ -20,7 +20,7 @@
|
|||||||
</dependencies>
|
</dependencies>
|
||||||
<supersedes>None</supersedes>
|
<supersedes>None</supersedes>
|
||||||
<supersededby>None</supersededby>
|
<supersededby>None</supersededby>
|
||||||
<shortname>NOT YET ASSIGNED</shortname>
|
<shortname>NOT_YET_ASSIGNED</shortname>
|
||||||
&ianpaterson;
|
&ianpaterson;
|
||||||
&stpeter;
|
&stpeter;
|
||||||
<author>
|
<author>
|
||||||
@ -215,7 +215,7 @@
|
|||||||
<pubsub xmlns='http://jabber.org/protocol/pubsub'>
|
<pubsub xmlns='http://jabber.org/protocol/pubsub'>
|
||||||
<publish node='urn:xmpp:tmp:pubkey'>
|
<publish node='urn:xmpp:tmp:pubkey'>
|
||||||
<item id='julietPGPkey1hash'>
|
<item id='julietPGPkey1hash'>
|
||||||
<keyinfo>
|
<keyinfo xmlns='urn:xmpp:tmp:pubkey'>
|
||||||
<name>julietPGPkey1hash</name>
|
<name>julietPGPkey1hash</name>
|
||||||
<openpgp>...</openpgp>
|
<openpgp>...</openpgp>
|
||||||
</keyinfo>
|
</keyinfo>
|
||||||
@ -251,7 +251,7 @@
|
|||||||
<pubsub xmlns='http://jabber.org/protocol/pubsub'>
|
<pubsub xmlns='http://jabber.org/protocol/pubsub'>
|
||||||
<publish node='urn:xmpp:tmp:pubkey'>
|
<publish node='urn:xmpp:tmp:pubkey'>
|
||||||
<item id='julietX509cert1hash'>
|
<item id='julietX509cert1hash'>
|
||||||
<keyinfo'>
|
<keyinfo xmlns='urn:xmpp:tmp:pubkey'>
|
||||||
<name>julietX509cert1hash</name>
|
<name>julietX509cert1hash</name>
|
||||||
<x509cert>
|
<x509cert>
|
||||||
...
|
...
|
||||||
@ -274,7 +274,7 @@
|
|||||||
<event xmlns='http://jabber.org/protocol/pubsub#event'>
|
<event xmlns='http://jabber.org/protocol/pubsub#event'>
|
||||||
<items node='urn:xmpp:tmp:pubkey'>
|
<items node='urn:xmpp:tmp:pubkey'>
|
||||||
<item id='julietX509cert1hash'>
|
<item id='julietX509cert1hash'>
|
||||||
<keyinfo'>
|
<keyinfo xmlns='urn:xmpp:tmp:pubkey'>
|
||||||
<name>julietX509cert1hash</name>
|
<name>julietX509cert1hash</name>
|
||||||
<x509cert>
|
<x509cert>
|
||||||
...
|
...
|
||||||
@ -317,13 +317,13 @@
|
|||||||
<pubsub xmlns='http://jabber.org/protocol/pubsub'>
|
<pubsub xmlns='http://jabber.org/protocol/pubsub'>
|
||||||
<items node='urn:xmpp:tmp:pubkey'>
|
<items node='urn:xmpp:tmp:pubkey'>
|
||||||
<item id='julietPGPkey1hash'>
|
<item id='julietPGPkey1hash'>
|
||||||
<keyinfo'>
|
<keyinfo xmlns='urn:xmpp:tmp:pubkey'>
|
||||||
<name>julietPGPkey1hash</name>
|
<name>julietPGPkey1hash</name>
|
||||||
...
|
...
|
||||||
</keyinfo>
|
</keyinfo>
|
||||||
</item>
|
</item>
|
||||||
<item id='julietX509cert1hash'>
|
<item id='julietX509cert1hash'>
|
||||||
<keyinfo'>
|
<keyinfo xmlns='urn:xmpp:tmp:pubkey'>
|
||||||
<name>julietX509cert1hash</name>
|
<name>julietX509cert1hash</name>
|
||||||
...
|
...
|
||||||
</keyinfo>
|
</keyinfo>
|
||||||
@ -352,7 +352,7 @@
|
|||||||
<pubsub xmlns='http://jabber.org/protocol/pubsub'>
|
<pubsub xmlns='http://jabber.org/protocol/pubsub'>
|
||||||
<items node='urn:xmpp:tmp:pubkey'>
|
<items node='urn:xmpp:tmp:pubkey'>
|
||||||
<item id='julietX509cert1hash'>
|
<item id='julietX509cert1hash'>
|
||||||
<keyinfo'>
|
<keyinfo xmlns='urn:xmpp:tmp:pubkey'>
|
||||||
<name>julietX509cert1hash</name>
|
<name>julietX509cert1hash</name>
|
||||||
...
|
...
|
||||||
</keyinfo>
|
</keyinfo>
|
||||||
@ -528,18 +528,36 @@
|
|||||||
<xs:element name='x509' type='xs:string'/>
|
<xs:element name='x509' type='xs:string'/>
|
||||||
<xs:element name='openpgp' type='xs:string'/>
|
<xs:element name='openpgp' type='xs:string'/>
|
||||||
</xs:choice>
|
</xs:choice>
|
||||||
<xs:element ref='signature' minOccurs='0' maxOccurs='unbound'/>
|
<xs:element ref='signature' minOccurs='0' maxOccurs='unbounded'/>
|
||||||
</xs:complexType>
|
</xs:complexType>
|
||||||
</xs:element>
|
</xs:element>
|
||||||
|
|
||||||
<xs:element name='signature'>
|
<xs:element name='signature'>
|
||||||
<xs:complexType>
|
<xs:complexType>
|
||||||
<xs:element name='issuer' type='xs:string'>
|
<xs:sequence>
|
||||||
<xs:attribute name='jid' type='xs:string' use='optional'/>
|
<xs:element ref='issuer'/>
|
||||||
</<xs:element>
|
<xs:element ref='value'/>
|
||||||
<xs:element name='value' type='xs:string'>
|
</xs:sequence>
|
||||||
<xs:attribute name='method' type='xs:string' use='optional'/>
|
</xs:complexType>
|
||||||
</<xs:element>
|
</xs:element>
|
||||||
|
|
||||||
|
<xs:element name='issuer'>
|
||||||
|
<xs:complexType>
|
||||||
|
<xs:simpleContent>
|
||||||
|
<xs:extension base='xs:string'>
|
||||||
|
<xs:attribute name='jid' type='xs:string' use='required'/>
|
||||||
|
</xs:extension>
|
||||||
|
</xs:simpleContent>
|
||||||
|
</xs:complexType>
|
||||||
|
</xs:element>
|
||||||
|
|
||||||
|
<xs:element name='value'>
|
||||||
|
<xs:complexType>
|
||||||
|
<xs:simpleContent>
|
||||||
|
<xs:extension base='xs:string'>
|
||||||
|
<xs:attribute name='method' type='xs:string' use='required'/>
|
||||||
|
</xs:extension>
|
||||||
|
</xs:simpleContent>
|
||||||
</xs:complexType>
|
</xs:complexType>
|
||||||
</xs:element>
|
</xs:element>
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user