cleaned up all drafts by using more include statements for common sections; split up terms.mkd; rearranged folder "shared"; minor edits

3 years ago · f3e2ed9a26
--- a/lamps-header-protection/Makefile
+++ b/lamps-header-protection/Makefile
@ -8,8 +8,21 @@ OUTPUTS = $(DRAFT).xml $(DRAFT).txt $(DRAFT).html

 all: $(OUTPUTS)

 # $(DRAFT).xml: $(NAME).mkd ../shared/terms.mkd ../shared/basic-msg-flow-asciiart.mkd
 $(DRAFT).xml: $(NAME).mkd ../shared/implementation-status-references.mkd ../shared/implementation-status-text.mkd
 $(DRAFT).xml: $(NAME).mkd \
 	../shared/author_tags/claudio_luck.mkd \
 	../shared/author_tags/bernie_hoeneisen.mkd \
 	../shared/references/implementation-status.mkd \
 	../shared/text-blocks/key-words-rfc2119.mkd \
 	../shared/text-blocks/implementation-status.mkd \
 	# ../shared/references/ed-keysync.mkd \
 	# ../shared/references/isoc-btn.mkd \
 	#../shared/text-blocks/handshake.mkd \
 	# ../shared/text-blocks/trustwords.mkd \
 	# ../shared/text-blocks/tofu.mkd \
 	# ../shared/text-blocks/mitm.mkd \
 	# ../shared/ascii-arts/basic-msg-flow.mkd \
 	# ../shared/ascii-arts/pep_id_system.mkd \
 	# to match backslash at the end of the previous line	
 	kramdown-rfc2629 $(NAME).mkd > $(DRAFT).xml 	

 $(DRAFT).txt: $(DRAFT).xml
--- a/lamps-header-protection/draft-luck-lamps-pep-header-protection.mkd
+++ b/lamps-header-protection/draft-luck-lamps-pep-header-protection.mkd
@ -10,27 +10,8 @@ stand_alone: yes
 pi: [toc, sortrefs, symrefs, comments]

 author:
  -
    ins: C. Luck
    name: Claudio Luck
    org: pEp Foundation
    street: Oberer Graben 4
    city: CH-8400 Winterthur
    country: Switzerland
    email: claudio.luck@pep.foundation
    uri: https://pep.foundation/

  -
    ins: B. Hoeneisen
    name: Bernie Hoeneisen
    org: Ucom Standards Track Solutions GmbH
    abbrev: Ucom.ch
    street: ""
    city: CH-8046 Zuerich
    country: Switzerland
    phone: "+41 44 500 52 44"
    email: bernie@ietf.hoeneisen.ch (bernhard.hoeneisen AT ucom.ch)
    uri: https://ucom.ch/
 {::include ../shared/author_tags/claudio_luck.mkd}
 {::include ../shared/author_tags/bernie_hoeneisen.mkd}

 normative:
  RFC2119:
@ -52,20 +33,9 @@ informative:
 #  I-D.marques-pep-handshake:
 #  I-D.birk-pep-trustwords:
 #  I-D.marques-pep-rating:
 #  I-D.birk-pep-keysync:
 #    target: https://pep.foundation/dev/repos/internet-drafts/file/tip/pep-keysync/draft-birk-pep-keysync-NN.txt
 #    title: "pretty Easy privacy (pEp): Key Synchronization Protocol"
 #    author:
 #      -
 #        name: Volker Birk
 #        ins: V. Birk
 #      -
 #        name: Hernani Marques
 #        ins: H. Marques
 #    date: 2018-06
 #    ann: Early draft

 {::include ../shared/implementation-status-references.mkd}
 # {::include ../shared/references/ed-keysync.mkd}
 # {::include ../shared/references/isoc-btn.mkd}
 {::include ../shared/references/implementation-status.mkd}


 --- abstract
@ -127,11 +97,11 @@ ends are known have implemented pEp.

 # Terms

 The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT",
 "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this
 document are to be interpreted as described in {{RFC2119}}.

 <!-- {::include ../shared/terms.mkd} -->
 {::include ../shared/text-blocks/key-words-rfc2119.mkd}
 <!-- {::include ../shared/text-blocks/handshake.mkd} -->
 <!-- {::include ../shared/text-blocks/trustwords.mkd} -->
 <!-- {::include ../shared/text-blocks/tofu.mkd} -->
 <!-- {::include ../shared/text-blocks/mitm.mkd} -->


 # pEp email format version 2
@ -271,8 +241,7 @@ Header protection, i.e. "forwarded=no".
 \[\[ TODO \]\]



 {::include ../shared/implementation-status-text.mkd}
 {::include ../shared/text-blocks/implementation-status.mkd}


 # Acknowledgements
--- a/pep-email/Makefile
+++ b/pep-email/Makefile
@ -10,12 +10,18 @@ all: $(OUTPUTS)

 $(DRAFT).xml: $(NAME).mkd \
 	../shared/author_tags/hernani_marques.mkd \
 	../shared/implementation-status-references.mkd \
 	../shared/basic-msg-flow-asciiart.mkd \
 	../shared/terms.mkd \
 	../shared/implementation-status-text.mkd \
 	../shared/references/isoc-btn.mkd \
 	../shared/references/implementation-status.mkd \
 	../shared/ascii-arts/basic-msg-flow.mkd \
 	../shared/text-blocks/key-words-rfc2119.mkd \
 	../shared/text-blocks/handshake.mkd \
 	../shared/text-blocks/trustwords.mkd \
 	../shared/text-blocks/tofu.mkd \
 	../shared/text-blocks/mitm.mkd \
 	../shared/text-blocks/implementation-status.mkd \
 	# ../shared/author_tags/volker_birk.mkd \
 	# ../shared/pep_id_system.mkd \
 	# ../shared/references/ed-keysync.mkd \
 	# ../shared/ascii-arts/pep_id_system.mkd \
 	# to match backslash at the end of the previous line
 	kramdown-rfc2629 $(NAME).mkd > $(DRAFT).xml 	

--- a/pep-email/draft-marques-pep-email.mkd
+++ b/pep-email/draft-marques-pep-email.mkd
@ -29,32 +29,10 @@ informative:
 #   I-D.marques-pep-email:
  I-D.birk-pep-trustwords:
  I-D.marques-pep-rating:
 #  E-D.birk-pep-keysync:
 #    target: https://pep.foundation/dev/repos/internet-drafts/file/tip/pep-keysync/draft-birk-pep-keysync-NN.txt
 #    title: "pretty Easy privacy (pEp): Key Synchronization Protocol"
 #    author:
 #      -
 #        name: Volker Birk
 #        ins: V. Birk
 #      -
 #        name: Hernani Marques
 #        ins: H. Marques
 #    date: 2018-06
 #    ann: Early draft
 #  SRC.pepcore:
 #    target: https://pep.foundation/dev/
 #    title: Core source code and reference implementation of pEp (engine and adapters)
 #    date: 2018-07
  ISOC.bnet:
    target: https://www.internetsociety.org/blog/2017/06/12-innovative-projects-selected-for-beyond-the-net-funding/
    title: "Beyond the Net. 12 Innovative Projects Selected for Beyond the Net Funding. Implementing Privacy via Mass Encryption: Standardizing pretty Easy privacy’s protocols"
    author:
     name: Ilda Simao
     ins: I. Simao
    date: 2017-06

 {::include ../shared/implementation-status-references.mkd}

 # {::include ../shared/references/ed-keysync.mkd}
 {::include ../shared/references/isoc-btn.mkd}
 {::include ../shared/references/implementation-status.mkd}

 --- abstract

@ -122,7 +100,7 @@ The following example roughly describes a typical pEp scenario:
   using a green color rating. This color rating is also applied to
   messages (in- and outgoing).

 {::include ../shared/basic-msg-flow-asciiart.mkd}
 {::include ../shared/ascii-arts/basic-msg-flow.mkd}

 This workflow is implemented as running code already in various pEp-enabled
 software, cf. {{implementation-status}}.
@ -136,9 +114,15 @@ communication peers -- achievable by message encapsulation. pEp's
 email message format 2 described below is already prepared for this
 scenario.


 # Terms

 {::include ../shared/terms.mkd}
 {::include ../shared/text-blocks/key-words-rfc2119.mkd}
 {::include ../shared/text-blocks/handshake.mkd}
 {::include ../shared/text-blocks/trustwords.mkd}
 {::include ../shared/text-blocks/tofu.mkd}
 {::include ../shared/text-blocks/mitm.mkd}


 # Opportunistic Security with pEp for email

