commit f41c17ae3d031a08aee247ab57aa8e639a866b4c
parent 3dee9e498ca730d9e78fe8c2f41b4caffa110e19
Author: Martin Schanzenbach <schanzen@gnunet.org>
Date: Wed, 16 Feb 2022 18:20:16 +0100
revert change (outdated RFCs)
Diffstat:
1 file changed, 136 insertions(+), 153 deletions(-)
diff --git a/draft-schanzen-gns.xml b/draft-schanzen-gns.xml
@@ -5,7 +5,6 @@
<!ENTITY RFC2119 PUBLIC '' "http://xml.resource.org/public/rfc/bibxml/reference.RFC.2119.xml">
<!--<!ENTITY RFC2693 PUBLIC '' "http://xml.resource.org/public/rfc/bibxml/reference.RFC.2693.xml">-->
<!ENTITY RFC2782 PUBLIC '' "http://xml.resource.org/public/rfc/bibxml/reference.RFC.2782.xml">
-<!ENTITY RFC3491 PUBLIC '' "http://xml.resource.org/public/rfc/bibxml/reference.RFC.3491.xml">
<!ENTITY RFC3629 PUBLIC '' "http://xml.resource.org/public/rfc/bibxml/reference.RFC.3629.xml">
<!ENTITY RFC3686 PUBLIC '' "http://xml.resource.org/public/rfc/bibxml/reference.RFC.3686.xml">
<!ENTITY RFC3826 PUBLIC '' "http://xml.resource.org/public/rfc/bibxml/reference.RFC.3826.xml">
@@ -192,13 +191,8 @@
<dd>
A GNS label is a label as defined in <xref target="RFC8499"/>.
Within this document, labels are always assumed to be strings of
- UTF-8 characters <xref target="RFC8499"/> with a maximum length of
- 63 bytes for compatibility with applications enforcing DNS legacy
- limitations.
- Labels MUST follow the format as defined in the
- "Nameprep" profile in <xref target="RFC3491"/>.
- Notably, this means that labels are assumed to be case-folded and
- special characters including spaces are forbidden.
+ Labels MUST follow the format for U-labels as defined in
+ in <xref target="RFC5890"/> and <xref target="RFC5891"/>.
</dd>
<dt>Apex Label</dt>
<dd>
@@ -2239,9 +2233,9 @@ NICK: john (Supplemental)
<t>
All labels in GNS are encoded in UTF-8 <xref target="RFC3629" />.
Labels MUST be canonicalized using
- Normalization Form KC (NFKC) <xref target="Unicode-UAX15"/>.
+ Normalization Form C (NFC) <xref target="Unicode-UAX15"/>.
This does not include any DNS names found in DNS records, such as CNAME
- records, which are internationalized through the IDNA specifications
+ record data, which is internationalized through the IDNA specifications
<xref target="RFC5890" />.
</t>
</section>
@@ -2630,7 +2624,6 @@ Purpose | Name | References | Comment
&RFC1035;
&RFC2782;
&RFC2119;
- &RFC3491;
&RFC3629;
&RFC3686;
&RFC3826;
@@ -2996,9 +2989,8 @@ Base32GNS-Decode:
]]>
</artwork>
<t>
- The following represents a test vector for a record set with a DNS
- record of type "A" as well as a GNS record of type "PKEY"
- under the label "test".
+ The following represents test vectors for record sets with a variety
+ of record types and flags for both PKEY and EDKEY zones.
</t>
<artwork name="" type="" align="left" alt="">
<![CDATA[
@@ -3050,7 +3042,7 @@ b928158000000001
Encryption key (K):
864e7138eae7fd91
a30136899c132b23
-acebdb2cef43cb19
+acebd2cef43cb19
f6bf55b67db9b3b3
Storage key (q):
@@ -3111,7 +3103,7 @@ b0c2901f
Encoded zone identifier (zkl = zTLD):
000G0037FH3QTBCK15Y8BCCNRVWPV17ZC7TSGB1C9ZG2TPGHZVFV1GMG3W
-Label: ć–°namesystem
+Label: namesystem
RRCOUNT: 3
Record #0
@@ -3134,7 +3126,7 @@ DATA:
e6849be7a7b0
Record #2
-EXPIRATION: 6165033256
+EXPIRATION: 6089306424
DATA_SIZE: 11
TYPE: 16
FLAGS: 4004
@@ -3151,7 +3143,7 @@ RDATA:
00b00f81b7449b40
0006800000010001
e6849be7a7b00000
-00016f76f128000b
+00016af37138000b
4004000000104865
6c6c6f20576f726c
6400000000000000
@@ -3162,84 +3154,75 @@ e6849be7a7b00000
0000000000000000
Encryption NONCE|EXPIRATION|BLOCK COUNTER:
-381ab5ed0005d815
-3f5cbef800000001
+a5df4a330005d816
+0d595e8900000001
Encryption key (K):
-30ec282798ac24c0
-7d9e8bb6964bb037
-1c3d622a98cb48a4
-f497ca455adc8b3b
+39a8824c4da40242
+d9e05eb46cdf280f
+29a116f8acfd94c8
+6df48b2b7aac82ff
Storage key (q):
-0c8bccf549428c07
-b0442bfc0a0bf55b
-162b4382fb005589
-3a3e03191d81fc99
-6fbb6e219b78a1c7
-03f49c619d3d7a2b
-850722491887c906
-dbccc57b693f7265
+07f6e965f75c815d
+35fea2212692c8fc
+f9b575cb42f0fd84
+5d4d7327199cf3dd
+dcbc5565ca2b81fe
+b08088ae2bb2afd0
+d85f2fed85e170be
+ee86bf67ce2b9ece
BDATA:
-ea1dc7ac3f32f9ba
-65f6a651739fee18
-31c80aa0b284a736
-c355068b774ea326
-619ee92a34602627
-db6f75c9b294202d
-b5a1bd50d960a23b
-7491e7064e5ef0bb
-7009eb545eef5c63
-0684b7936dd0177c
-7376d8b1c23d1935
-867b162009ec7b8b
-52709e0de30f57f4
-e62fc846b7ac3a53
-491f037bd3f95a21
-a3ef1dd5cc64d54b
+83df3617de6bbd8a
+887e6ddca9755edd
+fd56b4a39d07b9a8
+1f285d004ba567b2
+40c9766411e40fc7
+8627f6b372486f99
+215875f5b8745879
+394f61a10f770922
+3c94b04d93d16cdc
+0a072402e926512f
+08cc632ed7310018
+69550cacac78d9d2
+0d6dff70d329c84f
+a6fc8e78f64188da
+4a217ebfae374937
+c62121526e85d97c
RRBLOCK:
000000f000010000
-2655d6db3eba0729
-ddf5f60544266f7a
-d6d3485932e35762
-ab7f0849a3a1e95c
-076d34f2eed2712d
-f06762c1e7d75bbd
-7d279fb1dd9a3825
-5e3673e915a4ba24
-0be81866b15346cb
-4a5bf1175ecc1413
-6f676c8e9479f3aa
-0df6a970835b04f7
-0005d8153f5cbef8
-ea1dc7ac3f32f9ba
-65f6a651739fee18
-31c80aa0b284a736
-c355068b774ea326
-619ee92a34602627
-db6f75c9b294202d
-b5a1bd50d960a23b
-7491e7064e5ef0bb
-7009eb545eef5c63
-0684b7936dd0177c
-7376d8b1c23d1935
-867b162009ec7b8b
-52709e0de30f57f4
-e62fc846b7ac3a53
-491f037bd3f95a21
-a3ef1dd5cc64d54b
- ]]>
- </artwork>
+ddef91ac40ad25e3
+6b65242789ee9662
+e195ced12e76245e
+10ebc70bbe089906
+01f1f20d0dd97f38
+7d726e47046f5bdc
+1158724a2f1ccf39
+ecfd0e918351e2ea
+0696cc286dfb1722
+ed0f4ea9da83bbcf
+5dd4a2842fe5bb64
+17ae3602a06527c4
+0005d8160d595e89
+83df3617de6bbd8a
+887e6ddca9755edd
+fd56b4a39d07b9a8
+1f285d004ba567b2
+40c9766411e40fc7
+8627f6b372486f99
+215875f5b8745879
+394f61a10f770922
+3c94b04d93d16cdc
+0a072402e926512f
+08cc632ed7310018
+69550cacac78d9d2
+0d6dff70d329c84f
+a6fc8e78f64188da
+4a217ebfae374937
+c62121526e85d97c
- <t>
- The following represents a test vector for a record set with a DNS
- record of type "A" as well as a GNS record of type "EDKEY"
- under the label "test".
- </t>
- <artwork name="" type="" align="left" alt="">
- <![CDATA[
Zone private key (d):
5af7020ee1916032
8832352bbc6a68a8
@@ -3354,7 +3337,7 @@ db96688f
Encoded zone identifier (zkl = zTLD):
000G051WYJWJ80S04BRDRM2R2H9VGQCKP13VCFA4DHC4BJT88HEXQ5K8HW
-Label: ć–°namesystem
+Label: namesystem
RRCOUNT: 3
Record #0
@@ -3377,7 +3360,7 @@ DATA:
e6849be7a7b0
Record #2
-EXPIRATION: 6165033256
+EXPIRATION: 6089306424
DATA_SIZE: 11
TYPE: 16
FLAGS: 4004
@@ -3394,7 +3377,7 @@ RDATA:
00b00f81b7449b40
0006800000010001
e6849be7a7b00000
-00016f76f128000b
+00016af37138000b
4004000000104865
6c6c6f20576f726c
6400000000000000
@@ -3405,79 +3388,79 @@ e6849be7a7b00000
0000000000000000
Encryption NONCE|EXPIRATION:
-aef34a3af13e5037
-44d42d7ab87b5b1c
-0005d8153f5ce2b5
+d9402801e26324b6
+0c227f25203e9f26
+0005d8160d59693e
Encryption key (K):
-7762a127a2ca352d
-48748658804eefdd
-966a3dbdc1be8398
-dcdd3a79aad7d260
+20007fe09b16dc86
+e0fd0d74fb3d5d0b
+7962d7fe5301a7b4
+ec9f8bfd935cc9d2
Storage key (q):
-39344b89fa1e2664
-692d7d181789da00
-31e5a97ec819e2d2
-eb8a1eecda089fff
-007bbfb9c330d5bb
-4d8e57e6b34e1423
-1839d7e8ec041317
-c633ee2d35596799
+82584d4d2c314be7
+5b304222a63fa6e4
+e52ea63d7dbd153c
+6e3ba1ae749c5772
+e1c6b245633c5563
+37c7fc60b0115888
+ad5ade579522e9d7
+10fa23cd93e56e8c
BDATA:
-21a494ec009293ff
-b3a3fd56d780a44e
-e42d589eec596e73
-cc03a51f07fb8700
-3245a9d1a3d35fc1
-5f0ad5a406c8b20d
-e584f23a4effe2af
-87d5be621897e7cc
-1aa2373f57a57609
-6392c5e080e0b29b
-83ccdab66ee5e00d
-83843addf13b618d
-89e00496dde2b254
-2572c7fec2d8654b
-80b4158f91831f63
-c182abc15759a0b6
-b5d2d9e938946ca9
-3fbe1a473a9f4d86
+92b722bc0289cccc
+c073b2c741abe8fb
+ee9b961bae66312a
+7be8cb9db2a34508
+55a8709eba0288d8
+4e3b0302c24e8f0b
+079f2aa90dcb884e
+d4ec3157b0652ee3
+126ec890c6352ef5
+0a7b207e55a5e99b
+4f78d900e7ce10b5
+295a7af328cd249e
+61adc50fd185af21
+b00789dc7213590c
+2e2eca61119434c5
+ee859f0f228ccdb9
+e9b0ad33a5aaa9b5
+8d96b7f901c7b895
RRBLOCK:
0000010000010014
-97ac4f350a7af343
-9fbe56ed105a1c5c
-2fa8651079ffb121
-d3b3dbd998836156
-83a47457d5bf10fd
-2964d4b9b3f24a13
-c677f73d91ac9881
-e74164785969c3a4
-5008d371911c18a5
-5bc71365e1c6d939
-7b9dd7058e263c0e
-08d66f87cfb96201
-0005d8153f5ce2b5
-21a494ec009293ff
-b3a3fd56d780a44e
-e42d589eec596e73
-cc03a51f07fb8700
-3245a9d1a3d35fc1
-5f0ad5a406c8b20d
-e584f23a4effe2af
-87d5be621897e7cc
-1aa2373f57a57609
-6392c5e080e0b29b
-83ccdab66ee5e00d
-83843addf13b618d
-89e00496dde2b254
-2572c7fec2d8654b
-80b4158f91831f63
-c182abc15759a0b6
-b5d2d9e938946ca9
-3fbe1a473a9f4d86
+1e7f6acfa589c933
+6eae0bd307c893c4
+85a873cf0cbbfd9d
+54d04c13e3b7d284
+aadc29066b2db0e3
+690484e4396113fe
+d1c27d636b49863b
+85a0551d633b4213
+c1a0d47f5be7b6d1
+7632368b1ba4d57f
+8b2b5866bb8abe33
+61472e36e98d510e
+0005d8160d59693e
+92b722bc0289cccc
+c073b2c741abe8fb
+ee9b961bae66312a
+7be8cb9db2a34508
+55a8709eba0288d8
+4e3b0302c24e8f0b
+079f2aa90dcb884e
+d4ec3157b0652ee3
+126ec890c6352ef5
+0a7b207e55a5e99b
+4f78d900e7ce10b5
+295a7af328cd249e
+61adc50fd185af21
+b00789dc7213590c
+2e2eca61119434c5
+ee859f0f228ccdb9
+e9b0ad33a5aaa9b5
+8d96b7f901c7b895
]]>
</artwork>
<t>
