Update OpenPGP for XMPP to Experimental

Update OpenPGP for XMPP Instant Messaging to Experimental

xep-0373.xml

@@ -26,8 +26,8 @@ Standards Foundation.</permissions>
     <liability>In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall the XMPP Standards Foundation or any author of this Specification be liable for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising out of the use or inability to use the Specification (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if the XMPP Standards Foundation or such author has been advised of the possibility of such damages.</liability>
     <conformance>This XMPP Extension Protocol has been contributed in full conformance with the XSF's Intellectual Property Rights Policy (a copy of which may be found at &lt;<link url='http://xmpp.org/extensions/ipr-policy.shtml'>http://xmpp.org/extensions/ipr-policy.shtml</link>&gt; or obtained by writing to XSF, P.O. Box 1641, Denver, CO 80201 USA).</conformance>
   </legal>
-  <number>xxxx</number>
+  <number>0373</number>
-  <status>ProtoXEP</status>
+  <status>Experimental</status>
   <type>Standards Track</type>
   <sig>Standards</sig>
   <approver>Council</approver>
@@ -60,6 +60,12 @@ Standards Foundation.</permissions>
     <email>look@my.amazin.horse</email>
     <jid>valodim@stratum0.org</jid>
   </author>
+  <revision>
+    <version>0.0.2</version>
+    <date>2016-05-10</date>
+    <initials>XEP Editor (ssw)</initials>
+    <remark><p>Initial published version approved by the XMPP Council.</p></remark>
+  </revision>
   <revision>
     <version>0.0.1</version>
     <date>2016-03-25</date>
@@ -75,9 +81,7 @@ Standards Foundation.</permissions>
   signatures, of data with the help of OpenPGP. Additional XEPs will
   use this extension protocol as building block when specifying their
   own OpenPGP profile suiting their use case. One such profile is the
-  Instant Messaging Profile specified in <link
+  Instant Messaging Profile specified in &xep0374;.</p>
-  url='../xep-openpgp-im/xep-openpgp-im.html'>XEP-OXIM: OpenPGP for
-  XMPP Instant Messaging</link>.</p>
 
   <p>XMPP provides the mechanisms to solve a lot of issues that come
   with modern day OpenPGP usage. For example, based on &xep0163; this
@@ -213,7 +217,7 @@ Standards Foundation.</permissions>
     signed. After the &openpgp; element and the including &signcrypt;,
     &sign; or &crypt; element was verified, they are processed
     according to the specification of the relevant OpenPGP for XMPP
-    profile (see for example XEP-OXIM).</p>
+    profile (see for example &xep0374;).</p>
 
   </section2>
 

xep-0374.xml

@@ -13,8 +13,8 @@
 <xep>
 <header>
   <title>OpenPGP for XMPP Instant Messaging</title>
-  <abstract>Specifies a OpenPGP for XMPP (XEP-OX) profile for the
+  <abstract>Specifies a OpenPGP for XMPP (XEP-OX) profile for the Instant
-  Instant Messaging (IM) use case.</abstract>
+    Messaging (IM) use case.</abstract>
   <legal>
     <copyright>This XMPP Extension Protocol is copyright (c) 1999 - 2016 by the XMPP Standards Foundation (XSF).</copyright>
     <permissions>Permission is hereby granted, free of charge, to any person obtaining a copy of this specification (the &quot;Specification&quot;), to make use of the Specification without restriction, including without limitation the rights to implement the Specification in a software program, deploy the Specification in a network service, and copy, modify, merge, publish, translate, distribute, sublicense, or sell copies of the Specification, and to permit persons to whom the Specification is furnished to do so, subject to the condition that the foregoing copyright notice and this permission notice shall be included in all copies or substantial portions of the Specification. Unless separate permission is granted, modified works that are redistributed shall not contain misleading information regarding the authors, title, number, or publisher of the Specification, and shall not claim endorsement of the modified works by the authors, any organization or project to which the authors belong, or the XMPP 
@@ -23,15 +23,15 @@ Standards Foundation.</permissions>
     <liability>In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall the XMPP Standards Foundation or any author of this Specification be liable for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising out of the use or inability to use the Specification (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if the XMPP Standards Foundation or such author has been advised of the possibility of such damages.</liability>
     <conformance>This XMPP Extension Protocol has been contributed in full conformance with the XSF's Intellectual Property Rights Policy (a copy of which may be found at &lt;<link url='http://xmpp.org/extensions/ipr-policy.shtml'>http://xmpp.org/extensions/ipr-policy.shtml</link>&gt; or obtained by writing to XSF, P.O. Box 1641, Denver, CO 80201 USA).</conformance>
   </legal>
-  <number>xxxx</number>
+  <number>0374</number>
-  <status>ProtoXEP</status>
+  <status>Experimental</status>
   <type>Standards Track</type>
   <sig>Standards</sig>
   <approver>Council</approver>
   <dependencies>
     <spec>XMPP Core</spec>
     <spec>XEP-0030</spec>
-    <spec>XEP-OX</spec>
+    <spec>XEP-0373</spec>
   </dependencies>
   <supersedes/>
   <supersededby/>
@@ -54,6 +54,12 @@ Standards Foundation.</permissions>
     <email>look@my.amazin.horse</email>
     <jid>valodim@stratum0.org</jid>
   </author>
+  <revision>
+    <version>0.0.2</version>
+    <date>2016-05-10</date>
+    <initials>XEP Editor (ssw)</initials>
+    <remark><p>Initial published version approved by the XMPP Council.</p></remark>
+  </revision>
   <revision>
     <version>0.0.1</version>
     <date>2016-03-25</date>
@@ -64,9 +70,8 @@ Standards Foundation.</permissions>
 
 <section1 topic='Introduction' anchor='intro'>
 
-  <p>This XMPP extension protocol specifies a profile of <link
+  <p>This XMPP extension protocol specifies a profile of &xep0373; for OpenPGP
-  url='openpgp.html'>OpenPGP for XMPP
+    secured Instant Messaging (IM).</p>
-  (XEP-OX)</link> for OpenPGP secured Instant Messaging (IM).</p>
 
   <p>Unlike similar XEPs, e.g. OMEMO, this XEP <em>does not</em>
   provide Forward Secrecy (FS), but as an advantage in return, allows
@@ -124,16 +129,12 @@ Standards Foundation.</permissions>
     to store OpenPGP key information in the Domain Name
     System (DNS). This specification does not restrict the mechanism
     of key discovery and retrieval, but compliant clients MUST support
-    the public key announcement as described in <link
+    the public key announcement as described in &xep0373; §4.</p>
-    url='openpgp.html#announcing-discover-pubkey'>XEP-OX
-    § 4</link>.</p>
 
     <p>After the required public keys have been discovered, XMPP
     clients engage in an OpenPGP secured IM
     conversation by exchanging &openpgp; extension elements. They MUST
-    use the &signcrypt; OpenPGP content element specified in <link
+    use the &signcrypt; OpenPGP content element specified in &xep0373; §3.1.</p>
-    url='openpgp.html#exchange'>XEP-OX §
-    3.1</link>.</p>
 
     <p>The child elements of the OpenPGP content element's &payload;
     can be seen as stanza extension elements which are encrypted and
@@ -168,7 +169,7 @@ Standards Foundation.</permissions>
 
       <section3 topic='OpenPGP Secret Key Synchronization' anchor='openpgp-secret-key-sync'>
 
-      <p>Clients MAY want to use the mechanism in XEP-OX § 5 to
+      <p>Clients MAY want to use the mechanism in &xep0374; §5 to
       synchronize their secret key(s) over multiple devices. Thus, they
       should query the user's PEP service for an eventually stored
       encrypted secret key.</p>
@@ -234,16 +235,14 @@ Standards Foundation.</permissions>
 <section1 topic='XML Schema' anchor='schema'>
 
   <p>This XEP does not define a Schema, since it exclusively uses elements from
-  XEP-OX and other XEPs.</p>
+  &xep0373; and other XEPs.</p>
 
 </section1>
 
 <section1 topic='Acknowledgements' anchor='acknowledgements'>
 
-  <p>Please refer to the <link
+  <p>Please refer to the Acknowledgements section of &xep0373;, since the two
-  url='openpgp.html#acknowledgements'>Acknowledgements
+    XEPs where designed together.</p>
-  section of XEP-OX</link>, since the two XEPs where designed
-  together.</p>
 
 </section1>
 </xep>

xep.ent

@@ -1381,3 +1381,5 @@ IANA Service Location Protocol, Version 2 (SLPv2) Templates</link></span> <note>
 <!ENTITY xep0370 "<span class='ref'><link url='http://xmpp.org/extensions/xep-0370.html'>Jingle HTTP Transport Method (XEP-0370)</link></span> <note>XEP-0370: Jingle HTTP Transport Method &lt;<link url='http://xmpp.org/extensions/xep-0370.html'>http://xmpp.org/extensions/xep-0370.html</link>&gt;.</note>" >
 <!ENTITY xep0371 "<span class='ref'><link url='http://xmpp.org/extensions/xep-0371.html'>Jingle ICE Transport Method (XEP-0371)</link></span> <note>XEP-0371: Jingle ICE Transport Method &lt;<link url='http://xmpp.org/extensions/xep-0371.html'>http://xmpp.org/extensions/xep-0371.html</link>&gt;.</note>" >
 <!ENTITY xep0372 "<span class='ref'><link url='http://xmpp.org/extensions/xep-0372.html'>References (XEP-0372)</link></span> <note>XEP-0372: References &lt;<link url='http://xmpp.org/extensions/xep-0372.html'>http://xmpp.org/extensions/xep-0372.html</link>&gt;.</note>" >
+<!ENTITY xep0373 "<span class='ref'><link url='http://xmpp.org/extensions/xep-0373.html'>OpenPGP for XMPP (XEP-0373)</link></span> <note>XEP-0373: OpenPGP for XMPP &lt;<link url='http://xmpp.org/extensions/xep-0373.html'>http://xmpp.org/extensions/xep-0373.html</link>&gt;.</note>" >
+<!ENTITY xep0374 "<span class='ref'><link url='http://xmpp.org/extensions/xep-0374.html'>OpenPGP for XMPP Instant Messaging (XEP-0374)</link></span> <note>XEP-0374: OpenPGP for XMPP Instant Messaging &lt;<link url='http://xmpp.org/extensions/xep-0374.html'>http://xmpp.org/extensions/xep-0374.html</link>&gt;.</note>" >