@ -155,6 +139,7 @@ MUST be generated.

 \[\[ TODO: Shouldn't this go to general I-D \]\]


 ## Key Distribution

 By default, public keys MUST always be attached to any outgoing message.
@ -606,7 +591,7 @@ any key material.
 \[\[ TODO \]\]


 {::include ../shared/implementation-status-text.mkd}
 {::include ../shared/text-blocks/implementation-status.mkd}


 # Acknowledgements
--- a/pep-handshake/Makefile
+++ b/pep-handshake/Makefile
@ -8,7 +8,21 @@ OUTPUTS = $(DRAFT).xml $(DRAFT).txt $(DRAFT).html

 all: $(OUTPUTS)

 $(DRAFT).xml: $(NAME).mkd
 $(DRAFT).xml: $(NAME).mkd \
 	../shared/author_tags/hernani_marques.mkd \
 	../shared/author_tags/bernie_hoeneisen.mkd \
 	../shared/references/ed-keysync.mkd \
 	../shared/references/isoc-btn.mkd \
 	../shared/references/implementation-status.mkd \
 	../shared/text-blocks/key-words-rfc2119.mkd \
 	../shared/text-blocks/handshake.mkd \
 	../shared/text-blocks/trustwords.mkd \
 	../shared/text-blocks/tofu.mkd \
 	../shared/text-blocks/mitm.mkd \
 	../shared/text-blocks/implementation-status.mkd \
 	# ../shared/ascii-arts/basic-msg-flow.mkd \
 	# ../shared/ascii-arts/pep_id_system.mkd \
 	# to match backslash at the end of the previous line
 	kramdown-rfc2629 $(NAME).mkd > $(DRAFT).xml 	

 $(DRAFT).txt: $(DRAFT).xml
--- a/pep-handshake/draft-marques-pep-handshake.mkd
+++ b/pep-handshake/draft-marques-pep-handshake.mkd
@ -11,26 +11,8 @@ stand_alone: yes
 pi: [toc, sortrefs, symrefs, comments]

 author:
  -
    ins: H. Marques
    name: Hernani Marques
    org: pEp Foundation
    street: Oberer Graben 4
    city: CH-8400 Winterthur
    country: Switzerland
    email: hernani.marques@pep.foundation
    uri: https://pep.foundation/
  -
   ins: B. Hoeneisen
   name: Bernie Hoeneisen
   org: Ucom Standards Track Solutions GmbH
   abbrev: Ucom.ch
   street: ""
   city: CH-8046 Zuerich
   country: Switzerland
   phone: "+41 44 500 52 44"
   email: bernie@ietf.hoeneisen.ch (bernhard.hoeneisen AT ucom.ch)
   uri: https://ucom.ch/
 {::include ../shared/author_tags/hernani_marques.mkd}
 {::include ../shared/author_tags/bernie_hoeneisen.mkd}

 normative:
  I-D.birk-pep-trustwords:
@ -46,42 +28,9 @@ informative:
  RFC5280:
 #   RFC5321:
 #   RFC7258:
  RFC7942:
  I-D.marques-pep-email:
 #   I-D.marques-pep-email:
  I-D.marques-pep-rating:
 #   I-D.marques-pep-handshake:
  E-D.birk-pep-keysync:
    target: https://pep.foundation/dev/repos/internet-drafts/file/tip/pep-keysync/draft-birk-pep-keysync-NN.txt
    title: "pretty Easy privacy (pEp): Key Synchronization Protocol"
    author:
      -
        name: Volker Birk
        ins: V. Birk
      -
        name: Hernani Marques
        ins: H. Marques
    date: 2018-06
    ann: Early draft
 #   SRC.pepcore:
 #     target: https://pep.foundation/dev/
 #     title: Core source code and reference implementation of pEp (engine and adapters)
 #     date: 2018-07
  SRC.pepforandroid:
    target: https://pep-security.lu/gitlab/android/pep
    title: Source code for pEp for Android
    date: 2018-07
  SRC.pepforios:
    target: https://pep-security.ch/dev/repos/pEp_for_iOS/
    title: Source code for pEp for iOS
    date: 2018-07
  SRC.pepforoutlook:
    target: https://pep-security.lu/dev/repos/pEp_for_Outlook/
    title: Source code for pEp for Outlook
    date: 2018-07
  SRC.enigmailpep:
    target: https://enigmail.net/index.php/en/download/source-code
    title: Source code for Enigmail/pEp
    date: 2018-07
  signal:
    target: https://signal.org/
    title: Signal
@ -94,14 +43,10 @@ informative:
    target: https://en.wikipedia.org/w/index.php?title=PGP_word_list&amp;oldid=749481933
    title: PGP word list
    date: 2017-11
  ISOC.bnet:
    target: https://www.internetsociety.org/blog/2017/06/12-innovative-projects-selected-for-beyond-the-net-funding/
    title: "Beyond the Net. 12 Innovative Projects Selected for Beyond the Net Funding. Implementing Privacy via Mass Encryption: Standardizing pretty Easy privacy’s protocols"
    author:
      name: Ilda Simao
      ins: I. Simao
    date: 2017-06

 {::include ../shared/references/ed-keysync.mkd}
 {::include ../shared/references/isoc-btn.mkd}
 {::include ../shared/references/implementation-status.mkd}

 --- abstract

@ -160,9 +105,12 @@ authentication.

 # Terms

 ~~~~~~~~~~
 {::include ../shared/terms.mkd}
 ~~~~~~~~~~
 {::include ../shared/text-blocks/key-words-rfc2119.mkd}
 <!-- {::include ../shared/text-blocks/handshake.mkd} -->
 {::include ../shared/text-blocks/trustwords.mkd}
 {::include ../shared/text-blocks/tofu.mkd}
 {::include ../shared/text-blocks/mitm.mkd}


 # Problem Statement

@ -173,6 +121,7 @@ may have been substituted or tampered with to allow for re-encryption
 attacks. To prevent such man-in-the-middle (MITM) attacks, an
 important step is to verify the authenticity of a public key obtained.


 ## Use Cases

 Such a verification process is useful in at least two scenarios:
@ -243,7 +192,7 @@ systems fulfills all of the pEp requirements (cf. above).
 In pretty Easy privacy (pEp), the proposed approach for peers to
 authenticate each other is to engage in the pEp Handshake.

 In current pEp implementations (cf. {{running-code}}), the same kinds
 In current pEp implementations (cf. {{current-software-implementing-pep}}), the same kinds
 of keys as in OpenPGP are used. Such keys include a fingerprint as
 cryptographic hash over the public key. This fingerprint is normally
 represented in a hexadecimal form, consisting of ten 4-digit
@ -395,46 +344,13 @@ to stay secret, especially as in pEp public keys are aggressively
 distributed to all peers. Also similar Trustwords can be generated,
 which spelled on the phone might sound very similar.

 # Implementation Status

 ## Introduction

 This section records the status of known implementations of the
 protocol defined by this specification at the time of posting of this
 Internet-Draft, and is based on a proposal described in {{RFC7942}}.
 The description of implementations in this section is intended to
 assist the IETF in its decision processes in progressing drafts to
 RFCs. Please note that the listing of any individual implementation
 here does not imply endorsement by the IETF. Furthermore, no effort
 has been spent to verify the information presented here that was
 supplied by IETF contributors.  This is not intended as, and must not
 be construed to be, a catalog of available implementations or their
 features. Readers are advised to note that other implementations may
 exist.

 According to {{RFC7942}}, "\[...\] this will allow reviewers and
 working groups to assign due consideration to documents that have the
 benefit of running code, which may serve as evidence of valuable
 experimentation and feedback that have made the implemented protocols
 more mature. It is up to the individual working groups to use this
 information as they see fit."

 ## Running Code
 {::include ../shared/text-blocks/implementation-status.mkd}

 In pEp for email {{I-D.marques-pep-email}} contexts, Handshakes are
 already implemented for the following platforms:
 Handshake is already implemented in all platforms listed above.

 * Android, in pEp for Android -- release {{SRC.pepforandroid}}

 * Enigmail, in the Enigmail/pEp mode -- release used for new Enigmail
  users of version 2.0 {{SRC.enigmailpep}}
  
 * iOS, in pEp for iOS -- not yet released {{SRC.pepforios}}

 * Outlook, in pEp for Outlook -- commercial release {{SRC.pepforoutlook}}

 In pEp for Outlook also keys from other devices can be imported by the
 Handshake method.
 <!-- In pEp for Outlook also keys from other devices can be imported by the
 Handshake method. -->

 # Acknowledgements

@ -449,8 +365,6 @@ This work was initially created by pEp Foundation, and then reviewed
 and extended with funding by the Internet Society's Beyond the Net
 Programme on standardizing pEp. {{ISOC.bnet}}

 Thanks to Bernie Hoeneisen for extension work on this document.

 --- back

 <!--
@ -489,3 +403,4 @@ reference implementation pEp engine (C99 programming language).

 * Add description for further processes to change the trust level,
  e.g., to remove trust or even mistrust a peer and alike.

--- a/pep-keysync/Makefile
+++ b/pep-keysync/Makefile
@ -8,7 +8,21 @@ OUTPUTS = $(DRAFT).xml $(DRAFT).txt $(DRAFT).html

 all: $(OUTPUTS)

 $(DRAFT).xml: $(NAME).mkd
 $(DRAFT).xml: $(NAME).mkd \
 	../shared/author_tags/volker_birk.mkd \
 	../shared/author_tags/hernani_marques.mkd \
 	../shared/references/isoc-btn.mkd \
 	../shared/references/implementation-status.mkd \
 	../shared/text-blocks/key-words-rfc2119.mkd \
 	../shared/text-blocks/handshake.mkd \
 	../shared/text-blocks/trustwords.mkd \
 	../shared/text-blocks/tofu.mkd \
 	../shared/text-blocks/mitm.mkd \
 	../shared/text-blocks/implementation-status.mkd \
 	# ../shared/ascii-arts/basic-msg-flow.mkd \
 	# ../shared/ascii-arts/pep_id_system.mkd \
 	# ../shared/references/ed-keysync.mkd \
 	# to match backslash at the end of the previous line
 	kramdown-rfc2629 $(NAME).mkd > $(DRAFT).xml 	

 $(DRAFT).txt: $(DRAFT).xml
--- a/pep-keysync/draft-birk-pep-keysync-NN.txt
+++ b/pep-keysync/draft-birk-pep-keysync-NN.txt
@ -5,11 +5,11 @@
 Network Working Group                                            V. Birk
 Internet-Draft                                                H. Marques
 Intended status: Standards Track                          pEp Foundation
 Expires: December 29, 2018                                 June 27, 2018
 Expires: August 8, 2019                                February 04, 2019


        pretty Easy privacy (pEp): Key Synchronization Protocol
                       draft-birk-pep-keysync-00
                       draft-birk-pep-keysync-NN

 Abstract

@ -30,11 +30,11 @@ Status of This Memo
   time.  It is inappropriate to use Internet-Drafts as reference
   material or to cite them other than as "work in progress."

   This Internet-Draft will expire on December 29, 2018.
   This Internet-Draft will expire on August 8, 2019.

 Copyright Notice

   Copyright (c) 2018 IETF Trust and the persons identified as the
   Copyright (c) 2019 IETF Trust and the persons identified as the
   document authors.  All rights reserved.

   This document is subject to BCP 78 and the IETF Trust's Legal
@ -53,9 +53,9 @@ Copyright Notice



 Birk & Marques          Expires December 29, 2018               [Page 1]
 Birk & Marques           Expires August 8, 2019                 [Page 1]

 Internet-Draft     pretty Easy privacy (pEp) Key Sync          June 2018
 Internet-Draft     pretty Easy privacy (pEp) Key Sync      February 2019


 Table of Contents
@ -69,12 +69,13 @@ Table of Contents
   7.  Security Considerations . . . . . . . . . . . . . . . . . . .   8
   8.  Implementation Status . . . . . . . . . . . . . . . . . . . .   8
     8.1.  Introduction  . . . . . . . . . . . . . . . . . . . . . .   8
     8.2.  Current software implementing pEp . . . . . . . . . . . .   9
   9.  Acknowledgements  . . . . . . . . . . . . . . . . . . . . . .   9
   10. References  . . . . . . . . . . . . . . . . . . . . . . . . .   9
     10.1.  Normative References . . . . . . . . . . . . . . . . . .   9
   10. References  . . . . . . . . . . . . . . . . . . . . . . . . .  10
     10.1.  Normative References . . . . . . . . . . . . . . . . . .  10
     10.2.  Informative References . . . . . . . . . . . . . . . . .  10
   Appendix A.  Excerpts from the pEp Reference Implementation . . .  12
   Appendix B.  Open Issues  . . . . . . . . . . . . . . . . . . . .  12
   Appendix A.  Excerpts from the pEp Reference Implementation . . .  11
   Appendix B.  Open Issues  . . . . . . . . . . . . . . . . . . . .  11
   Authors' Addresses  . . . . . . . . . . . . . . . . . . . . . . .  12

 1.  Introduction
@ -98,21 +99,22 @@ Table of Contents

   o  Handshake: The process when Alice - e.g. in-person or via phone -
      contacts Bob to verify Trustwords (or by fallback: fingerprints)
      is called handshake.  [E-D.birk-pep-handshake]
      is called Handshake.  [I-D.marques-pep-handshake]

   o  Trustwords: A scalar-to-word representation of 16-bit numbers (0
      to 65535) to natural language words.  When doing a handshake,
      to 65535) to natural language words.  When doing a Handshake,
      peers are shown combined Trustwords of both public keys involved
      to ease the comparison.  [I-D.birk-pep-trustwords]

   o  Trust on First Use (TOFU): cf. [RFC7435]



 Birk & Marques          Expires December 29, 2018               [Page 2]
 Birk & Marques           Expires August 8, 2019                 [Page 2]

 Internet-Draft     pretty Easy privacy (pEp) Key Sync          June 2018
 Internet-Draft     pretty Easy privacy (pEp) Key Sync      February 2019


   o  Trust on First Use (TOFU): cf. [RFC7435]

   o  Man-in-the-middle attack (MITM): cf. [RFC4949]

@ -133,7 +135,7 @@ Internet-Draft     pretty Easy privacy (pEp) Key Sync          June 2018
   the other nor are the chances realistic that the independently
   created key pairs match.

   If Alice wants to communicate from both of her devices, she expectes
   If Alice wants to communicate from both of her devices, she expects
   not only that messages be readable across the devices, but also that
   she can send messages expecting the same level of privacy she's used
   to with just using one device, i.e., she wants all of the trust she
@ -141,7 +143,7 @@ Internet-Draft     pretty Easy privacy (pEp) Key Sync          June 2018
   reflected on any device she uses.  This requires her to have her
   devices be part of a so-called Device Group.

   This scenario can be fullfilled using the following steps, assuming
   This scenario can be fulfilled using the following steps, assuming
   the process is started with device Alice_A:

   1.  Alice automatically invokes a broadcast from the first device,
@ -163,11 +165,9 @@ Internet-Draft     pretty Easy privacy (pEp) Key Sync          June 2018





 Birk & Marques          Expires December 29, 2018               [Page 3]
 Birk & Marques           Expires August 8, 2019                 [Page 3]

 Internet-Draft     pretty Easy privacy (pEp) Key Sync          June 2018
 Internet-Draft     pretty Easy privacy (pEp) Key Sync      February 2019


   2.  Alice_A and Alice_B now send each other all of their secrets,
@ -221,9 +221,9 @@ Internet-Draft     pretty Easy privacy (pEp) Key Sync          June 2018



 Birk & Marques          Expires December 29, 2018               [Page 4]
 Birk & Marques           Expires August 8, 2019                 [Page 4]

 Internet-Draft     pretty Easy privacy (pEp) Key Sync          June 2018
 Internet-Draft     pretty Easy privacy (pEp) Key Sync      February 2019


          fsm DeviceState filename=sync {
@ -277,9 +277,9 @@ Internet-Draft     pretty Easy privacy (pEp) Key Sync          June 2018



 Birk & Marques          Expires December 29, 2018               [Page 5]
 Birk & Marques           Expires August 8, 2019                 [Page 5]

 Internet-Draft     pretty Easy privacy (pEp) Key Sync          June 2018
 Internet-Draft     pretty Easy privacy (pEp) Key Sync      February 2019


                  }
@ -333,9 +333,9 @@ Internet-Draft     pretty Easy privacy (pEp) Key Sync          June 2018



 Birk & Marques          Expires December 29, 2018               [Page 6]
 Birk & Marques           Expires August 8, 2019                 [Page 6]

 Internet-Draft     pretty Easy privacy (pEp) Key Sync          June 2018
 Internet-Draft     pretty Easy privacy (pEp) Key Sync      February 2019


                      do acceptHandshake(partner);
@ -389,9 +389,9 @@ Internet-Draft     pretty Easy privacy (pEp) Key Sync          June 2018



 Birk & Marques          Expires December 29, 2018               [Page 7]
 Birk & Marques           Expires August 8, 2019                 [Page 7]

 Internet-Draft     pretty Easy privacy (pEp) Key Sync          June 2018
 Internet-Draft     pretty Easy privacy (pEp) Key Sync      February 2019


         }
