1 files changed, 165 insertions, 109 deletions

diff --git a/draft-schanzen-gns.txt b/draft-schanzen-gns.txt
index dbfbae6..16330d4 100644
--- a/draft-schanzen-gns.txt
+++ b/draft-schanzen-gns.txt
@@ -75,13 +75,13 @@ Table of Contents
    5.  Internationalization and Character Encoding . . . . . . . . .  13
    6.  Record Resolution . . . . . . . . . . . . . . . . . . . . . .  13
      6.1.  Entry Zone  . . . . . . . . . . . . . . . . . . . . . . .  14
-     6.2.  Recursive Resolution  . . . . . . . . . . . . . . . . . .  14
-   7.  Namespace Revocation  . . . . . . . . . . . . . . . . . . . .  14
-   8.  Security Considerations . . . . . . . . . . . . . . . . . . .  14
-   9.  IANA Considerations . . . . . . . . . . . . . . . . . . . . .  14
-   10. Test Vectors  . . . . . . . . . . . . . . . . . . . . . . . .  14
-   11. Normative References  . . . . . . . . . . . . . . . . . . . .  16
-   Authors' Addresses  . . . . . . . . . . . . . . . . . . . . . . .  17
+     6.2.  Recursive Resolution  . . . . . . . . . . . . . . . . . .  15
+   7.  Namespace Revocation  . . . . . . . . . . . . . . . . . . . .  15
+   8.  Security Considerations . . . . . . . . . . . . . . . . . . .  15
+   9.  IANA Considerations . . . . . . . . . . . . . . . . . . . . .  15
+   10. Test Vectors  . . . . . . . . . . . . . . . . . . . . . . . .  15
+   11. Normative References  . . . . . . . . . . . . . . . . . . . .  17
+   Authors' Addresses  . . . . . . . . . . . . . . . . . . . . . . .  18
 
 1.  Introduction
 
@@ -732,13 +732,68 @@ Internet-Draft             The GNU Name System                 July 2019
 
 6.1.  Entry Zone
 
-   There are three sources from which the entry zone can be determined:
+   There are three sources from which the entry zone can be determined
+   which MUST be queried in this order:
 
-   *  Local zone store
+   1.  Check if top-level domain maps to a local zone key.
 
-   *  External prefix to zone key mappings
+   2.  Check if top-level domain maps to a local zone name.
 
-   *  Zone key TLD
+   3.  Check if a configuration exists that maps a prefix to an external
+       zone key.
+
+   If the TLD is a Base32-encoded public zone key "zk", the entry zone
+   of the resolution process is implicitly given by the name.
+
+            Example name: www.example.<Base32(zk)>
+            => Entry zone: zk
+            => Name to resolve from entry zone: www.example
+
+   Each local zone is associated with a single GNS label.  If this label
+   is the top-level domain (TLD) of the name to resolve, resolution MUST
+   start from this local zone.
+
+              Example name: www.example.gnu
+              Local zones:
+              fr = (d0,zk0)
+              gnu = (d1,zk1)
+              com = (d2,zk2)
+              ...
+              => Entry zone: zk1
+              => Name to resolve from entry zone: www.example
+
+   If no matching local zone for the TLD is found, external prefix to
+   zone mappings are checked.  External prefix to zone key mapping
+   SHOULD be configurable through the GNS implementation.  A mapping has
+   the form "prefix = public zone key".  The prefix may consist of
+   multiple GNS labels concatenated with a ".".  If multiple prefixes
+   match the name to resolve, the longest prefix is chosen.  The prefix
+   length of two results cannot be equal, as this would indicate a
+   misconfiguration.
+
+
+
+
+
+
+
+
+
+
+
+Schanzenbach, et al.     Expires 24 January 2020               [Page 14]
+
+Internet-Draft             The GNU Name System                 July 2019
+
+
+              Example name: www.example.gnu
+              Local prefix mappings:
+              gnu = zk0
+              example.gnu = zk1
+              example.com = zk2
+              ...
+              => Entry zone: zk1
+              => Name to resolve from entry zone: www
 
 6.2.  Recursive Resolution
 
