diff --git a/xep-0200.xml b/xep-0200.xml index c61ec851..f64ab07e 100644 --- a/xep-0200.xml +++ b/xep-0200.xml @@ -2,20 +2,6 @@ %ents; - - -y"> -x"> -x"> -y"> -A"> -B"> -A"> -B"> -A"> -B"> -32"> -2n-1"> ]> @@ -35,13 +21,13 @@ None None - crypt + TO BE ASSIGNED &ianpaterson; 0.2 2007-05-30 ip -

Added reference to Simplified Encrypted Session Negotiation

 +

Added reference to Simplified Encrypted Session Negotiation; modified namespaces to reflect XMPP Registrar procedures regarding URN issuance.

 0.1 @@ -148,7 +134,7 @@

  • &THREAD; elements 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.

  • <amp/> elements (see &xep0079;)

    • -

    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.

    +

    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.

    - + ** Base64 encoded m_final ** ** Base64 encoded a_mac ** @@ -223,13 +209,13 @@ to='bob@example.com/laptop' id='publish1' type='error'> - + ** Base64 encoded m_final ** ** Base64 encoded a_mac ** - + ** Base64 encoded m_final ** ** Base64 encoded a_mac ** @@ -275,7 +261,7 @@ to='bob@example.com/laptop' type='chat'> ffd7076498744578d10edabfe7f4a866 - + ** Base64 encoded m_final ** 1 ** Base64 encoded a_mac ** @@ -339,7 +325,7 @@ ffd7076498744578d10edabfe7f4a866 - + ** Base64 encoded m_final ** ** Base64 encoded value of new e ** ** Base64 encoded a_mac ** @@ -365,7 +351,7 @@ ffd7076498744578d10edabfe7f4a866 - + ** Base64 encoded m_final ** ** Base64 encoded old MAC key ** ** Base64 encoded old MAC key ** @@ -402,7 +388,9 @@ -

    The ®ISTRAR; shall add 'urn:xmpp:crypt' to its registry of protocol namespaces.

    + +

    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;.

    +     @@ -411,8 +399,8 @@ diff --git a/xep-0210.xml b/xep-0210.xml index 1b28115d..a76da860 100644 --- a/xep-0210.xml +++ b/xep-0210.xml @@ -2,51 +2,6 @@ %ents; -y"> -x"> -x"> -y"> -A"> -B"> -A"> -B"> -A"> -B"> -A"> -B"> -A"> -B"> -A"> -B"> -A"> -B"> -32"> -2n-1"> -n-1"> -A"> -B"> -A"> -B"> -A2"> -B2"> -A"> -B"> -A"> -B"> -A"> -B"> -A"> -B"> -A"> -B"> -A"> -A"> -1...xZ"> -1...eZ"> -1...HeZ"> -1A...RSZA"> -1B...RSZB"> -1A...RSHZA"> ]> @@ -64,7 +19,7 @@ None None - NOT YET ASSIGNED + N/A &ianpaterson; 0.2