@ -445,9 +445,9 @@ Internet-Draft     pretty Easy privacy (pEp) Key Sync          June 2018



 Birk & Marques          Expires December 29, 2018               [Page 8]
 Birk & Marques           Expires August 8, 2019                 [Page 8]

 Internet-Draft     pretty Easy privacy (pEp) Key Sync          June 2018
 Internet-Draft     pretty Easy privacy (pEp) Key Sync      February 2019


   features.  Readers are advised to note that other implementations may
@ -460,7 +460,29 @@ Internet-Draft     pretty Easy privacy (pEp) Key Sync          June 2018
   more mature.  It is up to the individual working groups to use this
   information as they see fit."

   [[ TODO ]]
 8.2.  Current software implementing pEp

   The following software implementing the pEp protocols (to varying
   degrees) already exists:

   o  pEp for Outlook as add-on for Microsoft Outlook, release
      [SRC.pepforoutlook]

   o  pEp for Android (based on a fork of the K9 MUA), release
      [SRC.pepforandroid]

   o  Enigmail/pEp as add-on for Mozilla Thunderbird, release
      [SRC.enigmailpep]

   o  pEp for iOS (implemented in a new MUA), beta [SRC.pepforios]

   pEp for Android, iOS and Outlook are provided by pEp Security, a
   commercial entity specializing in end-user software implementing pEp
   while Enigmail/pEp is pursued as community project, supported by the
   pEp Foundation.

   All software is available as Free Software and published also in
   source form.

 9.  Acknowledgements

