Skip to content

Backwards-compatible AEAD key separation

Daniel Huigens requested to merge twisstle/rfc4880bis:compat-aead-key-separation into main

(This is option 2 as discussed in https://mailarchive.ietf.org/arch/msg/openpgp-dt/U2j_yx-2wlWEGXjUx5GQJ6i5Z14/.)

This partially reverts commit 8aeeaf0d ("Move cipher and AEAD algorithm from AEAD packet to ESK packets"), and keeps the cipher and AEAD algorithm in the AEAD Encrypted Data packet as well as the V5 ESK packets.

Also, update the examples to match.

Finally, also update the requirements to be backwards-compatible with existing AEAD-encrypted EAX and OCB messages using V3 PKESK or V4 SKESK packets.

Merge request reports