kytv/I2P_Website
1
0
Fork 0
forked from I2P_Developers/i2p.www
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

prop 111 minor cleanups

Browse Source
This commit is contained in:
zzz
2018-06-20 14:20:23 +00:00
parent 741df1405a
commit dd7ae80111
1 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
i2p2www/spec/proposals/111-ntcp-2.rst
View File

@@ -778,7 +778,7 @@ Raw contents:
+ n = 0 + + n = 0 +
| see KDF for associated data | | see KDF for associated data |
+----+----+----+----+----+----+----+----+ +----+----+----+----+----+----+----+----+
| unencrypted, authenticated | | unencrypted authenticated |
~ padding (optional) ~ ~ padding (optional) ~
| length defined in options block | | length defined in options block |
+----+----+----+----+----+----+----+----+ +----+----+----+----+----+----+----+----+
@@ -816,7 +816,7 @@ Unencrypted data (Poly1305 authentication tag not shown):
+ (16 bytes) + + (16 bytes) +
| | | |
+----+----+----+----+----+----+----+----+ +----+----+----+----+----+----+----+----+
| unencrypted, authenticated | | unencrypted authenticated |
+ padding (optional) + + padding (optional) +
| length defined in options block | | length defined in options block |
~ . . . ~ ~ . . . ~
@@ -1101,7 +1101,7 @@ Raw contents:
+ + + +
| | | |
+----+----+----+----+----+----+----+----+ +----+----+----+----+----+----+----+----+
| unencrypted, authenticated | | unencrypted authenticated |
+ padding (optional) + + padding (optional) +
| length defined in options block | | length defined in options block |
~ . . . ~ ~ . . . ~
@@ -1132,7 +1132,7 @@ Unencrypted data (Poly1305 auth tag not shown):
+ (16 bytes) + + (16 bytes) +
| | | |
+----+----+----+----+----+----+----+----+ +----+----+----+----+----+----+----+----+
| unencrypted, authenticated | | unencrypted authenticated |
+ padding (optional) + + padding (optional) +
| length defined in options block | | length defined in options block |
~ . . . ~ ~ . . . ~
@@ -1179,6 +1179,9 @@ Notes
as Alice has not responded with message 3 yet. as Alice has not responded with message 3 yet.
Options block:
Note: All fields are big-endian.
.. raw:: html .. raw:: html
{% highlight lang='dataspec' %} {% highlight lang='dataspec' %}
@@ -1373,7 +1376,7 @@ Raw contents:
| | | |
+ ChaChaPoly frame (48 bytes) + + ChaChaPoly frame (48 bytes) +
| Encrypted and authenticated | | Encrypted and authenticated |
+ Alice's static key S + + Alice static key S +
| (32 bytes) | | (32 bytes) |
+ + + +
| k from KDF for message 2 | | k from KDF for message 2 |
@@ -1388,9 +1391,9 @@ Raw contents:
+ ChaChaPoly frame + + ChaChaPoly frame +
| Encrypted and authenticated | | Encrypted and authenticated |
+ + + +
| Alice's RouterInfo | | Alice RouterInfo |
+ using block format 2 + + using block format 2 +
| Alice's Options (optional) | | Alice Options (optional) |
+ using block format 1 + + using block format 1 +
| Arbitrary padding | | Arbitrary padding |
+ using block format 254 + + using block format 254 +
@@ -1417,7 +1420,7 @@ Unencrypted data (Poly1305 auth tags not shown):
| | | |
+ + + +
| S | | S |
+ Alice's static key + + Alice static key +
| (32 bytes) | | (32 bytes) |
+ + + +
| | | |
@@ -1427,7 +1430,7 @@ Unencrypted data (Poly1305 auth tags not shown):
+ + + +
| | | |
+ + + +
| Alice's RouterInfo block | | Alice RouterInfo block |
~ . . . ~ ~ . . . ~
| | | |
+----+----+----+----+----+----+----+----+ +----+----+----+----+----+----+----+----+
@@ -1682,10 +1685,6 @@ Following is from obfs4:
{% endhighlight %} {% endhighlight %}
Maximum size
````````````
Raw contents Raw contents
```````````` ````````````
@@ -1843,9 +1842,9 @@ Options block will be variable length.
(or think of it as an unsigned 8-bit integer divided by 16.0). (or think of it as an unsigned 8-bit integer divided by 16.0).
This is the ratio of padding to data. Examples: This is the ratio of padding to data. Examples:
Value of 0x00 means no padding Value of 0x00 means no padding
Value of 0x01 means add 6% padding Value of 0x01 means add 6 percent padding
Value of 0x10 means add 100% padding Value of 0x10 means add 100 percent padding
Value of 0x80 means add 800% (8x) padding Value of 0x80 means add 800 percent (8x) padding
Alice and Bob will negotiate the minimum and maximum in each direction. Alice and Bob will negotiate the minimum and maximum in each direction.
These are guidelines, there is no enforcement. These are guidelines, there is no enforcement.
Sender should honor receiver's maximum. Sender should honor receiver's maximum.
@@ -1878,9 +1877,9 @@ Used optionally in the data phase.
+----+----+----+----+----+----+----+----+ +----+----+----+----+----+----+----+----+
| 2 | size |flg | RouterInfo | | 2 | size |flg | RouterInfo |
+----+----+----+----+ + +----+----+----+----+ +
| (Alice's in handshake msg 3 part 2) | | (Alice RI in handshake msg 3 part 2) |
~ (Alice's or Bob's in data phase) ~ ~ (Alice, Bob, or third-party ~
| | | RI in data phase) |
~ . . . ~ ~ . . . ~
| | | |
+----+----+----+----+----+----+----+----+ +----+----+----+----+----+----+----+----+
@@ -2023,7 +2022,7 @@ This must be the last non-padding block in the frame.
13: message 3 error 13: message 3 error
14: intra-frame read timeout 14: intra-frame read timeout
15: RI signature verification fail 15: RI signature verification fail
16: "s" missing, invalid, or mismatched in RI 16: s parameter missing, invalid, or mismatched in RouterInfo
17: banned 17: banned
addl data :: optional, 0 or more bytes, for future expansion or debugging, addl data :: optional, 0 or more bytes, for future expansion or debugging,
format unspecified and may vary based on reason code format unspecified and may vary based on reason code