@ -472,15 +494,22 @@ Internet-Draft     pretty Easy privacy (pEp) Key Sync          June 2018
   and extended with funding by the Internet Society's Beyond the Net
   Programme on standardizing pEp.  [ISOC.bnet]








 Birk & Marques           Expires August 8, 2019                 [Page 9]

 Internet-Draft     pretty Easy privacy (pEp) Key Sync      February 2019


 10.  References

 10.1.  Normative References

   [I-D.birk-pep]
              Birk, V., Marques, H., and S. Shelburn, "pretty Easy
              privacy (pEp): Privacy by Default", draft-birk-pep-02
              (work in progress), June 2018.

   [RFC2119]  Bradner, S., "Key words for use in RFCs to Indicate
              Requirement Levels", BCP 14, RFC 2119,
              DOI 10.17487/RFC2119, March 1997,
@ -490,77 +519,23 @@ Internet-Draft     pretty Easy privacy (pEp) Key Sync          June 2018
              FYI 36, RFC 4949, DOI 10.17487/RFC4949, August 2007,
              <https://www.rfc-editor.org/info/rfc4949>.

   [RFC5322]  Resnick, P., Ed., "Internet Message Format", RFC 5322,
              DOI 10.17487/RFC5322, October 2008,
              <https://www.rfc-editor.org/info/rfc5322>.

   [RFC7435]  Dukhovni, V., "Opportunistic Security: Some Protection
              Most of the Time", RFC 7435, DOI 10.17487/RFC7435,
              December 2014, <https://www.rfc-editor.org/info/rfc7435>.




 Birk & Marques          Expires December 29, 2018               [Page 9]

 Internet-Draft     pretty Easy privacy (pEp) Key Sync          June 2018


 10.2.  Informative References

   [E-D.birk-pep-email]
              Birk, V. and H. Marques, "pretty Easy privacy (pEp):
              Secure and Trusted Email Communication", June 2018,
              <https://pep.foundation/dev/repos/internet-
              drafts/file/tip/pep-email/draft-birk-pep-email-NN.txt>.

              Early draft

   [E-D.birk-pep-handshake]
              Marques, H., "pretty Easy privacy (pEp): Contact
              Authentication through Handshake", June 2018,
              <https://pep.foundation/dev/repos/internet-
              drafts/file/tip/pep-handshake/
              draft-marques-pep-handshake-00.txt>.

              Early draft

   [E-D.birk-pep-keysync]
              Birk, V. and H. Marques, "pretty Easy privacy (pEp): Key
              Synchronization Protocol", June 2018,
              <https://pep.foundation/dev/repos/internet-
              drafts/file/tip/pep-keysync/
              draft-birk-pep-keysync-NN.txt>.

              Early draft

   [E-D.birk-pep-trust-rating]
              Birk, V. and H. Marques, "pretty Easy privacy (pEp): Trust
              Rating System", June 2018,
              <https://pep.foundation/trac/browser/internet-drafts/pep-
              rating/draft-marques-pep-rating-00.txt>.

              Early draft

   [I-D.birk-pep-trustwords]
              Birk, V., Marques, H., and B. Hoeneisen, "IANA
              Registration of Trustword Lists: Guide, Template and IANA
              Considerations", draft-birk-pep-trustwords-02 (work in
              progress), June 2018.










 Birk & Marques          Expires December 29, 2018              [Page 10]

 Internet-Draft     pretty Easy privacy (pEp) Key Sync          June 2018

   [I-D.marques-pep-handshake]
              Marques, H. and B. Hoeneisen, "pretty Easy privacy (pEp):
              Contact and Channel Authentication through Handshake",
              draft-marques-pep-handshake-01 (work in progress), October
              2018.

   [ISOC.bnet]
              Simao, I., "Beyond the Net. 12 Innovative Projects
@ -570,54 +545,35 @@ Internet-Draft     pretty Easy privacy (pEp) Key Sync          June 2018
              blog/2017/06/12-innovative-projects-selected-for-beyond-
              the-net-funding/>.

   [RFC4880]  Callas, J., Donnerhacke, L., Finney, H., Shaw, D., and R.
              Thayer, "OpenPGP Message Format", RFC 4880,
              DOI 10.17487/RFC4880, November 2007,
              <https://www.rfc-editor.org/info/rfc4880>.

   [RFC5321]  Klensin, J., "Simple Mail Transfer Protocol", RFC 5321,
              DOI 10.17487/RFC5321, October 2008,
              <https://www.rfc-editor.org/info/rfc5321>.

   [RFC7258]  Farrell, S. and H. Tschofenig, "Pervasive Monitoring Is an
              Attack", BCP 188, RFC 7258, DOI 10.17487/RFC7258, May
              2014, <https://www.rfc-editor.org/info/rfc7258>.

   [RFC7942]  Sheffer, Y. and A. Farrel, "Improving Awareness of Running
              Code: The Implementation Status Section", BCP 205,
              RFC 7942, DOI 10.17487/RFC7942, July 2016,
              <https://www.rfc-editor.org/info/rfc7942>.

   [SRC.enigmailpep]
              "Source code for Enigmail/pEp", June 2018,
              "Source code for Enigmail/pEp", July 2018,
              <https://enigmail.net/index.php/en/download/source-code>.

   [SRC.pepcore]
              "Core source code and reference implementation of pEp
              (engine and adapters)", June 2018,
              <https://pep.foundation/dev/>.



 Birk & Marques           Expires August 8, 2019                [Page 10]

 Internet-Draft     pretty Easy privacy (pEp) Key Sync      February 2019


   [SRC.pepforandroid]
              "Source code for pEp for Android", June 2018,
              "Source code for pEp for Android", July 2018,
              <https://pep-security.lu/gitlab/android/pep>.

   [SRC.pepforios]
              "Source code for pEp for iOS", June 2018,
              "Source code for pEp for iOS", July 2018,
              <https://pep-security.ch/dev/repos/pEp_for_iOS/>.

   [SRC.pepforoutlook]
              "Source code for pEp for Outlook", June 2018,
              "Source code for pEp for Outlook", July 2018,
              <https://pep-security.lu/dev/repos/pEp_for_Outlook/>.





 Birk & Marques          Expires December 29, 2018              [Page 11]

 Internet-Draft     pretty Easy privacy (pEp) Key Sync          June 2018


 Appendix A.  Excerpts from the pEp Reference Implementation

   This section provides excerpts of the running code from the pEp
