1 files changed, 129 insertions, 73 deletions

diff --git a/draft-schanzen-gns.txt b/draft-schanzen-gns.txt
index 9d62457..6d41ad3 100644
--- a/draft-schanzen-gns.txt
+++ b/draft-schanzen-gns.txt
@@ -85,11 +85,11 @@ Table of Contents
        6.2.5.  VPN . . . . . . . . . . . . . . . . . . . . . . . . .  18
        6.2.6.  NICK  . . . . . . . . . . . . . . . . . . . . . . . .  19
    7.  Zone Revocation . . . . . . . . . . . . . . . . . . . . . . .  19
-   8.  Determining the Root Zone and Zone Governance . . . . . . . .  21
-   9.  Security Considerations . . . . . . . . . . . . . . . . . . .  22
+   8.  Determining the Root Zone and Zone Governance . . . . . . . .  22
+   9.  Security Considerations . . . . . . . . . . . . . . . . . . .  23
    10. IANA Considerations . . . . . . . . . . . . . . . . . . . . .  23
-   11. Test Vectors  . . . . . . . . . . . . . . . . . . . . . . . .  23
-   12. Normative References  . . . . . . . . . . . . . . . . . . . .  25
+   11. Test Vectors  . . . . . . . . . . . . . . . . . . . . . . . .  24
+   12. Normative References  . . . . . . . . . . . . . . . . . . . .  26
    Authors' Addresses  . . . . . . . . . . . . . . . . . . . . . . .  27
 
 1.  Introduction
@@ -1073,6 +1073,16 @@ Internet-Draft             The GNU Name System             November 2019
    work.  The revocation message including the proof-of-work MAY be
    calculated ahead of time to support timely revocation.
 
+   For all occurences below, "scrypt" is the scrypt Password-based Key
+   Derivation Function as defined in [RFC7914] with the following
+   parameters set:
+
+            S := "gnunet-revocation-proof-of-work" /* Salt */
+            N := 2
+            r := 8 /* Block size */
+            p := 2 /* Parallelization parameter */
+            dkLen := 64 /* Intended output length in octets */
+
    The following the the basic data "REV" on which the proof-of work is
    calculated:
 
@@ -1096,12 +1106,30 @@ Internet-Draft             The GNU Name System             November 2019
 
    3.  Encrypt the REV data using K and IV.
 
-   4.  Derive the proof of work from the encrypted REV.
+   4.  Derive the proof of work from the encrypted REV and check against
+       the proof condition.
+
+   The first step in the PoW is a call to scrypt with the REV data as
+   password parameter to derive the initial key material K:
 
             K := scrypt (P := REV)
 
+
+
+
+Schanzenbach, et al.       Expires 13 May 2020                 [Page 20]
+
+Internet-Draft             The GNU Name System             November 2019
+
+
                                  Figure 16
 
