commit e97637bdfe5f592456605ab0b07817edbd0d39c8
parent 1e6eb27cffc88f5ad7bc9e89a7c13b8f90ec881f
Author: Schanzenbach, Martin <mschanzenbach@posteo.de>
Date: Mon, 17 Feb 2020 16:03:46 +0100
fix
Diffstat:
3 files changed, 32 insertions(+), 31 deletions(-)
diff --git a/draft-schanzen-gns.html b/draft-schanzen-gns.html
@@ -2385,7 +2385,7 @@ table {
The revocation message including the proof-of-work MAY be calculated
ahead of time to support timely revocation.<a href="#section-7-2" class="pilcrow">¶</a></p>
<p id="section-7-3">
- The following the the basic data "REVDAT" on which the proof-of work is
+ The following the the basic data "REV" on which the proof-of work is
calculated:<a href="#section-7-3" class="pilcrow">¶</a></p>
<div id="figure_revocation">
<figure id="figure-15">
@@ -2447,28 +2447,28 @@ table {
</pre>
</div>
<figcaption><a href="#figure-18" class="selfRef">Figure 18</a></figcaption></figure>
+<p id="section-7-10">
+ The above EREV data object is calculated with different values for the
+ "NONCE" in "REV" until the following inequality holds:<a href="#section-7-10" class="pilcrow">¶</a></p>
<figure id="figure-19">
- <div class="artwork art-text alignLeft" id="section-7-10.1">
+ <div class="artwork art-text alignLeft" id="section-7-11.1">
<pre>
- REVDATA := scrypt(P := EREV)
+ scrypt(P := EREV) < 2^(39)-1
</pre>
</div>
<figcaption><a href="#figure-19" class="selfRef">Figure 19</a></figcaption></figure>
-<p id="section-7-11">
- where "scrypt" is the scrypt algorithm as defined in
- <span>[<a href="#RFC7914" class="xref">RFC7914</a>]</span> with the following parameters set:<a href="#section-7-11" class="pilcrow">¶</a></p>
-<div class="artwork art-text alignLeft" id="section-7-12">
+<p id="section-7-12">
+ For all occurences above, "scrypt" is the scrypt algorithm as defined in
+ <span>[<a href="#RFC7914" class="xref">RFC7914</a>]</span> with the following parameters set:<a href="#section-7-12" class="pilcrow">¶</a></p>
+<div class="artwork art-text alignLeft" id="section-7-13">
<pre>
S := "gnunet-revocation-proof-of-work" /* Salt */
N := 2
r := 8 /* Block size */
p := 2 /* Parallelization parameter */
- dkLen := 512 /* Intended output length */
- </pre><a href="#section-7-12" class="pilcrow">¶</a>
+ dkLen := 64 /* Intended output length in octets */
+ </pre><a href="#section-7-13" class="pilcrow">¶</a>
</div>
-<p id="section-7-13">
- The above function is called with different values for the "NONCE" in
- "REV" until the amount of leading zeroes is greater or equal 25.<a href="#section-7-13" class="pilcrow">¶</a></p>
</section>
</div>
<div id="governance">
diff --git a/draft-schanzen-gns.txt b/draft-schanzen-gns.txt
@@ -1073,8 +1073,8 @@ 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.
- The following the the basic data "REVDAT" on which the proof-of work
- is calculated:
+ The following the the basic data "REV" on which the proof-of work is
+ calculated:
0 8 16 24 32 40 48 56
+-----+-----+-----+-----+-----+-----+-----+-----+
@@ -1127,21 +1127,21 @@ Internet-Draft The GNU Name System November 2019
Figure 18
- REVDATA := scrypt(P := EREV)
+ The above EREV data object is calculated with different values for
+ the "NONCE" in "REV" until the following inequality holds:
+
+ scrypt(P := EREV) < 2^(39)-1
Figure 19
- where "scrypt" is the scrypt algorithm as defined in [RFC7914] with
- the following parameters set:
+ 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 := 512 /* Intended output length */
-
- The above function is called with different values for the "NONCE" in
- "REV" until the amount of leading zeroes is greater or equal 25.
+ dkLen := 64 /* Intended output length in octets */
8. Determining the Root Zone and Zone Governance
diff --git a/draft-schanzen-gns.xml b/draft-schanzen-gns.xml
@@ -1135,7 +1135,7 @@
ahead of time to support timely revocation.
</t>
<t>
- The following the the basic data "REVDAT" on which the proof-of work is
+ The following the the basic data "REV" on which the proof-of work is
calculated:
</t>
<figure anchor="figure_revocation">
@@ -1184,14 +1184,19 @@
EREV := TWOFISH(K[0:31], IV_two,
AES(K[32:63], IV_aes, REV))
]]></artwork>
- </figure>
+ </figure>
+ <t>
+ The above EREV data object is calculated with different values for the
+ "NONCE" in "REV" until the following inequality holds:
+ </t>
+
<figure>
<artwork name="" type="" align="left" alt=""><![CDATA[
- REVDATA := scrypt(P := EREV)
+ scrypt(P := EREV) < 2^(39)-1
]]></artwork>
</figure>
<t>
- where "scrypt" is the scrypt algorithm as defined in
+ For all occurences above, "scrypt" is the scrypt algorithm as defined in
<xref target="RFC7914" /> with the following parameters set:
</t>
<artwork name="" type="" align="left" alt=""><![CDATA[
@@ -1199,13 +1204,9 @@
N := 2
r := 8 /* Block size */
p := 2 /* Parallelization parameter */
- dkLen := 512 /* Intended output length */
+ dkLen := 64 /* Intended output length in octets */
]]></artwork>
- <t>
- The above function is called with different values for the "NONCE" in
- "REV" until the amount of leading zeroes is greater or equal 25.
- </t>
- </section>
+ </section>
<section anchor="governance" numbered="true" toc="default">
<name>Determining the Root Zone and Zone Governance</name>
<t>