@ -631,6 +587,8 @@ Appendix B.  Open Issues
   [[ RFC Editor: This section should be empty and is to be removed
   before publication ]]

   o  Include shared file (cf. other drafts)

   o  Major update

   o  Verify Dummy Sections
@ -649,6 +607,17 @@ Appendix B.  Open Issues

   o  Check List of Authors

   o  shorten overlong lines in code examples





 Birk & Marques           Expires August 8, 2019                [Page 11]

 Internet-Draft     pretty Easy privacy (pEp) Key Sync      February 2019


 Authors' Addresses

   Volker Birk
@ -661,19 +630,6 @@ Authors' Addresses
   URI:   https://pep.foundation/










 Birk & Marques          Expires December 29, 2018              [Page 12]

 Internet-Draft     pretty Easy privacy (pEp) Key Sync          June 2018


   Hernani Marques
   pEp Foundation
   Oberer Graben 4
@ -713,16 +669,4 @@ Internet-Draft     pretty Easy privacy (pEp) Key Sync          June 2018















 Birk & Marques          Expires December 29, 2018              [Page 13]
 Birk & Marques           Expires August 8, 2019                [Page 12]
--- a/pep-keysync/draft-birk-pep-keysync.mkd
+++ b/pep-keysync/draft-birk-pep-keysync.mkd
@ -10,82 +10,30 @@ stand_alone: yes
 pi: [toc, sortrefs, symrefs, comments]

 author:
  -
    ins: V. Birk
    name: Volker Birk
    org: pEp Foundation
    street: Oberer Graben 4
    city: CH-8400 Winterthur
    country: Switzerland
    email: volker.birk@pep.foundation
    uri: https://pep.foundation/
  -
    ins: H. Marques
    name: Hernani Marques
    org: pEp Foundation
    street: Oberer Graben 4
    city: CH-8400 Winterthur
    country: Switzerland
    email: hernani.marques@pep.foundation
    uri: https://pep.foundation/
 {::include ../shared/author_tags/volker_birk.mkd}
 {::include ../shared/author_tags/hernani_marques.mkd}

 normative:
  RFC2119:
  RFC4949:
  RFC5322:
 #  RFC5322:
  RFC7435:
  I-D.birk-pep:
 #  I-D.birk-pep:


 informative:
  RFC4880:
  RFC5321:
  RFC7258:
 #  RFC4880:
 #  RFC5321:
 #  RFC7258:
  RFC7942:
  I-D.marques-pep-email:
 #  I-D.marques-pep-email:
  I-D.birk-pep-trustwords:
  I-D.marques-pep-rating:
 #  I-D.marques-pep-rating:
  I-D.marques-pep-handshake:
  E-D.birk-pep-keysync:
    target: https://pep.foundation/dev/repos/internet-drafts/file/tip/pep-keysync/draft-birk-pep-keysync-NN.txt
    title: "pretty Easy privacy (pEp): Key Synchronization Protocol"
    author:
      -
        name: Volker Birk
        ins: V. Birk
      -
        name: Hernani Marques
        ins: H. Marques
    date: 2018-06
    ann: Early draft
  SRC.pepcore:
    target: https://pep.foundation/dev/
    title: Core source code and reference implementation of pEp (engine and adapters)
    date: 2018-07
  SRC.pepforandroid:
    target: https://pep-security.lu/gitlab/android/pep
    title: Source code for pEp for Android
    date: 2018-07
  SRC.pepforios:
    target: https://pep-security.ch/dev/repos/pEp_for_iOS/
    title: Source code for pEp for iOS
    date: 2018-07
  SRC.pepforoutlook:
    target: https://pep-security.lu/dev/repos/pEp_for_Outlook/
    title: Source code for pEp for Outlook
    date: 2018-07
  SRC.enigmailpep:
    target: https://enigmail.net/index.php/en/download/source-code
    title: Source code for Enigmail/pEp
    date: 2018-07
  ISOC.bnet:
    target: https://www.internetsociety.org/blog/2017/06/12-innovative-projects-selected-for-beyond-the-net-funding/
    title: "Beyond the Net. 12 Innovative Projects Selected for Beyond the Net Funding. Implementing Privacy via Mass Encryption: Standardizing pretty Easy privacy’s protocols"
    author:
      name: Ilda Simao
      ins: I. Simao
    date: 2017-06

 # {::include ../shared/references/ed-keysync.mkd}
 {::include ../shared/references/isoc-btn.mkd}
 {::include ../shared/references/implementation-status.mkd}

 --- abstract
 5-10 lines of abstract, mostly 20 lines.
@ -108,22 +56,11 @@ pEp Sync protocol.

 # Terms

 The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT",
 "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this
 document are to be interpreted as described in {{RFC2119}}.

 * Handshake: The process when Alice -- e.g. in-person or via phone --
  contacts Bob to verify Trustwords (or by fallback: fingerprints) is
  called handshake. {{I-D.marques-pep-handshake}}

 * Trustwords: A scalar-to-word representation of 16-bit numbers (0 to
  65535) to natural language words. When doing a handshake, peers are
  shown combined Trustwords of both public keys involved to ease the
  comparison. {{I-D.birk-pep-trustwords}}

 * Trust on First Use (TOFU): cf. {{RFC7435}}

 * Man-in-the-middle attack (MITM): cf. {{RFC4949}}
 {::include ../shared/text-blocks/key-words-rfc2119.mkd}
 {::include ../shared/text-blocks/handshake.mkd}
 {::include ../shared/text-blocks/trustwords.mkd}
 {::include ../shared/text-blocks/tofu.mkd}
 {::include ../shared/text-blocks/mitm.mkd}

 * Device Group: All devices that share a common mailbox to exchange user
  keys, trust, calendar and other information.
@ -399,31 +336,8 @@ ASN.1 reference implementation from asn1/devicegroup.asn1:
 \[\[ TODO \]\]


 # Implementation Status

 ## Introduction
 {::include ../shared/text-blocks/implementation-status.mkd}

 This section records the status of known implementations of the
 protocol defined by this specification at the time of posting of this
 Internet-Draft, and is based on a proposal described in {{RFC7942}}.
 The description of implementations in this section is intended to
 assist the IETF in its decision processes in progressing drafts to
 RFCs. Please note that the listing of any individual implementation
 here does not imply endorsement by the IETF. Furthermore, no effort
 has been spent to verify the information presented here that was
 supplied by IETF contributors.  This is not intended as, and must not
 be construed to be, a catalog of available implementations or their
 features. Readers are advised to note that other implementations may
 exist.

 According to {{RFC7942}}, "\[...\] this will allow reviewers and
 working groups to assign due consideration to documents that have the
 benefit of running code, which may serve as evidence of valuable
 experimentation and feedback that have made the implemented protocols
 more mature. It is up to the individual working groups to use this
 information as they see fit."

 \[\[ TODO \]\]

 # Acknowledgements

@ -476,3 +390,5 @@ reference implementation pEp engine (C99 programming language).
 * Remove unused Terms

 * Check List of Authors

 * shorten overlong lines in code examples
--- a/pep-rating/Makefile
+++ b/pep-rating/Makefile
@ -8,7 +8,21 @@ OUTPUTS = $(DRAFT).xml $(DRAFT).txt $(DRAFT).html

 all: $(OUTPUTS)

 $(DRAFT).xml: $(NAME).mkd
 $(DRAFT).xml: $(NAME).mkd \
 	../shared/author_tags/hernani_marques.mkd \
 	../shared/author_tags/bernie_hoeneisen.mkd \
 	../shared/references/ed-keysync.mkd \
 	../shared/references/isoc-btn.mkd \
 	../shared/references/implementation-status.mkd \
 	../shared/text-blocks/key-words-rfc2119.mkd \
 	../shared/text-blocks/handshake.mkd \
 	../shared/text-blocks/trustwords.mkd \
 	../shared/text-blocks/tofu.mkd \
 	../shared/text-blocks/mitm.mkd \
 	../shared/text-blocks/implementation-status.mkd \
 	# ../shared/ascii-arts/basic-msg-flow.mkd \
 	# ../shared/ascii-arts/pep_id_system.mkd \
 	# to match backslash at the end of the previous line
 	kramdown-rfc2629 $(NAME).mkd > $(DRAFT).xml 	

 $(DRAFT).txt: $(DRAFT).xml