+   The second step is to derive an initialization vector using a Hash-
+   based Key Derivation Function as defined in ([RFC5869]).
+   Specifically, HMAC-SHA512 is used for the extraction phase and HMAC-
+   SHA256 for the expansion phase.
+
+              STATUS QUO:
               PRK_aes := HKDF-Extract ("gnunet-proof-of-work-ivAES!",
                                        K[0,31])
               PRK_two := HKDF-Extract ("gnunet-proof-of-work-ivFISH",
@@ -1112,36 +1140,43 @@ Internet-Draft             The GNU Name System             November 2019
               IV_two := HKDF-Expand (PRK_two,
                                      "gnunet-revocation-proof-of-work,
                                      128 / 8)
-
-                                 Figure 17
+              ALTERNATIVE:
+              PRK := HKDF-Extract ("gnunet-proof-of-work-iv", K)
+              IV := HKDF-Expand (PRK, "gnunet-revocation-proof-of-work", 128 / 8);
 
 
+                                 Figure 17
 
-Schanzenbach, et al.       Expires 13 May 2020                 [Page 20]
-
-Internet-Draft             The GNU Name System             November 2019
-
+   We divide the resulting keying material "K" into a 256-bit AES
+   [RFC3826] key and a 256-bit TWOFISH [TWOFISH] key and use IV as
+   corresponding initialization vectors:
 
+              STATUS QUO:
               EREV := TWOFISH(K[0:31], IV_two,
                               AES(K[32:63], IV_aes, REV))
+              ALTERNATIVE:
+              EREV := TWOFISH(K[0:31], IV[16:31],
+                              AES(K[32:63], IV[0:15], REV))
+
 
                                  Figure 18
 
-   The above EREV data object is calculated with different values for
-   the "NONCE" in "REV" until the following inequality holds:
+   The above EREV data object is again derived using the scrypt
+   algorithm.  The proof of work is complete, if the following
+   inequality holds:
 
             scrypt(P := EREV) < 2^(39)-1
 
+
                                  Figure 19
 
-   For all occurences above, "scrypt" is the scrypt algorithm as defined
-   in [RFC7914] with the following parameters set:
 
-            S := "gnunet-revocation-proof-of-work" /* Salt */
-            N := 2
-            r := 8 /* Block size */
-            p := 2 /* Parallelization parameter */
-            dkLen := 64 /* Intended output length in octets */
+
+
+Schanzenbach, et al.       Expires 13 May 2020                 [Page 21]
+
+Internet-Draft             The GNU Name System             November 2019
+
 
 8.  Determining the Root Zone and Zone Governance
 
@@ -1169,15 +1204,6 @@ Internet-Draft             The GNU Name System             November 2019
 
    GNS clients SHOULD first try to interpret the top-level domain of a
    GNS name as a zone key.  For example. if the top-level domain is a
-
-
-
-
-Schanzenbach, et al.       Expires 13 May 2020                 [Page 21]
-
-Internet-Draft             The GNU Name System             November 2019
-
-
    Base32-encoded public zone key "zk", the root zone of the resolution
    process is implicitly given by the name:
 
@@ -1200,6 +1226,14 @@ Internet-Draft             The GNU Name System             November 2019
             => Entry zone: zk1
             => Name to resolve from entry zone: www.example
 
+
+
+
+Schanzenbach, et al.       Expires 13 May 2020                 [Page 22]
+
+Internet-Draft             The GNU Name System             November 2019
+
+
    Finally, additional "suffix to zone" mappings MAY be configured.
    Suffix to zone key mappings SHOULD be configurable through a local
    configuration file or database by the user or system administrator.
@@ -1223,17 +1257,6 @@ Internet-Draft             The GNU Name System             November 2019
 
    TODO
 
-
-
-
-
-
-
-Schanzenbach, et al.       Expires 13 May 2020                 [Page 22]
-
-Internet-Draft             The GNU Name System             November 2019
-
-
 10.  IANA Considerations
 
    IANA is requested to create an "GNU Name System Record Type"
@@ -1254,6 +1277,19 @@ Internet-Draft             The GNU Name System             November 2019
    Served", as described in [RFC8126].  IANA is requested to populate
    this registry as follows:
 
+
+
+
+
+
+
+
+
+Schanzenbach, et al.       Expires 13 May 2020                 [Page 23]
+
+Internet-Draft             The GNU Name System             November 2019
+
+
               Number   | Type            | Contact | References
               ---------+-----------------+---------+---------
               65536    | PKEY            | N/A     | [This.I-D]
@@ -1282,14 +1318,6 @@ Internet-Draft             The GNU Name System             November 2019
             zk (public zone key) :=
             dff911496d025d7e
             0885c03d19153e99
-
-
-
-Schanzenbach, et al.       Expires 13 May 2020                 [Page 23]
-
-Internet-Draft             The GNU Name System             November 2019
-
-
             4f213f23ea719eca
             17fc32dc410e082e
 
@@ -1310,6 +1338,14 @@ Internet-Draft             The GNU Name System             November 2019
             0017c802f7d32e18
 
             q (query key) :=
+
+
+
+Schanzenbach, et al.       Expires 13 May 2020                 [Page 24]
+
+Internet-Draft             The GNU Name System             November 2019
+
+
             6fce4deddc5ad681
             f4e29a3310767e3b
             8b38bc1b276ce2ba
@@ -1339,13 +1375,6 @@ Internet-Draft             The GNU Name System             November 2019
             071be189a9d236f9
             b4a3654bb8c281d4
 
-
-
-Schanzenbach, et al.       Expires 13 May 2020                 [Page 24]
-
-Internet-Draft             The GNU Name System             November 2019
-
-
             RDATA :=
             0000000100059412 RR COUNT | EXPIRA-
             09ddea0f00000014  -TION    | DATA SIZE (20)
@@ -1365,6 +1394,14 @@ Internet-Draft             The GNU Name System             November 2019
             afc99ba9c5a3bb54
             07e731a34680ee33
             ae0de7bfeda7d2b7
+
+
+
+Schanzenbach, et al.       Expires 13 May 2020                 [Page 25]
+
+Internet-Draft             The GNU Name System             November 2019
+
+
             8c6b854a008b1b54
             10df4f39f5ba9f46____________
             8cb514a56c0eaae0 zk_h
@@ -1393,15 +1430,6 @@ Internet-Draft             The GNU Name System             November 2019
               specification", STD 13, RFC 1035, DOI 10.17487/RFC1035,
               November 1987, <https://www.rfc-editor.org/info/rfc1035>.
 
-
-
-
-
-Schanzenbach, et al.       Expires 13 May 2020                 [Page 25]
-
-Internet-Draft             The GNU Name System             November 2019
-
-
    [RFC2782]  Gulbrandsen, A., Vixie, P., and L. Esibov, "A DNS RR for
               specifying the location of services (DNS SRV)", RFC 2782,
               DOI 10.17487/RFC2782, February 2000,
@@ -1422,6 +1450,14 @@ Internet-Draft             The GNU Name System             November 2019
               DOI 10.17487/RFC3826, June 2004,
               <https://www.rfc-editor.org/info/rfc3826>.
 
+
+
+
+Schanzenbach, et al.       Expires 13 May 2020                 [Page 26]
+
+Internet-Draft             The GNU Name System             November 2019
+
+
    [RFC5869]  Krawczyk, H. and P. Eronen, "HMAC-based Extract-and-Expand
               Key Derivation Function (HKDF)", RFC 5869,
               DOI 10.17487/RFC5869, May 2010,
@@ -1450,14 +1486,6 @@ Internet-Draft             The GNU Name System             November 2019
               for Security", RFC 7748, DOI 10.17487/RFC7748, January
               2016, <https://www.rfc-editor.org/info/rfc7748>.
 
-
-
-
-Schanzenbach, et al.       Expires 13 May 2020                 [Page 26]
-
-Internet-Draft             The GNU Name System             November 2019
-
-
    [RFC8032]  Josefsson, S. and I. Liusvaara, "Edwards-Curve Digital
               Signature Algorithm (EdDSA)", RFC 8032,
               DOI 10.17487/RFC8032, January 2017,
@@ -1477,6 +1505,15 @@ Internet-Draft             The GNU Name System             November 2019
 
 Authors' Addresses
 
+
+
+
+
+Schanzenbach, et al.       Expires 13 May 2020                 [Page 27]
+
+Internet-Draft             The GNU Name System             November 2019
+
+
    Martin Schanzenbach
    GNUnet e.V.
    Boltzmannstrasse 3
@@ -1509,4 +1546,23 @@ Authors' Addresses
 
 
 
-Schanzenbach, et al.       Expires 13 May 2020                 [Page 27]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Schanzenbach, et al.       Expires 13 May 2020                 [Page 28]