1 files changed, 135 insertions, 138 deletions

diff --git a/draft-schanzen-gns.xml b/draft-schanzen-gns.xml
index de1af5b..c99b6fe 100644
--- a/draft-schanzen-gns.xml
+++ b/draft-schanzen-gns.xml
@@ -1029,13 +1029,13 @@ q := SHA512 (HDKD-Public(zk, label))
          <artwork name="" type="" align="left" alt=""><![CDATA[
 0     8     16    24    32    40    48    56
 +-----+-----+-----+-----+-----+-----+-----+-----+
-|                   SIGNATURE                   |
+|       ZONE TYPE       |    PUBLIC ZONE KEY    |
++-----+-----+-----+-----+       (BLINDED)       |
 /                                               /
 /                                               /
 |                                               |
 +-----+-----+-----+-----+-----+-----+-----+-----+
-|       ZONE TYPE       |    PUBLIC ZONE KEY    |
-+-----+-----+-----+-----+       (BLINDED)       |
+|                   SIGNATURE                   |
 /                                               /
 /                                               /
 |                                               |
@@ -1052,14 +1052,6 @@ q := SHA512 (HDKD-Public(zk, label))
        </figure>
        <t>where:</t>
        <dl>
-         <dt>SIGNATURE</dt>
-         <dd>
-           The signature is computed over the data following
-           the PUBLIC KEY field.
-           The signature is created using the Sign() function of
-           the cryptosystem of the zone and the derived private key
-           "HDKD-Private(d, label)" (see <xref target="zone_types" />).
-         </dd>
          <dt>ZONE TYPE</dt>
          <dd>
            is the 32-bit zone type.
@@ -1069,6 +1061,14 @@ q := SHA512 (HDKD-Public(zk, label))
            is the blinded public zone key "HDKD-Public(zk, label)"
            to be used to verify SIGNATURE.
          </dd>
+         <dt>SIGNATURE</dt>
+         <dd>
+           The signature is computed over the data following
+           the PUBLIC KEY field.
+           The signature is created using the Sign() function of
+           the cryptosystem of the zone and the derived private key
+           "HDKD-Private(d, label)" (see <xref target="zone_types" />).
+         </dd>
          <dt>SIZE</dt>
          <dd>
            A 32-bit value containing the length of the signed data following the
@@ -1582,20 +1582,16 @@ NICK: john (Supplemental)
 +-----+-----+-----+-----+-----+-----+-----+-----+
 |                     POW_Z-1                   |
 +-----------------------------------------------+
-|                   SIGNATURE                   |
-|                                               |
-|                                               |
-|                                               |
-|                                               |
-|                                               |
-|                                               |
-|                                               |
-+-----+-----+-----+-----+-----+-----+-----+-----+
 |       ZONE TYPE       |    PUBLIC ZONE KEY    |
 +-----+-----+-----+-----+                       |
 /                                               /
 /                                               /
 +-----+-----+-----+-----+-----+-----+-----+-----+
+|                   SIGNATURE                   |
+/                                               /
+/                                               /
+|                                               |
++-----+-----+-----+-----+-----+-----+-----+-----+
            ]]></artwork>
        </figure>
        <t>where:</t>
@@ -1624,14 +1620,6 @@ NICK: john (Supplemental)
            of uniqueness, the POW values must be given in strictly
            monotonically increasing order in the message.
          </dd>
-         <dt>SIGNATURE</dt>
-         <dd>
-           A 512-bit ECDSA deterministic signature compliant with
-           <xref target="RFC6979" /> over the public zone zk of the zone
-           which is revoked and corresponds to the key used in the PoW.
-           The signature is created using the private zone key "d" (see
-           <xref target="zones" />).
-         </dd>
          <dt>ZONE TYPE</dt>
          <dd>
            The 32-bit zone type corresponding to the zone public key.
@@ -1641,6 +1629,14 @@ NICK: john (Supplemental)
            is the public key "zk" of the zone which is being revoked and
            the key to be used to verify SIGNATURE.
          </dd>
+         <dt>SIGNATURE</dt>
+         <dd>
+           A signature over a timestamp and the public zone zk of the zone
+           which is revoked and corresponds to the key used in the PoW.
+           The signature is created using the Sign() function of
+           the cryptosystem of the zone and the private zone key
+           (see <xref target="zone_types" />).
+         </dd>
        </dl>
       <t>
          The signature over the public key covers a 32-bit pseudo header
