commit 19c9dd81ea7f51f4d073b78280c12a78a0d58b69
parent 1253010f83b1935e4681d9f9310b19311395ac62
Author: Martin Schanzenbach <schanzen@gnunet.org>
Date: Sun, 3 Aug 2025 21:52:37 +0200
update with recent minor changes
Diffstat:
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/draft-schanzen-cake.xml b/draft-schanzen-cake.xml
@@ -204,11 +204,11 @@ ss_e | |
ss_R | |
| |
| InitiatorHello: |
+ | r_I |
| pk_e |
| c_R |
- | r_I |
| H(pk_R) |
- | {pk_I,svcinfo_I}ETS |
+ | {pk_I,pc_I,svcinfo_I}ETS |
+---------------------------------------------->|
| | r_R
| | r_I
@@ -220,9 +220,9 @@ ss_R | |
| | ss_I
| | ss_e
| ResponderHello: |
- | c_e |
| r_R |
- | {svcinfo_R,c_I}RHTS |
+ | c_e |
+ | {c_I,pc_R,svcinfo_R}RHTS |
| {finished_R}RHTS |
| [ACK]RATS |
|<----------------------------------------------+
@@ -252,6 +252,7 @@ ss_e | |
ResponderHello is a single flight that is implicitly ack'ed with finished<sub>I</sub>.
The reason why this works is because CAKE groups the messages in row 3 of Table 1 in <xref target="RFC9147" section="5.7"/> into a single message (ResponderHello).
Hence the only message that is sent without any expected response (and consequently requiring an explicit ACK) is finished<sub>I</sub> (and Heartbeats).
+ pc<sub>X</sub> are 16 bit fields that indicate the peer class (FIXME peer class section).
N<sub>I</sub> is a nonce generated by the initiator.
N<sub>R</sub> is a nonce generated by the responder.
</t>
@@ -487,7 +488,7 @@ nonce = HKDF-Expand-Label ([I,R][A,H]TS, "iv", 24)
<ul>
<li>InitiatorHello</li>
<li>ResponderHello</li>
- <li>HandshakeFinished</li>
+ <li>InitiatorDone</li>
<li>EncryptedMessage</li>
</ul>
<t>
@@ -495,7 +496,7 @@ nonce = HKDF-Expand-Label ([I,R][A,H]TS, "iv", 24)
and the allowed types are:
</t>
<ul>
- <li>KeyUpdate</li>
+ <li>Hearbeat</li>
<li>Ack</li>
<li>ApplicationData</li>
</ul>
@@ -509,6 +510,8 @@ nonce = HKDF-Expand-Label ([I,R][A,H]TS, "iv", 24)
<artwork name="" type="" align="left" alt=""><![CDATA[
0 8 16 24 32 40 48 56
+-----+-----+-----+-----+-----+-----+-----+-----+
+ | r_I |
+ +-----+-----+-----+-----+-----+-----+-----+-----+
| pk_e |
| |
| |
@@ -522,9 +525,7 @@ nonce = HKDF-Expand-Label ([I,R][A,H]TS, "iv", 24)
/ /
| |
+-----+-----+-----+-----+-----+-----+-----+-----+
- | r_I |
- +-----+-----+-----+-----+-----+-----+-----+-----+
- / {pk_I,svcinfo_I} /
+ / {pk_I,pc_I,svcinfo_I} /
]]></artwork>
</figure>
<t>
@@ -548,14 +549,14 @@ nonce = HKDF-Expand-Label ([I,R][A,H]TS, "iv", 24)
<artwork name="" type="" align="left" alt=""><![CDATA[
0 8 16 24 32 40 48 56
+-----+-----+-----+-----+-----+-----+-----+-----+
+ | r_R |
+ +-----+-----+-----+-----+-----+-----+-----+-----+
| c_e |
| |
| |
| |
+-----+-----+-----+-----+-----+-----+-----+-----+
- | r_R |
- +-----+-----+-----+-----+-----+-----+-----+-----+
- / {svcinfo_R,c_I}{finished_R} /
+ / {c_I,pc_I,svcinfo_R}{finished_R} /
]]></artwork>
</figure>
<t>
