commit 1c4ecd088e2453f23adf0e70e3312731a9b553f3
parent 5f867a98c5fbfc6c22d6210f3fdbb980414a67c0
Author: Schanzenbach, Martin <mschanzenbach@posteo.de>
Date: Thu, 3 Oct 2019 21:11:58 +0200
add record padding
Diffstat:
2 files changed, 37 insertions(+), 17 deletions(-)
diff --git a/draft-schanzen-gns.html b/draft-schanzen-gns.html
@@ -1193,8 +1193,10 @@ async function addMetadata(){try{const e=document.styleSheets[0].cssRules;for(le
| FLAGS | DATA /
+-----+-----+-----+-----+ /
/ /
- / /
- / |
+ / +-----+-----+-----+-----+
+ / | PADDING /
+ +-----+-----+-----+-----+ /
+ | |
+-----+-----+-----+-----+-----+-----+-----+-----+
</pre>
</div>
@@ -1210,7 +1212,10 @@ async function addMetadata(){try{const e=document.styleSheets[0].cssRules;for(le
</dd>
<dt id="section-3.1-4.3">DATA SIZE</dt>
<dd id="section-3.1-4.4">
- The size of the DATA field in bytes and in network byte order.<a href="#section-3.1-4.4" class="pilcrow">¶</a>
+ The size of the DATA field in bytes and in network byte order including
+ padding. The padding MUST ensure that the size of the resource record
+ is a power of two. The only excption is the PKEY record type, which is
+ never padded.<a href="#section-3.1-4.4" class="pilcrow">¶</a>
</dd>
<dt id="section-3.1-4.5">TYPE</dt>
<dd id="section-3.1-4.6">
@@ -1231,6 +1236,11 @@ async function addMetadata(){try{const e=document.styleSheets[0].cssRules;for(le
The resource record data payload. The contents are defined by the
respective type of the resource record.<a href="#section-3.1-4.10" class="pilcrow">¶</a>
</dd>
+ <dt id="section-3.1-4.11">PADDING</dt>
+ <dd id="section-3.1-4.12">
+ The padding MUST contain the 0 value in all octets. Not applicable for
+ PKEY records.<a href="#section-3.1-4.12" class="pilcrow">¶</a>
+</dd>
</dl>
<p id="section-3.1-5">
Flags indicate metadata surrounding the resource record. A flag
@@ -1385,7 +1395,7 @@ async function addMetadata(){try{const e=document.styleSheets[0].cssRules;for(le
<div class="artwork art-text alignLeft" id="section-4.1-1">
<pre>
PRK_h := HKDF-Extract ("key-derivation", zk)
- h := HKDF-Expand (PRK_h, label, 512 / 8)
+ h := HKDF-Expand (PRK_h, label | "gns", 512 / 8)
x_h := h*x mod p
zk_h := h*zk mod p
q := SHA512 (zk_h)
@@ -1783,10 +1793,10 @@ async function addMetadata(){try{const e=document.styleSheets[0].cssRules;for(le
e4f4ff06d263f9d5
RDATA :=
- 000000010005af87
- 005b914000000017
- 0000000f00000000
- 000a046d61696c0a
+ 000000010005af87 RR COUNT | EXPIRA-
+ 005b914000000017 -TION | DATA SIZE (23)
+ 0000000f00000000 TYPE (15=MX) | FLAGS (0)
+ 000a046d61696c0a DATA (prio=10 mx=mail.hoi-polloi.org.)
686f692d706f6c6c
6f69036f72670000
0000000000000000
@@ -1827,7 +1837,7 @@ async function addMetadata(){try{const e=document.styleSheets[0].cssRules;for(le
7bc65a676b7a6d23 ||
b2ef300f7fc70058 \/
059e7f29e594b5c1____________
- 000000570000000f BDATA SIZE | PURPOSE
+ 000000570000000f BDATA SIZE (=87) | PURPOSE (=15)
0005af87005b9140 EXPIRATION
5fb6552e3959ff9f BDATA
d80c1b0213dc7ef1 ||
diff --git a/draft-schanzen-gns.xml b/draft-schanzen-gns.xml
@@ -111,8 +111,10 @@
| FLAGS | DATA /
+-----+-----+-----+-----+ /
/ /
- / /
- / |
+ / +-----+-----+-----+-----+
+ / | PADDING /
+ +-----+-----+-----+-----+ /
+ | |
+-----+-----+-----+-----+-----+-----+-----+-----+
]]></artwork>
<!-- <postamble>which is a very simple example.</postamble>-->
@@ -127,7 +129,10 @@
</dd>
<dt>DATA SIZE</dt>
<dd>
- The size of the DATA field in bytes and in network byte order.
+ The size of the DATA field in bytes and in network byte order including
+ padding. The padding MUST ensure that the size of the resource record
+ is a power of two. The only excption is the PKEY record type, which is
+ never padded.
</dd>
<dt>TYPE</dt>
<dd>
@@ -148,6 +153,11 @@
The resource record data payload. The contents are defined by the
respective type of the resource record.
</dd>
+ <dt>PADDING</dt>
+ <dd>
+ The padding MUST contain the 0 value in all octets. Not applicable for
+ PKEY records.
+ </dd>
</dl>
<t>
Flags indicate metadata surrounding the resource record. A flag
@@ -643,10 +653,10 @@
e4f4ff06d263f9d5
RDATA :=
- 000000010005af87
- 005b914000000017
- 0000000f00000000
- 000a046d61696c0a
+ 000000010005af87 RR COUNT | EXPIRA-
+ 005b914000000017 -TION | DATA SIZE (23)
+ 0000000f00000000 TYPE (15=MX) | FLAGS (0)
+ 000a046d61696c0a DATA (prio=10 mx=mail.hoi-polloi.org.)
686f692d706f6c6c
6f69036f72670000
0000000000000000
@@ -687,7 +697,7 @@
7bc65a676b7a6d23 ||
b2ef300f7fc70058 \/
059e7f29e594b5c1____________
- 000000570000000f BDATA SIZE | PURPOSE
+ 000000570000000f BDATA SIZE (=87) | PURPOSE (=15)
0005af87005b9140 EXPIRATION
5fb6552e3959ff9f BDATA
d80c1b0213dc7ef1 ||
