Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions schema/cryptography-defs.json
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,16 @@
"pattern": "AES[-(128|192|256)]-CTR-HMAC-SHA1[-96]",
Copy link
Contributor

Choose a reason for hiding this comment

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

This now seems to replace the AES-CTR-HMAC-SHA1.
Is this intended? looks like an artefact after the merge conflict.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not intended. During the rebase, the patch for AES-SIV was incorrectly applied on top of the existing AES-CTR-HMAC-SHA1 entry (RFC3686), which made it look like a replacement. I’ve fixed the conflict resolution to keep AES-CTR-HMAC-SHA1 intact and add AES-SIV (RFC 5297) as a separate ae variant under the AES family.

"primitive": "ae"
},
{
"standard": [
{
"name": "RFC 5297",
"url": "https://doi.org/10.17487/RFC5297"
}
],
"pattern": "AES[-(128|192|256)]-SIV",
"primitive": "ae"
},
{
"standard": [
{
Expand Down