From f907c8f63d9d61e07f789d035e73cbe14c966140 Mon Sep 17 00:00:00 2001 From: Sam Whited Date: Tue, 10 May 2016 08:41:23 -0500 Subject: [PATCH] Update OpenPGP for XMPP to Experimental Update OpenPGP for XMPP Instant Messaging to Experimental --- inbox/openpgp.xml => xep-0373.xml | 16 +++++++----- inbox/openpgp-im.xml => xep-0374.xml | 39 ++++++++++++++-------------- xep.ent | 2 ++ 3 files changed, 31 insertions(+), 26 deletions(-) rename inbox/openpgp.xml => xep-0373.xml (98%) rename inbox/openpgp-im.xml => xep-0374.xml (92%) diff --git a/inbox/openpgp.xml b/xep-0373.xml similarity index 98% rename from inbox/openpgp.xml rename to xep-0373.xml index fbf3c414..cc3248c3 100644 --- a/inbox/openpgp.xml +++ b/xep-0373.xml @@ -26,8 +26,8 @@ Standards Foundation. 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. 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 <http://xmpp.org/extensions/ipr-policy.shtml> or obtained by writing to XSF, P.O. Box 1641, Denver, CO 80201 USA). - xxxx - ProtoXEP + 0373 + Experimental Standards Track Standards Council @@ -60,6 +60,12 @@ Standards Foundation. look@my.amazin.horse valodim@stratum0.org + + 0.0.2 + 2016-05-10 + XEP Editor (ssw) +

Initial published version approved by the XMPP Council.

 + 0.0.1 2016-03-25 @@ -75,9 +81,7 @@ Standards Foundation. 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 XEP-OXIM: OpenPGP for - XMPP Instant Messaging.

+ Instant Messaging Profile specified in &xep0374;.

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

+ profile (see for example &xep0374;).

diff --git a/inbox/openpgp-im.xml b/xep-0374.xml similarity index 92% rename from inbox/openpgp-im.xml rename to xep-0374.xml index 805b353f..7132c401 100644 --- a/inbox/openpgp-im.xml +++ b/xep-0374.xml @@ -13,8 +13,8 @@
OpenPGP for XMPP Instant Messaging - Specifies a OpenPGP for XMPP (XEP-OX) profile for the - Instant Messaging (IM) use case. + Specifies a OpenPGP for XMPP (XEP-OX) profile for the Instant + Messaging (IM) use case. This XMPP Extension Protocol is copyright (c) 1999 - 2016 by the XMPP Standards Foundation (XSF). Permission is hereby granted, free of charge, to any person obtaining a copy of this specification (the "Specification"), 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. 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. 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 <http://xmpp.org/extensions/ipr-policy.shtml> or obtained by writing to XSF, P.O. Box 1641, Denver, CO 80201 USA). - xxxx - ProtoXEP + 0374 + Experimental Standards Track Standards Council XMPP Core XEP-0030 - XEP-OX + XEP-0373 @@ -54,6 +54,12 @@ Standards Foundation. look@my.amazin.horse valodim@stratum0.org + + 0.0.2 + 2016-05-10 + XEP Editor (ssw) +

Initial published version approved by the XMPP Council.

 + 0.0.1 2016-03-25 @@ -64,9 +70,8 @@ Standards Foundation. -

This XMPP extension protocol specifies a profile of OpenPGP for XMPP - (XEP-OX) for OpenPGP secured Instant Messaging (IM).

+

This XMPP extension protocol specifies a profile of &xep0373; for OpenPGP + secured Instant Messaging (IM).

Unlike similar XEPs, e.g. OMEMO, this XEP does not provide Forward Secrecy (FS), but as an advantage in return, allows @@ -124,16 +129,12 @@ Standards Foundation. 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 XEP-OX - § 4.

+ the public key announcement as described in &xep0373; §4.

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 XEP-OX § - 3.1.

+ use the &signcrypt; OpenPGP content element specified in &xep0373; §3.1.

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

Clients MAY want to use the mechanism in XEP-OX § 5 to +

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.

@@ -234,16 +235,14 @@ Standards Foundation.

This XEP does not define a Schema, since it exclusively uses elements from - XEP-OX and other XEPs.

+ &xep0373; and other XEPs.

 -

Please refer to the Acknowledgements - section of XEP-OX, since the two XEPs where designed - together.

+

Please refer to the Acknowledgements section of &xep0373;, since the two + XEPs where designed together.

 diff --git a/xep.ent b/xep.ent index 2f96cc81..222b0804 100644 --- a/xep.ent +++ b/xep.ent @@ -1381,3 +1381,5 @@ IANA Service Location Protocol, Version 2 (SLPv2) Templates Jingle HTTP Transport Method (XEP-0370) XEP-0370: Jingle HTTP Transport Method <http://xmpp.org/extensions/xep-0370.html>." > Jingle ICE Transport Method (XEP-0371) XEP-0371: Jingle ICE Transport Method <http://xmpp.org/extensions/xep-0371.html>." > References (XEP-0372) XEP-0372: References <http://xmpp.org/extensions/xep-0372.html>." > +OpenPGP for XMPP (XEP-0373) XEP-0373: OpenPGP for XMPP <http://xmpp.org/extensions/xep-0373.html>." > +OpenPGP for XMPP Instant Messaging (XEP-0374) XEP-0374: OpenPGP for XMPP Instant Messaging <http://xmpp.org/extensions/xep-0374.html>." >