Skip to content

Fix wording around AD/AAD #20

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix wording around AD/AAD #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions openvpn-wire-protocol.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1955,15 +1955,15 @@ struct aead_packet {
</t>

<t>
For DATA_V2 packets the authenticated data <em>includes</em> opcode,
key_id and peer_id. For DATA_V1 packets the authenticated data starts
For DATA_V2 packets the associated data <em>includes</em> opcode,
key_id and peer_id. For DATA_V1 packets the associated data starts
on the first byte of packet_id, not including opcode and key_id.
</t>

<t>
<sourcecode>
authenticated_data_v1 = packet_id | payload
authenticated_data_v2 = opcode| key_id | peer_id | packet_id | payload
associated_data_v1 = packet_id
associated_data_v2 = opcode| key_id | peer_id | packet_id
</sourcecode>
</t>

Expand Down Expand Up @@ -2034,12 +2034,12 @@ struct packet_id {
</t>
<t>
This data format is only defined for DATA_V2 packets and therefore
the authenticated data <em>includes</em> opcode, key_id and peer_id.
the associated data <em>includes</em> opcode, key_id and peer_id.
</t>

<t>
<sourcecode>
authenticated_data = opcode| key_id | peer_id | packet_id | payload
associated_data = opcode| key_id | peer_id | packet_id
</sourcecode>
</t>

Expand Down