1 files changed, 34 insertions, 34 deletions

diff --git a/draft-schanzen-gns.txt b/draft-schanzen-gns.txt
index baa1f7d..dd3d682 100644
--- a/draft-schanzen-gns.txt
+++ b/draft-schanzen-gns.txt
@@ -92,9 +92,10 @@ Table of Contents
    A zone in GNS is defined by a public/private ECC key pair (x,y),
    where x is the private key and y the public key.  The keys are
    constructed using the Curve25519 ECC scheme as defined in [RFC7748].
-   The schemes defines that "y := x*P".  The public key is used to
-   uniquely identify and refer to the zone.  Records published in the
-   zone are signed using a private key derived from the private key as
+   The schemes defines that "y := x*P" where "P" is the generator of the
+   respective elliptic curve.  The public key "y" is used to uniquely
+   identify and refer to the zone.  Records published in the zone are
+   signed using a private key derived from the private key "d" as
    described in Section 4.
 
 3.  Resource records
@@ -108,7 +109,6 @@ Table of Contents
 
 
 
-
 Schanzenbach             Expires 24 January 2020                [Page 2]
 
 Internet-Draft             The GNU Name System                 July 2019
@@ -140,7 +140,8 @@ Internet-Draft             The GNU Name System                 July 2019
 
    TYPE  The resource record type.  This type can be one of the GNS
       resource records as defined in Section 3.2 or a DNS record type as
-      defined in [RFC1035].
+      defined in [RFC1035] or any of the complementary standardized DNS
+      resource record types.
 
    FLAGS  Resource record flags.  Flags are defined in Section 3.1.
 
@@ -155,13 +156,12 @@ Internet-Draft             The GNU Name System                 July 2019
 
    The a PKEY DATA entry has the following format:
 
-               0     8     16    24    32    40    48    56
-               +-----+-----+-----+-----+-----+-----+-----+-----+
-               |                   PUBLIC KEY                  |
-               |                                               |
-               |                                               |
-               |                                               |
-               +-----+-----+-----+-----+-----+-----+-----+-----+
+
+
+
+
+
+
 
 
 
@@ -170,6 +170,14 @@ Schanzenbach             Expires 24 January 2020                [Page 3]
 Internet-Draft             The GNU Name System                 July 2019
 
 
+               0     8     16    24    32    40    48    56
+               +-----+-----+-----+-----+-----+-----+-----+-----+
+               |                   PUBLIC KEY                  |
+               |                                               |
+               |                                               |
+               |                                               |
+               +-----+-----+-----+-----+-----+-----+-----+-----+
+
                                   Figure 2
 
 4.  Publishing records
@@ -213,14 +221,6 @@ Internet-Draft             The GNU Name System                 July 2019
 
 
 
-
-
-
-
-
-
-
-
 Schanzenbach             Expires 24 January 2020                [Page 4]
 
 Internet-Draft             The GNU Name System                 July 2019
@@ -289,21 +289,24 @@ Internet-Draft             The GNU Name System                 July 2019
 
    Given a GNS record block a symmetric encryption scheme is used to
    en-/decrypt "BDATA".  The keys are derived from the record label "l"
-   and a public key "dG", where "d" is an ECDSA private key and "G" is a
-   EC generator. "d" and "dG" are derived from the public/private key
-   pair "x,P" of a GNS zone.  Both "l" and "P" are implicity known by
-   the GNS resolver.  The key material "K" and initialization vector
+   and a public key "d*P", where "d" is an ECDSA private key and "P" is
+   the EC generator. "d" and "dG" are derived from the public/private
+   key pair "x,y" of a GNS zone.  Both "l" and "P" are implicity known
+   by the GNS resolver.  The key material "K" and initialization vector
    "IV" are derived as follows:
 
-               h := sha512 (l,y)
-               d := h*x mod n
-               K := HKDF (dG,l,"gns-aes-ctx-key")
-               IV := HKDF (dG,l,"gns-aes-ctx-iv")
+               h := HKDF ("key-derivation", l|y|"gns")
+               d := h*x mod p
+               K := HKDF (d*P, l|"gns-aes-ctx-key")
+               IV := HKDF (d*P, l|"gns-aes-ctx-iv")
 
    "HKDF" is a hash-based key derivation function as defined in
-   [RFC5869].  For the XTR, we use HMAC-SHA512 and HMAC-SHA256 in PRF as
-   proposed in (paper).  We divide "K" into a 256-bit AES key "Kaes" and
-   a 256-bit TWOFISH key "Ktwo".
+   [RFC5869].  We use HMAC-SHA512 for the extraction phase and HMAC-
+   SHA256 for the expansion phase as proposed in (paper).  The first
+   argument for HKDF is the salt and the second argument is the
+   concatenated, serialized source key material.  We divide the
+   resulting 512-bit "K" into a 256-bit AES key "Kaes" and a 256-bit
+   TWOFISH key "Ktwo":
 
                  0     8     16    24    32    40    48    56
                  +-----+-----+-----+-----+-----+-----+-----+-----+
@@ -330,9 +333,6 @@ Internet-Draft             The GNU Name System                 July 2019
 
 
 
-
-
-
 Schanzenbach             Expires 24 January 2020                [Page 6]
 
 Internet-Draft             The GNU Name System                 July 2019