@@ -1998,16 +1994,16 @@ Purpose | Name            | References | Description
        <artwork name="" type="" align="left" alt="">
          <![CDATA[
 Zone private key (d, little-endian scalar):
-3015471ecb45455b5e9df50ff416b3d53aa6db6cafec858449f788142d091d41
+00010000c87175eca3089068f281cedce51cbbf84422a5a2281e70b8afdcd6ee9aeaf951
 
 Zone public key (zk):
-bf06e687a291a509b6326bb6394dd6ed3ff9e5eb78ea5752ed0eba0807023a33
+00010000b0f6fce5eb13105ec586ad2d3b36b272ffd88c3d0944bd8adcb7a84bec6c8bcc
 
 Label: test
 RRCOUNT: 2
 
 Record #0
-EXPIRATION: 1590482415557079
+EXPIRATION: 1602781206483675
 DATA_SIZE: 4
 TYPE: 1
 FLAGS: 0
@@ -2015,27 +2011,27 @@ DATA:
 01020304
 
 Record #1
-EXPIRATION: 1590482415557079
+EXPIRATION: 1602781206483675
 DATA_SIZE: 32
 TYPE: 65536
 FLAGS: 2
 DATA:
-814fbb06b17f4ecf
-d098700619179f9d
-4aef24465bd6958a
-e4ed01cd024b1856
+000100005625826d
+4ec27ddc08f400e2
+9952506135552a4e
+eec2d3c3e44cb0eb
 
 RDATA:
-0005a6890b6699d7
+0005b1b8947712db
 0000000400000001
 0000000001020304
-0005a6890b6699d7
+0005b1b8947712db
 0000002000010000
-00000002814fbb06
-b17f4ecfd0987006
-19179f9d4aef2446
-5bd6958ae4ed01cd
-024b185600000000
+0000000200010000
+5625826d4ec27ddc
+08f400e299525061
+35552a4eeec2d3c3
+e44cb0eb00000000
 0000000000000000
 0000000000000000
 0000000000000000
@@ -2044,56 +2040,56 @@ b17f4ecfd0987006
 0000000000000000
 
 BDATA:
-9f471611a5c06fc2
-c9ad33f642dd315c
-f8fc675aed23e8a1
-d19a5bad657557fe
-6e1d50709860593e
-5376c30f6f22daac
-5293986b7444476d
-b8f289f5537da168
-dc81cba256d8401b
-642dbe6a24346e11
-9148ade8acb4d5e5
-cef5eb5ad1e3b95d
-d143123d387b8df0
-ba4e2d75a9eb94a4
-f3250b975fee90e9
-558bb9e1e009ca46
-b7a066dd
+049c4624c874e3ea
+673aa9c3703b8824
+cc656348690c42eb
+ac4c7b4e4589fd89
+bbfd0c31b9043783
+ae61c7f7ff2d492f
+dff2e8f317bc3858
+54bd8fbed94d1023
+f06eb20c141bafae
+7d1d0674234a0696
+94cdff6a8682ebc6
+6b0edacc0724e0df
+21b4788a8c0e431c
+70e80d56414fbb0e
+6a42a4b8ca7b0db5
+dc546174993bd960
+a41465e4
 
 RRBLOCK:
-08180a871b910ade
-a1125a1030d0f269
-069e5731c90ad0d0
-cfa10bf61b3f0c79
-0833b515d4c746e6
-4a7261947bfb6429
-21200bb97a96292d
-6abefab1197f7e4e
-b399c628a71d3627
-d64a2bd66080f64d
-91c0120ab14601d8
-18de23c8da82b80b
-000000940000000f
-0005a6890b6699d7
-9f471611a5c06fc2
-c9ad33f642dd315c
-f8fc675aed23e8a1
-d19a5bad657557fe
-6e1d50709860593e
-5376c30f6f22daac
-5293986b7444476d
-b8f289f5537da168
-dc81cba256d8401b
-642dbe6a24346e11
-9148ade8acb4d5e5
-cef5eb5ad1e3b95d
-d143123d387b8df0
-ba4e2d75a9eb94a4
-f3250b975fee90e9
-558bb9e1e009ca46
-b7a066dd
+000100008e6f3280
+3305da397aef864f
+85f95dc02a95c4ee
+adad04bf76e30caa
+7694fa3a02c0b96d
+c4dee94a27610eb0
+aaf53f2d45b16d42
+e9e8c175f8b0c2c2
+db42c0d1030fd2d6
+439b02fc0508679e
+a94537526fac8205
+51b0ad7f9cd6d401
+1f01571600000094
+0000000f0005b1b8
+947712db049c4624
+c874e3ea673aa9c3
+703b8824cc656348
+690c42ebac4c7b4e
+4589fd89bbfd0c31
+b9043783ae61c7f7
+ff2d492fdff2e8f3
+17bc385854bd8fbe
+d94d1023f06eb20c
+141bafae7d1d0674
+234a069694cdff6a
+8682ebc66b0edacc
+0724e0df21b4788a
+8c0e431c70e80d56
+414fbb0e6a42a4b8
+ca7b0db5dc546174
+993bd960a41465e4
            ]]>
        </artwork>
        <t>
