Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Clean up key expansion #699

Closed
wants to merge 2 commits into from
Closed

Clean up key expansion #699

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
412d02b
Checkpoint
ekr Oct 17, 2016
fccd1c4
Follow up to Finished Stuffing PR: simplify the traffic key computation
ekr Oct 17, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 6 additions & 13 deletions draft-ietf-tls-tls13.md
View file
Open in desktop
Expand Up @@ -3942,27 +3942,20 @@ keys.
The traffic keying material is generated from the following input values:

* A secret value
* A phase value indicating the phase of the protocol the keys are
being generated for
* A purpose value indicating the specific value being generated
* The length of the key

The keying material is computed using:

key = HKDF-Expand-Label(Secret,
phase + ", " + purpose,
"",
key_length)

key = HKDF-Expand-Label(Secret, purpose, "", key_length_
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

last '_' should be a ')'

The following table describes the inputs to the key calculation for
each class of traffic keys:

| Record Type | Secret | Phase |
|:------------|--------|-------|
| 0-RTT Handshake | client_early_traffic_secret | "early handshake key expansion" |
| 0-RTT Application | client_early_traffic_secret | "early application data key expansion" |
| Handshake | [sender]_handshake_traffic_secret | "handshake key expansion" |
| Application Data | [sender]_traffic_secret_N | "application data key expansion" |
| Record Type | Secret |
|:------------|--------|
| 0-RTT Application | client_early_traffic_secret |
| Handshake | [sender]_handshake_traffic_secret |
| Application Data | [sender]_traffic_secret_N |

The [sender] in this table denotes the sending side. The
following table indicates the purpose values for each type of key:
Expand Down