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

PHK's keyid changes #196

Merged
merged 4 commits into from Jun 22, 2016
Merged

PHK's keyid changes #196

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d40e6a2
Improving definition of keyid
martinthomson Jun 8, 2016
07b95cc
Removing lame examples
martinthomson Jun 8, 2016
8b223aa
Don't use 'it'.
martinthomson Jun 8, 2016
d6c77f4
Just don't define what keyid is
martinthomson Jun 8, 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
17 changes: 9 additions & 8 deletions draft-ietf-httpbis-encryption-encoding.md
View file
Open in desktop
Expand Up @@ -250,11 +250,12 @@ is used for encryption:

keyid:

: The "keyid" parameter contains a string that identifies the keying material
that is used. The "keyid" parameter SHOULD be included, unless key
identification is guaranteed by other means. The "keyid" parameter MUST be
used if keying material included in an Crypto-Key header field is needed to
derive the content encryption key.
: The "keyid" parameter identifies the keying material that is used. When the
Crypto-Key header field is used, the "keyid" identifies a matching value in
that field. The "keyid" parameter MUST be used if keying material included
in an Crypto-Key header field is needed to derive the content encryption key.
The "keyid" parameter can also be used to identify keys in an
application-specific fashion.

salt:

Expand Down Expand Up @@ -507,7 +508,7 @@ HTTP/1.1 200 OK
Content-Type: application/octet-stream
Content-Encoding: aesgcm
Connection: close
Encryption: keyid="http://example.org/bob/keys/123";
Encryption: keyid="bob/keys/123";
salt="XZwpw6o37R-6qoZjw6KwAw"

[encrypted payload]
Expand All @@ -531,7 +532,7 @@ HTTP/1.1 200 OK
Content-Type: text/html
Content-Encoding: gzip, aesgcm
Transfer-Encoding: chunked
Encryption: keyid="mailto:me@example.com";
Encryption: keyid="me@example.com";
salt="m2hJ_NttRtFyUiMRPwfpHA"

[encrypted payload]
Expand All @@ -552,7 +553,7 @@ Content-Encoding: aesgcm, aesgcm
Content-Length: 1235
Encryption: keyid="mailto:me@example.com";
salt="NfzOeuV5USPRA-n_9s1Lag",
keyid="http://example.org/bob/keys/123";
keyid="bob/keys/123";
salt="bDMSGoc2uobK_IhavSHsHA"; rs=1200

[encrypted payload]
Expand Down