@@ -759,118 +814,118 @@ Internet-Draft             The GNU Name System                 July 2019
    The following represents a test vector for a record of type MX with a
    priority of 10 and the mail hostname mail.example.com.
 
-          label := "mail"
+            label := "mail"
 
-          d :=
-          71199f7b287cc77a
-          0d21b5e40a77cb1d
-          f89333903b284fe8
-          1878bf47f3b39da0
+            d :=
+            71199f7b287cc77a
+            0d21b5e40a77cb1d
+            f89333903b284fe8
+            1878bf47f3b39da0
 
-          zk (public zone key) :=
-          dff911496d025d7e
-          0885c03d19153e99
-          4f213f23ea719eca
-          17fc32dc410e082e
+            zk (public zone key) :=
+            dff911496d025d7e
+            0885c03d19153e99
+            4f213f23ea719eca
+            17fc32dc410e082e
 
-          h :=
-          2af3275a9cf90e54
-          f2dbf7930be76fb9
-          5e7c80b1416f8ca6
-          dc50ce8e1fb759b9
+            h :=
+            2af3275a9cf90e54
+            f2dbf7930be76fb9
+            5e7c80b1416f8ca6
+            dc50ce8e1fb759b9
+            fedcdcf546c17e9b
 
 
 
-Schanzenbach, et al.     Expires 24 January 2020               [Page 14]
+Schanzenbach, et al.     Expires 24 January 2020               [Page 15]
 
 Internet-Draft             The GNU Name System                 July 2019
 
 
-          fedcdcf546c17e9b
-          4c4f23632855c053
-          6668e9f684f4dc33
-          6d656b27392b0fee
-
-          d_h :=
-          01fb61f482c17633
-          77611c4c2509e0f3
-          81b0e7e4405c10bd
-          0017c802f7d32e18
-
-          q (query key) :=
-          6fce4deddc5ad681
-          f4e29a3310767e3b
-          8b38bc1b276ce2ba
-          9bf1b49df1e120a3
-          20ecc9dffb68416f
-          11729ad878ad3bdf
-          d0b4db2626b620d7
-          8e0604e4393c66a3
-
-          AES_KEY :=
-          afefd21a087a150d
-          6757741a4eda02a5
-          65df7ca86ba44b21
-          3f8106c0071eaf01
-
-          AES_IV :=
-          a808b929bc9fad7a
-          686bbe3432bed77a
-
-          TWOFISH_KEY :=
-          c9d0089df01d0bf4
-          e4c8db4b2ccc7328
-          3425e8a811ae59d2
-          99e2747285d2a479
-
-          TWOFISH_IV :=
-          071be189a9d236f9
-          b4a3654bb8c281d4
-
-          RDATA :=
-          0000000100059412 RR COUNT | EXPIRA-
-          09ddea0f00000014  -TION    | DATA SIZE (20)
-          0000000f00000000 TYPE (15=MX) | FLAGS (0)
-          000a046d61696c07 Priority (10) |4 | mail | 7
-          6578616d706c6503 example | 3
-          636f6d0000000000 com | \0 | Followed by
+            4c4f23632855c053
+            6668e9f684f4dc33
+            6d656b27392b0fee
+
+            d_h :=
+            01fb61f482c17633
+            77611c4c2509e0f3
+            81b0e7e4405c10bd
+            0017c802f7d32e18
+
+            q (query key) :=
+            6fce4deddc5ad681
+            f4e29a3310767e3b
+            8b38bc1b276ce2ba
+            9bf1b49df1e120a3
+            20ecc9dffb68416f
+            11729ad878ad3bdf
+            d0b4db2626b620d7
+            8e0604e4393c66a3
+
+            AES_KEY :=
+            afefd21a087a150d
+            6757741a4eda02a5
+            65df7ca86ba44b21
+            3f8106c0071eaf01
+
+            AES_IV :=
+            a808b929bc9fad7a
+            686bbe3432bed77a
+
+            TWOFISH_KEY :=
+            c9d0089df01d0bf4
+            e4c8db4b2ccc7328
+            3425e8a811ae59d2
+            99e2747285d2a479
+
+            TWOFISH_IV :=
+            071be189a9d236f9
+            b4a3654bb8c281d4
+
+            RDATA :=
+            0000000100059412 RR COUNT | EXPIRA-
+            09ddea0f00000014  -TION    | DATA SIZE (20)
+            0000000f00000000 TYPE (15=MX) | FLAGS (0)
+            000a046d61696c07 Priority (10) |4 | mail | 7
+            6578616d706c6503 example | 3
+            636f6d0000000000 com | \0 | Followed by
+            0000000000000000 24 bytes of padding to 2^6
 
 
 