--- a/pep-rating/draft-marques-pep-rating.mkd
+++ b/pep-rating/draft-marques-pep-rating.mkd
@ -10,26 +10,8 @@ stand_alone: yes
 pi: [toc, sortrefs, symrefs, comments]

 author:
   -
    ins: H. Marques
    name: Hernani Marques
    org: pEp Foundation
    street: Oberer Graben 4
    city: CH-8400 Winterthur
    country: Switzerland
    email: hernani.marques@pep.foundation
    uri: https://pep.foundation/
   -
    ins: B. Hoeneisen
    name: Bernie Hoeneisen
    org: Ucom Standards Track Solutions GmbH
    abbrev: Ucom.ch
    street: ""
    city: CH-8046 Zuerich
    country: Switzerland
    phone: "+41 44 500 52 44"
    email: bernie@ietf.hoeneisen.ch (bernhard.hoeneisen AT ucom.ch)
    uri: https://ucom.ch/
 {::include ../shared/author_tags/hernani_marques.mkd}
 {::include ../shared/author_tags/bernie_hoeneisen.mkd}

 normative:
  RFC2119:
@ -43,50 +25,10 @@ informative:
 #   RFC4880:
 #   RFC5321:
 #   RFC7258:
  RFC7942:
  I-D.marques-pep-email:
 #  I-D.marques-pep-email:
  I-D.birk-pep-trustwords:
 #   I-D.marques-pep-rating:
  I-D.marques-pep-handshake:
 #   E-D.birk-pep-keysync:
 #     target: https://pep.foundation/dev/repos/internet-drafts/file/tip/pep-keysync/draft-birk-pep-keysync-NN.txt
 #     title: "pretty Easy privacy (pEp): Key Synchronization Protocol"
 #     author:
 #       -
 #         name: Volker Birk
 #         ins: V. Birk
 #       -
 #         name: Hernani Marques
 #         ins: H. Marques
 #     date: 2018-06
 #     ann: Early draft
 #   SRC.pepcore:
 #     target: https://pep.foundation/dev/
 #     title: Core source code and reference implementation of pEp (engine and adapters)
 #     date: 2018-07
  SRC.pepforandroid:
    target: https://pep-security.lu/gitlab/android/pep
    title: Source code for pEp for Android
    date: 2018-07
  SRC.pepforios:
    target: https://pep-security.ch/dev/repos/pEp_for_iOS/
    title: Source code for pEp for iOS
    date: 2018-07
  SRC.pepforoutlook:
    target: https://pep-security.lu/dev/repos/pEp_for_Outlook/
    title: Source code for pEp for Outlook
    date: 2018-07
  SRC.enigmailpep:
    target: https://enigmail.net/index.php/en/download/source-code
    title: Source code for Enigmail/pEp
    date: 2018-07
  ISOC.bnet:
    target: https://www.internetsociety.org/blog/2017/06/12-innovative-projects-selected-for-beyond-the-net-funding/
    title: "Beyond the Net. 12 Innovative Projects Selected for Beyond the Net Funding. Implementing Privacy via Mass Encryption: Standardizing pretty Easy privacy’s protocols"
    author:
      name: Ilda Simao
      ins: I. Simao
    date: 2017-06
  GNUnet:
    target: https://grothoff.org/christian/habil.pdf
    title: "The GNUnet System"
@ -95,6 +37,10 @@ informative:
      ins: C. Grothoff
    date: 2017-10-07

 # {::include ../shared/references/ed-keysync.mkd}
 {::include ../shared/references/isoc-btn.mkd}
 {::include ../shared/references/implementation-status.mkd}

 --- abstract

 In many Opportunistic Security scenarios end-to-end encryption is
@ -180,9 +126,12 @@ authentication.

 # Terms

 ~~~~~~~~~~
 {::include ../shared/terms.mkd}
 ~~~~~~~~~~
 {::include ../shared/text-blocks/key-words-rfc2119.mkd}
 {::include ../shared/text-blocks/handshake.mkd}
 {::include ../shared/text-blocks/trustwords.mkd}
 {::include ../shared/text-blocks/tofu.mkd}
 {::include ../shared/text-blocks/mitm.mkd}


 # Per-Message Privacy Rating

@ -233,7 +182,7 @@ semantics) as follows:
 |       7 to 9 |          2 | green       |

 This mapping is used in current pEp implementations to signal the
 Privacy Status (cf. {{running-code}}).
 Privacy Status (cf. {{current-software-implementing-pep}}).

 ## Semantics of Color and Rating Codes

@ -332,43 +281,9 @@ mistrusted.

 \[\[ TODO \]\]

 # Implementation Status

 ## Introduction

 This section records the status of known implementations of the
 protocol defined by this specification at the time of posting of this
 Internet-Draft, and is based on a proposal described in {{RFC7942}}.
 The description of implementations in this section is intended to
 assist the IETF in its decision processes in progressing drafts to
 RFCs. Please note that the listing of any individual implementation
 here does not imply endorsement by the IETF. Furthermore, no effort
 has been spent to verify the information presented here that was
 supplied by IETF contributors.  This is not intended as, and must not
 be construed to be, a catalog of available implementations or their
 features. Readers are advised to note that other implementations may
 exist.

 According to {{RFC7942}}, "\[...\] this will allow reviewers and
 working groups to assign due consideration to documents that have the
 benefit of running code, which may serve as evidence of valuable
 experimentation and feedback that have made the implemented protocols
 more mature. It is up to the individual working groups to use this
 information as they see fit."

 ## Running Code

 In pEp for email {{I-D.marques-pep-email}} contexts, pEp rating codes
 are already implemented for the following platforms:

 * Android, in pEp for Android -- release {{SRC.pepforandroid}}

 * Enigmail, in the Enigmail/pEp mode -- release used for new Enigmail
  users of version 2.0 {{SRC.enigmailpep}}
  
 * iOS, in pEp for iOS -- not yet released {{SRC.pepforios}}
 {::include ../shared/text-blocks/implementation-status.mkd}

 * Outlook, in pEp for Outlook -- commercial release {{SRC.pepforoutlook}}

 # Acknowledgements

--- a/pep-trustwords/Makefile
+++ b/pep-trustwords/Makefile
@ -8,7 +8,22 @@ OUTPUTS = $(DRAFT).xml $(DRAFT).txt $(DRAFT).html

 all: $(OUTPUTS)

 $(DRAFT).xml: $(NAME).mkd
 $(DRAFT).xml: $(NAME).mkd \
 	../shared/author_tags/volker_birk.mkd \
 	../shared/author_tags/hernani_marques.mkd \
 	../shared/author_tags/bernie_hoeneisen.mkd \
 	../shared/references/ed-keysync.mkd \
 	../shared/references/isoc-btn.mkd \
 	../shared/text-blocks/key-words-rfc2119.mkd \
 	../shared/text-blocks/handshake.mkd \
 	../shared/text-blocks/mitm.mkd \
 	../shared/text-blocks/trustwords.mkd \
 	# ../shared/text-blocks/tofu.mkd \
 	# ../shared/references/implementation-status.mkd \
 	# ../shared/text-blocks/implementation-status.mkd \
 	# ../shared/ascii-arts/basic-msg-flow.mkd \
 	# ../shared/ascii-arts/pep_id_system.mkd \
 	# to match backslash at the end of the previous line
 	kramdown-rfc2629 $(NAME).mkd > $(DRAFT).xml 	

 $(DRAFT).txt: $(DRAFT).xml
--- a/pep-trustwords/draft-birk-pep-trustwords.mkd
+++ b/pep-trustwords/draft-birk-pep-trustwords.mkd
@ -11,36 +11,9 @@ stand_alone: yes
 pi: [toc, sortrefs, symrefs, comments]

 author:
  -
    ins: V. Birk
    name: Volker Birk
    org: pEp Foundation
    street: Oberer Graben 4
    city: CH-8400 Winterthur
    country: Switzerland
    email: volker.birk@pep.foundation
    uri: https://pep.foundation/
  -
    ins: H. Marques
    name: Hernani Marques
    org: pEp Foundation
    street: Oberer Graben 4
    city: CH-8400 Winterthur
    country: Switzerland
    email: hernani.marques@pep.foundation
    uri: https://pep.foundation/
  -
   ins: B. Hoeneisen
   name: Bernie Hoeneisen
   org: Ucom Standards Track Solutions GmbH
   abbrev: Ucom.ch
   street: ""
   city: CH-8046 Zuerich
   country: Switzerland
   phone: "+41 44 500 52 44"
   email: bernie@ietf.hoeneisen.ch (bernhard.hoeneisen AT ucom.ch)
   uri: https://ucom.ch/

 {::include ../shared/author_tags/volker_birk.mkd}
 {::include ../shared/author_tags/hernani_marques.mkd}
 {::include ../shared/author_tags/bernie_hoeneisen.mkd}

 normative:
  RFC2119:
