diff options
author | Martin Schanzenbach <mschanzenbach@posteo.de> | 2020-05-26 16:26:38 +0200 |
---|---|---|
committer | Martin Schanzenbach <mschanzenbach@posteo.de> | 2020-05-26 16:26:38 +0200 |
commit | 9145566b383c5f83a50d189fbd925a95683b721f (patch) | |
tree | e8238d88198b13ca054d70970b0c2121c76f800e | |
parent | 11206444f97143b5179a95955117299e5a42d011 (diff) | |
download | lsd0001-9145566b383c5f83a50d189fbd925a95683b721f.tar.gz lsd0001-9145566b383c5f83a50d189fbd925a95683b721f.zip |
fix some nits
-rw-r--r-- | draft-schanzen-gns.xml | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/draft-schanzen-gns.xml b/draft-schanzen-gns.xml index f1a9157..0060c41 100644 --- a/draft-schanzen-gns.xml +++ b/draft-schanzen-gns.xml | |||
@@ -154,7 +154,7 @@ | |||
154 | <dt>B</dt> | 154 | <dt>B</dt> |
155 | <dd> | 155 | <dd> |
156 | is the group generator (X(P),Y(P)) of edwards25519 as defined in | 156 | is the group generator (X(P),Y(P)) of edwards25519 as defined in |
157 | <xref target="RFC7748" />. | 157 | <xref target="RFC7748" />. |
158 | </dd> | 158 | </dd> |
159 | <dt>L</dt> | 159 | <dt>L</dt> |
160 | <dd> | 160 | <dd> |
@@ -164,9 +164,8 @@ | |||
164 | <dd> | 164 | <dd> |
165 | is the ECDSA public key corresponding to d. It is defined in | 165 | is the ECDSA public key corresponding to d. It is defined in |
166 | <xref target="RFC6979" /> as the curve point d*B where B is the group | 166 | <xref target="RFC6979" /> as the curve point d*B where B is the group |
167 | generator of the elliptic curve. | 167 | generator of the elliptic curve. The public key is used to uniquely |
168 | The public key is used to uniquely identify a GNS zone and is referred to | 168 | identify a GNS zone and is referred to as the "zone key". |
169 | as the "zone key". | ||
170 | </dd> | 169 | </dd> |
171 | </dl> | 170 | </dl> |
172 | </section> | 171 | </section> |
@@ -448,8 +447,8 @@ | |||
448 | defines the BOX record format to box up SRV and TLSA records and | 447 | defines the BOX record format to box up SRV and TLSA records and |
449 | include them in the record set of the label they are associated | 448 | include them in the record set of the label they are associated |
450 | with. For example, a | 449 | with. For example, a |
451 | TLSA record for "_https._tcp.foo.gnu" will be stored in the record set of | 450 | TLSA record for "_https._tcp.example.org" will be stored in the record set of |
452 | "foo.gnu" as a BOX record with service (SVC) 443 (https) and protocol (PROTO) 6 | 451 | "example.org" as a BOX record with service (SVC) 443 (https) and protocol (PROTO) 6 |
453 | (tcp) and record TYPE "TLSA". | 452 | (tcp) and record TYPE "TLSA". |
454 | For reference, see also <xref target="RFC2782" />. | 453 | For reference, see also <xref target="RFC2782" />. |
455 | A BOX DATA entry has the following format: | 454 | A BOX DATA entry has the following format: |
@@ -582,8 +581,7 @@ q := SHA512 (zk_h) | |||
582 | is the 256-bit private zone key as defined in <xref target="zones" />. | 581 | is the 256-bit private zone key as defined in <xref target="zones" />. |
583 | </dd> | 582 | </dd> |
584 | <dt>label</dt> | 583 | <dt>label</dt> |
585 | <dd> | 584 | <dd>is a UTF-8 string under which the resource records are published. |
586 | is a UTF-8 string under which the resource records are published. | ||
587 | </dd> | 585 | </dd> |
588 | <dt>d_h</dt> | 586 | <dt>d_h</dt> |
589 | <dd> | 587 | <dd> |
@@ -1070,7 +1068,7 @@ BDATA := TWOFISH(K[32:63], IV[16:31], | |||
1070 | <section anchor="nick_processing" numbered="true" toc="default"> | 1068 | <section anchor="nick_processing" numbered="true" toc="default"> |
1071 | <name>NICK</name> | 1069 | <name>NICK</name> |
1072 | <t> | 1070 | <t> |
1073 | NIICK records are only relevant to the recursive resolver | 1071 | NICK records are only relevant to the recursive resolver |
1074 | if the record set in question is the final result which is to | 1072 | if the record set in question is the final result which is to |
1075 | be returned to the client. The encountered NICK records may either | 1073 | be returned to the client. The encountered NICK records may either |
1076 | be supplemental (see <xref target="rrecords"/>) or | 1074 | be supplemental (see <xref target="rrecords"/>) or |
@@ -1086,9 +1084,9 @@ BDATA := TWOFISH(K[32:63], IV[16:31], | |||
1086 | </t> | 1084 | </t> |
1087 | <figure> | 1085 | <figure> |
1088 | <artwork name="" type="" align="left" alt=""><![CDATA[ | 1086 | <artwork name="" type="" align="left" alt=""><![CDATA[ |
1089 | Query: alice.doe (type=A) | 1087 | Query: alice.example (type=A) |
1090 | Result: | 1088 | Result: |
1091 | A: 1.2.3.4 | 1089 | A: 192.0.2.1 |
1092 | NICK: eve | 1090 | NICK: eve |
1093 | ]]></artwork> | 1091 | ]]></artwork> |
1094 | </figure> | 1092 | </figure> |
@@ -1102,9 +1100,9 @@ NICK: eve | |||
1102 | </t> | 1100 | </t> |
1103 | <figure> | 1101 | <figure> |
1104 | <artwork name="" type="" align="left" alt=""><![CDATA[ | 1102 | <artwork name="" type="" align="left" alt=""><![CDATA[ |
1105 | Query: alice.doe (type=A) | 1103 | Query: alice.example (type=AAAA) |
1106 | Result: | 1104 | Result: |
1107 | A: 1.2.3.4 | 1105 | AAAA: 2001:DB8::1 |
1108 | NICK: john (Supplemental) | 1106 | NICK: john (Supplemental) |
1109 | ]]></artwork> | 1107 | ]]></artwork> |
1110 | </figure> | 1108 | </figure> |
@@ -1146,6 +1144,7 @@ NICK: john (Supplemental) | |||
1146 | following parameters: | 1144 | following parameters: |
1147 | </t> | 1145 | </t> |
1148 | <artwork name="" type="" align="left" alt=""><![CDATA[ | 1146 | <artwork name="" type="" align="left" alt=""><![CDATA[ |
1147 | <CODE BEGINS> | ||
1149 | S := "GnsRevocationPow" /* Salt, 16 byte */ | 1148 | S := "GnsRevocationPow" /* Salt, 16 byte */ |
1150 | t := 3 /* Iterations */ | 1149 | t := 3 /* Iterations */ |
1151 | m := 1024 /* Memory size, 1 MiB */ | 1150 | m := 1024 /* Memory size, 1 MiB */ |
@@ -1154,6 +1153,7 @@ p := 1 /* Parallelization parameter */ | |||
1154 | v := 0x13 /* Version */ | 1153 | v := 0x13 /* Version */ |
1155 | y := 2 /* Type (Argon2id) */ | 1154 | y := 2 /* Type (Argon2id) */ |
1156 | X, K are unused | 1155 | X, K are unused |
1156 | <CODE ENDS> | ||
1157 | ]]></artwork> | 1157 | ]]></artwork> |
1158 | <t> | 1158 | <t> |
1159 | The following is the message string "P" on which the PoW is | 1159 | The following is the message string "P" on which the PoW is |
@@ -1401,7 +1401,7 @@ Example name: www.example.<Base32(zk)> | |||
1401 | resolution SHOULD start from the respective local zone: | 1401 | resolution SHOULD start from the respective local zone: |
1402 | </t> | 1402 | </t> |
1403 | <artwork name="" type="" align="left" alt=""><![CDATA[ | 1403 | <artwork name="" type="" align="left" alt=""><![CDATA[ |
1404 | Example name: www.example.gnu | 1404 | Example name: www.example.org |
1405 | Local zones: | 1405 | Local zones: |
1406 | fr = (d0,zk0) | 1406 | fr = (d0,zk0) |
1407 | gnu = (d1,zk1) | 1407 | gnu = (d1,zk1) |
@@ -1422,10 +1422,10 @@ com = (d2,zk2) | |||
1422 | for the same suffix, the locally managed zone MUST have priority. | 1422 | for the same suffix, the locally managed zone MUST have priority. |
1423 | </t> | 1423 | </t> |
1424 | <artwork name="" type="" align="left" alt=""><![CDATA[ | 1424 | <artwork name="" type="" align="left" alt=""><![CDATA[ |
1425 | Example name: www.example.gnu | 1425 | Example name: www.example.org |
1426 | Local suffix mappings: | 1426 | Local suffix mappings: |
1427 | gnu = zk0 | 1427 | gnu = zk0 |
1428 | example.gnu = zk1 | 1428 | example.org = zk1 |
1429 | example.com = zk2 | 1429 | example.com = zk2 |
1430 | ... | 1430 | ... |
1431 | => Entry zone: zk1 | 1431 | => Entry zone: zk1 |
@@ -1728,7 +1728,7 @@ b7a066dd | |||
1728 | </t> | 1728 | </t> |
1729 | <artwork name="" type="" align="left" alt=""> | 1729 | <artwork name="" type="" align="left" alt=""> |
1730 | <![CDATA[ | 1730 | <![CDATA[ |
1731 | Zone private key (d, little-endian scalar): | 1731 | Zone private key (d, little-endian scalar): |
1732 | 90ea2a95cb9ef482b45817dc45b805cae00f387022a065a3674f41ad15173c63 | 1732 | 90ea2a95cb9ef482b45817dc45b805cae00f387022a065a3674f41ad15173c63 |
1733 | 1733 | ||
1734 | Zone public key (zk): | 1734 | Zone public key (zk): |