-Schanzenbach, et al.     Expires 24 January 2020               [Page 15]
+Schanzenbach, et al.     Expires 24 January 2020               [Page 16]
 
 Internet-Draft             The GNU Name System                 July 2019
 
 
-          0000000000000000 24 bytes of padding to 2^6
-          0000000000000000
-          00000000
-
-
-          BLOCK :=
-          055cb070e05fe6de SIGNATURE
-          ad694a50e5b4dedd
-          b9fdcbdbae004f65
-          afc99ba9c5a3bb54
-          07e731a34680ee33
-          ae0de7bfeda7d2b7
-          8c6b854a008b1b54
-          10df4f39f5ba9f46____________
-          8cb514a56c0eaae0 zk_h
-          56745158a63ee4dd
-          76853cb9545e326e
-          76d7fa920f818291____________
-          000000540000000f SIZE (=84) | PURPOSE (=15)
-          0005941209dde25b EXPIRATION
-          d99d08fa123da096 BDATA
-          66c2fb9bf020a85d
-          e80818d0a84059a8
-          5eee901a66459e5e
-          3d1a10b29a5b8354
-          1b58636781166b9a
-          642920eee8e7a65a
-          001fd19a6406a721
-          713f0a0d
+            0000000000000000
+            00000000
+
+
+            BLOCK :=
+            055cb070e05fe6de SIGNATURE
+            ad694a50e5b4dedd
+            b9fdcbdbae004f65
+            afc99ba9c5a3bb54
+            07e731a34680ee33
+            ae0de7bfeda7d2b7
+            8c6b854a008b1b54
+            10df4f39f5ba9f46____________
+            8cb514a56c0eaae0 zk_h
+            56745158a63ee4dd
+            76853cb9545e326e
+            76d7fa920f818291____________
+            000000540000000f SIZE (=84) | PURPOSE (=15)
+            0005941209dde25b EXPIRATION
+            d99d08fa123da096 BDATA
+            66c2fb9bf020a85d
+            e80818d0a84059a8
+            5eee901a66459e5e
+            3d1a10b29a5b8354
+            1b58636781166b9a
+            642920eee8e7a65a
+            001fd19a6406a721
+            713f0a0d
 
 11.  Normative References
 
@@ -893,7 +948,8 @@ Internet-Draft             The GNU Name System                 July 2019
 
 
 
-Schanzenbach, et al.     Expires 24 January 2020               [Page 16]
+
+Schanzenbach, et al.     Expires 24 January 2020               [Page 17]
 
 Internet-Draft             The GNU Name System                 July 2019
 
@@ -949,7 +1005,7 @@ Authors' Addresses
 
 
 
-Schanzenbach, et al.     Expires 24 January 2020               [Page 17]
+Schanzenbach, et al.     Expires 24 January 2020               [Page 18]
 
 Internet-Draft             The GNU Name System                 July 2019
 
@@ -1005,4 +1061,4 @@ Internet-Draft             The GNU Name System                 July 2019
 
 
 
-Schanzenbach, et al.     Expires 24 January 2020               [Page 18]
+Schanzenbach, et al.     Expires 24 January 2020               [Page 19]