@ -63,53 +36,18 @@ informative:
 #   I-D.birk-pep-trustwords:
 #   I-D.marques-pep-rating:
  I-D.marques-pep-handshake:
  E-D.birk-pep-keysync:
    target: https://pep.foundation/dev/repos/internet-drafts/file/tip/pep-keysync/draft-birk-pep-keysync-NN.txt
    title: "pretty Easy privacy (pEp): Key Synchronization Protocol"
    author:
      -
        name: Volker Birk
        ins: V. Birk
      -
        name: Hernani Marques
        ins: H. Marques
    date: 2018-06
    ann: Early draft
 #   SRC.pepcore:
 #     target: https://pep.foundation/dev/
 #     title: Core source code and reference implementation of pEp (engine and adapters)
 #     date: 2018-07
 #   SRC.pepforandroid:
 #     target: https://pep-security.lu/gitlab/android/pep
 #     title: Source code for pEp for Android
 #     date: 2018-07
 #   SRC.pepforios:
 #     target: https://pep-security.ch/dev/repos/pEp_for_iOS/
 #     title: Source code for pEp for iOS
 #     date: 2018-07
 #   SRC.pepforoutlook:
 #     target: https://pep-security.lu/dev/repos/pEp_for_Outlook/
 #     title: Source code for pEp for Outlook
 #     date: 2018-07
 #   SRC.enigmailpep:
 #     target: https://enigmail.net/index.php/en/download/source-code
 #     title: Source code for Enigmail/pEp
 #     date: 2018-07
  PGP.wl:
    target: https://en.wikipedia.org/w/index.php?title=PGP_word_list&amp;oldid=749481933
    title: PGP word list
    date: 2017-11
  ISOC.bnet:
    target: https://www.internetsociety.org/blog/2017/06/12-innovative-projects-selected-for-beyond-the-net-funding/
    title: "Beyond the Net. 12 Innovative Projects Selected for Beyond the Net Funding. Implementing Privacy via Mass Encryption: Standardizing pretty Easy privacy’s protocols"
    author:
      name: Ilda Simao
      ins: I. Simao
    date: 2017-06
  ISO693:
    target: https://www.iso.org/iso-639-language-codes.html
    title: "Language codes - ISO 639"

 {::include ../shared/references/ed-keysync.mkd}
 {::include ../shared/references/isoc-btn.mkd}
 # {::include ../shared/references/implementation-status.mkd}

 --- abstract

 This document specifies the IANA Registration Guidelines for
@ -158,24 +96,12 @@ browsers or in block chain applications for crypto currencies.

 # Terms

 The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT",
 "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this
 document are to be interpreted as described in {{RFC2119}}.

 * Handshake: The process when Alice -- e.g. in-person or via phone --
  contacts Bob to verify Trustwords (or by fallback: fingerprints) is
  called handshake. {{I-D.marques-pep-handshake}}

 <!--
 * Trustwords: A scalar-to-word representation of 16-bit numbers (0 to
  65535) to natural language words. When doing a handshake, peers are
  shown combined Trustwords of both public keys involved to ease the
  comparison. {{I-D.birk-pep-trustwords}}

 * Trust on First Use (TOFU): cf. {{RFC7435}}
 -->
 {::include ../shared/text-blocks/key-words-rfc2119.mkd}
 {::include ../shared/text-blocks/handshake.mkd}
 <!-- {::include ../shared/text-blocks/trustwords.mkd} -->
 <!-- {::include ../shared/text-blocks/tofu.mkd} -->
 {::include ../shared/text-blocks/mitm.mkd}

 * Man-in-the-middle attack (MITM): cf. {{RFC4949}}

 # The Concept of Trustword Mapping

--- a/pep/Makefile
+++ b/pep/Makefile
@ -8,7 +8,22 @@ OUTPUTS = $(DRAFT).xml $(DRAFT).txt $(DRAFT).html

 all: $(OUTPUTS)

 $(DRAFT).xml: $(NAME).mkd ../shared/pep_id_system.mkd
 $(DRAFT).xml: $(NAME).mkd \
 	../shared/author_tags/volker_birk.mkd \
 	../shared/author_tags/hernani_marques.mkd \
 	../shared/author_tags/shelburn.mkd \
 	../shared/references/ed-keysync.mkd \
 	../shared/references/isoc-btn.mkd \
 	../shared/references/implementation-status.mkd \
 	../shared/text-blocks/key-words-rfc2119.mkd \
 	../shared/text-blocks/handshake.mkd \
 	../shared/text-blocks/trustwords.mkd \
 	../shared/text-blocks/tofu.mkd \
 	../shared/text-blocks/mitm.mkd \
 	../shared/text-blocks/implementation-status.mkd \
 	../shared/ascii-arts/pep_id_system.mkd \
 	# ../shared/ascii-arts/basic-msg-flow.mkd \
 	# to match backslash at the end of the previous line
 	kramdown-rfc2629 $(NAME).mkd > $(DRAFT).xml 	

 $(DRAFT).txt: $(DRAFT).xml
--- a/pep/draft-birk-pep.mkd
+++ b/pep/draft-birk-pep.mkd
@ -10,33 +10,9 @@ stand_alone: yes
 pi: [toc, sortrefs, symrefs, comments]

 author:
  -
    ins: V. Birk
    name: Volker Birk
    org: pEp Foundation
    street: Oberer Graben 4
    city: CH-8400 Winterthur
    country: Switzerland
    email: volker.birk@pep.foundation
    uri: https://pep.foundation/
  -
    ins: H. Marques
    name: Hernani Marques
    org: pEp Foundation
    street: Oberer Graben 4
    city: CH-8400 Winterthur
    country: Switzerland
    email: hernani.marques@pep.foundation
    uri: https://pep.foundation/
  -
   ins: "S. Shelburn"
   name: Shelburn
   org: pEp Foundation
   street: Oberer Graben 4
   city: CH-8400 Winterthur
   country: Switzerland
   email: shelburn@pep.foundation
   uri: https://pep.foundation/
 {::include ../shared/author_tags/volker_birk.mkd}
 {::include ../shared/author_tags/hernani_marques.mkd}
 {::include ../shared/author_tags/shelburn.mkd}

 normative:
  RFC2119:
@ -49,50 +25,18 @@ informative:
  RFC7258:
  RFC7942:
 #  RFC8280:
  I-D.marques-pep-email:
 #  I-D.marques-pep-email:
  I-D.birk-pep-trustwords:
  I-D.marques-pep-rating:
  I-D.marques-pep-handshake:
  E-D.birk-pep-keysync:
    target: https://pep.foundation/dev/repos/internet-drafts/file/tip/pep-keysync/draft-birk-pep-keysync-NN.txt
    title: "pretty Easy privacy (pEp): Key Synchronization Protocol"
    author:
      -
        name: Volker Birk
        ins: V. Birk
      -
        name: Hernani Marques
        ins: H. Marques
    date: 2018-06
    ann: Early draft
  SRC.pepcore:
    target: https://pep.foundation/dev/
    title: Core source code and reference implementation of pEp (engine and adapters)
    date: 2018-07
  SRC.pepforandroid:
    target: https://pep-security.lu/gitlab/android/pep
    title: Source code for pEp for Android
    date: 2018-07
  SRC.pepforios:
    target: https://pep-security.ch/dev/repos/pEp_for_iOS/
    title: Source code for pEp for iOS
    date: 2018-07
  SRC.pepforoutlook:
    target: https://pep-security.lu/dev/repos/pEp_for_Outlook/
    title: Source code for pEp for Outlook
    date: 2018-07
  SRC.enigmailpep:
    target: https://enigmail.net/index.php/en/download/source-code
    title: Source code for Enigmail/pEp
    date: 2018-07
  ISOC.bnet:
    target: https://www.internetsociety.org/blog/2017/06/12-innovative-projects-selected-for-beyond-the-net-funding/
    title: "Beyond the Net. 12 Innovative Projects Selected for Beyond the Net Funding. Implementing Privacy via Mass Encryption: Standardizing pretty Easy privacy’s protocols"
    author:
      name: Ilda Simao
      ins: I. Simao
    date: 2017-06

 {::include ../shared/references/ed-keysync.mkd}
 {::include ../shared/references/isoc-btn.mkd}
 {::include ../shared/references/implementation-status.mkd}

 --- abstract