@@ -2102,60 +2098,61 @@ b7a066dd
        <artwork name="" type="" align="left" alt="">
          <![CDATA[
 Zone private key (d, little-endian scalar):
-90ea2a95cb9ef482b45817dc45b805cae00f387022a065a3674f41ad15173c63
+000100008086701baf9ddd4da9fcaa79f251e2acee5feb2de35406168e1cf6a11d28cf55
 
 Zone public key (zk):
-4ac1e51d9a585a9ad9fb0dfac2be100aee83f0cc79c4c5ea8f3eb8afd9092fa5
+000100003cd76470caa9e62ab06a7572917d5fc528967426a6574f9fbf9f9c437ea3665f
 
 Difficulty (5 base difficulty + 2 epochs): 7
 
 Proof:
-0005a5fd368978f4
+0005b12bddf85fbe
 0000395d1827c000
-e23f657bc47ec853
-e23f657bc47ec9d8
-e23f657bc47ecaec
-e23f657bc47ecb29
-e23f657bc47ecc00
-e23f657bc47ecc79
-e23f657bc47ece83
-e23f657bc47ecfc6
-e23f657bc47ecfc8
-e23f657bc47ecfd5
-e23f657bc47ed02b
-e23f657bc47ed03b
-e23f657bc47ed0ff
-e23f657bc47ed241
-e23f657bc47ed264
-e23f657bc47ed2e5
-e23f657bc47ed343
-e23f657bc47ed348
-e23f657bc47ed45e
-e23f657bc47ed480
-e23f657bc47ed49a
-e23f657bc47ed564
-e23f657bc47ed565
-e23f657bc47ed5b6
-e23f657bc47ed5de
-e23f657bc47ed5e0
-e23f657bc47ed77f
-e23f657bc47ed800
-e23f657bc47ed80c
-e23f657bc47ed817
-e23f657bc47ed82c
-e23f657bc47ed8a6
-0396020c831a5405
-cee6c38842209191
-c8db799dbe81e0dc
-f6dbd4f91c257ae2
-0079e7fd1cd31cc2
-4cd9a52831d5ec30
-f10e22e5a6dd9065
-18746cfce2095610
-4ac1e51d9a585a9a
-d9fb0dfac2be100a
-ee83f0cc79c4c5ea
-8f3eb8afd9092fa5
+27f1828e4fe30968
+27f1828e4fe30adb
+27f1828e4fe30b05
+27f1828e4fe30b47
+27f1828e4fe30b4c
+27f1828e4fe30c14
+27f1828e4fe30c7a
+27f1828e4fe30c7e
+27f1828e4fe30c90
+27f1828e4fe30cc2
+27f1828e4fe30cf0
+27f1828e4fe30d15
+27f1828e4fe30d53
+27f1828e4fe30db7
+27f1828e4fe30dd0
+27f1828e4fe30ddd
+27f1828e4fe30e42
+27f1828e4fe30eea
+27f1828e4fe30ef4
+27f1828e4fe30eff
+27f1828e4fe30f73
+27f1828e4fe30f86
+27f1828e4fe30f89
+27f1828e4fe31038
+27f1828e4fe31086
+27f1828e4fe31098
+27f1828e4fe310a3
+27f1828e4fe3111a
+27f1828e4fe311eb
+27f1828e4fe311ed
+27f1828e4fe3124c
+27f1828e4fe312ce
+000100003cd76470
+caa9e62ab06a7572
+917d5fc528967426
+a6574f9fbf9f9c43
+7ea3665f031c98b4
+a80daf8cd4c57b7e
+ad2575af4edee4e2
+328c49502b4d3d48
+e77b743701928399
+c78185cebfa0b920
+da74da4a797ea6cb
+a7b5fa82132265f7
+23f10473
          ]]>
        </artwork>
      </section>