@ -163,7 +107,12 @@ in the most privacy-enhancing way possible.

 # Terms

 {::include ../shared/terms.mkd}
 {::include ../shared/text-blocks/key-words-rfc2119.mkd}
 {::include ../shared/text-blocks/handshake.mkd}
 {::include ../shared/text-blocks/trustwords.mkd}
 {::include ../shared/text-blocks/tofu.mkd}
 {::include ../shared/text-blocks/mitm.mkd}


 # Protocol's Core Design Principles

@ -256,6 +205,7 @@ about to be sent or were received with, respectively.
  users to be a good idea -- in a similar way as this happens to be
  the case for already popular Instant Messaging services.\]\]


 # pEp identity system

 In pEp, users MUST have the possibility to have different identities. 
@ -268,7 +218,7 @@ The different identities MUST NOT correlate with each other by default. On the
 other hand, combining different identities MUST be supported (to support
 aliases).

 {::include ../shared/pep_id_system.mkd}
 {::include ../shared/ascii-arts/pep_id_system.mkd}

 \[\[ TODO: Verify figure \[\]

@ -456,6 +406,7 @@ while providing little to no additional privacy for the common
 cases of passive monitoring being carried out by corporations or
 state-level actors.


 # Privacy Status

 For end-users, the most important component of pEp, which MUST be made
@ -481,6 +432,7 @@ The detailed Privacy Status as an end-user element of the pEp Trust
 Rating system with all its states and respective representations to be
 followed is outlined in {{I-D.marques-pep-rating}}.


 # Options in pEp

 In this section a non-exhaustive selection of options is provided.
@ -550,6 +502,7 @@ implementations without Trustwords), it is REQUIRED that pEp
 implementers give the user the choice to show both peers' fingerprints
 instead of just their common Trustwords.


 # Security Considerations

 By attaching the sender's public key to outgoing messages, Trust on
@ -566,29 +519,9 @@ As the use of passphrases for private keys is not advised, devices
 themselves SHOULD use encryption.


 # Implementation Status

 ## Introduction
 {::include ../shared/text-blocks/implementation-status.mkd}

 This section records the status of known implementations of the
 protocol defined by this specification at the time of posting of this
 Internet-Draft, and is based on a proposal described in {{RFC7942}}.
 The description of implementations in this section is intended to
 assist the IETF in its decision processes in progressing drafts to
 RFCs. Please note that the listing of any individual implementation
 here does not imply endorsement by the IETF. Furthermore, no effort
 has been spent to verify the information presented here that was
 supplied by IETF contributors.  This is not intended as, and must not
 be construed to be, a catalog of available implementations or their
 features. Readers are advised to note that other implementations may
 exist.

 According to {{RFC7942}}, "\[...\] this will allow reviewers and
 working groups to assign due consideration to documents that have the
 benefit of running code, which may serve as evidence of valuable
 experimentation and feedback that have made the implemented protocols
 more mature. It is up to the individual working groups to use this
 information as they see fit."

 ## Reference implementation of pEp's core

@ -648,20 +581,7 @@ A selection of code excerpts from the pEp Engine reference
 implementation (encrypt message, decrypt message, and obtain
 trustwords) can be found in {{abstract-crypto-api-examples-1}}.

 ## Current software implementing pEp

 The following software implementing the pEp protocols (to varying
 degrees) already exists; it does not yet go beyond implementing pEp
 for email, which is described nearer in {{I-D.marques-pep-email}}:

 * pEp for Outlook as add-on for Microsoft Outlook, release {{SRC.pepforoutlook}}
 * pEp for Android (based on a fork of the K9 MUA), release {{SRC.pepforandroid}}
 * Enigmail/pEp as add-on for Mozilla Thunderbird, release {{SRC.enigmailpep}}
 * pEp for iOS (implemented in a new MUA), beta {{SRC.pepforios}}

 pEp for Android, iOS and Outlook are provided by pEp Security, a commercial
 entity specializing in end-user software implementing pEp while Enigmail/pEp 
 is pursued as community project, supported by the pEp Foundation.
 \[\[TODO: sort out order Here was chapter "Current software implementing pEp"\]\]

 # Notes

--- a/shared/ascii-arts/basic-msg-flow.mkd
+++ b/shared/ascii-arts/basic-msg-flow.mkd
--- a/shared/ascii-arts/pep_id_system.mkd
+++ b/shared/ascii-arts/pep_id_system.mkd
--- a/shared/author_tags/bernie_hoeneisen.mkd
+++ b/shared/author_tags/bernie_hoeneisen.mkd
@ -0,0 +1,12 @@

  -
    ins: B. Hoeneisen
    name: Bernie Hoeneisen
    org: Ucom Standards Track Solutions GmbH
    abbrev: Ucom.ch
    street: ""
    city: CH-8046 Zuerich
    country: Switzerland
    phone: "+41 44 500 52 44"
    email: bernie@ietf.hoeneisen.ch (bernhard.hoeneisen AT ucom.ch)
    uri: https://ucom.ch/
--- a/shared/author_tags/claudio_luck.mkd
+++ b/shared/author_tags/claudio_luck.mkd
@ -0,0 +1,10 @@

  -
    ins: C. Luck
    name: Claudio Luck
    org: pEp Foundation
    street: Oberer Graben 4
    city: CH-8400 Winterthur
    country: Switzerland
    email: claudio.luck@pep.foundation
    uri: https://pep.foundation/
--- a/shared/author_tags/hernani_marques.mkd
+++ b/shared/author_tags/hernani_marques.mkd
@ -0,0 +1,10 @@

  -
    ins: H. Marques
    name: Hernani Marques
    org: pEp Foundation
    street: Oberer Graben 4
    city: CH-8400 Winterthur
    country: Switzerland
    email: hernani.marques@pep.foundation
    uri: https://pep.foundation/
--- a/shared/author_tags/shelburn.mkd
+++ b/shared/author_tags/shelburn.mkd
@ -0,0 +1,10 @@

  -
   ins: "S. Shelburn"
   name: Shelburn
   org: pEp Foundation
   street: Oberer Graben 4
   city: CH-8400 Winterthur
   country: Switzerland
   email: shelburn@pep.foundation
   uri: https://pep.foundation/
--- a/shared/author_tags/volker_birk.mkd
+++ b/shared/author_tags/volker_birk.mkd
@ -0,0 +1,10 @@

  -
    ins: V. Birk
    name: Volker Birk
    org: pEp Foundation
    street: Oberer Graben 4
    city: CH-8400 Winterthur
    country: Switzerland
    email: volker.birk@pep.foundation
    uri: https://pep.foundation/
--- a/shared/references/ed-keysync.mkd
+++ b/shared/references/ed-keysync.mkd
@ -0,0 +1,12 @@
  E-D.birk-pep-keysync:
    target: https://pep.foundation/dev/repos/internet-drafts/file/tip/pep-keysync/draft-birk-pep-keysync-NN.txt
    title: "pretty Easy privacy (pEp): Key Synchronization Protocol"
    author:
      -
        name: Volker Birk
        ins: V. Birk
      -
        name: Hernani Marques
        ins: H. Marques
    date: 2018-06
    ann: Early draft
--- a/shared/references/implementation-status.mkd
+++ b/shared/references/implementation-status.mkd
--- a/shared/references/isoc-btn.mkd
+++ b/shared/references/isoc-btn.mkd
@ -0,0 +1,7 @@
  ISOC.bnet:
    target: https://www.internetsociety.org/blog/2017/06/12-innovative-projects-selected-for-beyond-the-net-funding/
    title: "Beyond the Net. 12 Innovative Projects Selected for Beyond the Net Funding. Implementing Privacy via Mass Encryption: Standardizing pretty Easy privacy’s protocols"
    author:
      name: Ilda Simao
      ins: I. Simao
    date: 2017-06
--- a/shared/terms.mkd
+++ b/shared/terms.mkd
@ -1,16 +0,0 @@