Change in openvpn[master]: Rename aead-tag-at-end to aead-epoch
A message that is not in the archive (sent off-list or not yet received): gerrit.1731290343000.I9e9433b56dcbaa538d9bed30e50cf74948c647cc@...2715...
Attention is currently required from: flichtenheld.
Hello flichtenheld,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/805?usp=email
to review the following change.
Change subject: Rename aead-tag-at-end to aead-epoch
......................................................................
Rename aead-tag-at-end to aead-epoch
---
M src/openvpn/crypto.c
M src/openvpn/crypto.h
M src/openvpn/init.c
M src/openvpn/options.c
M src/openvpn/push.c
M src/openvpn/ssl.h
M tests/unit_tests/openvpn/test_ssl.c
7 files changed, 17 insertions(+), 13 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/05/805/1
src/openvpn/crypto.c +3 -3
@@ -128,7 +128,7 @@dmsg (D_PACKET_CONTENT ,"ENCRYPT AD: %s" ,format_hex (BPTR (&work),BLEN (&work),0 , &gc)); -if (!(opt->flags &CO_AEAD_TAG_AT_THE_END )) +if (!(opt->flags &CO_EPOCH_DATA_KEY_FORMAT )) {/* Reserve space for authentication tag */ mac_out =buf_write_alloc (&work, mac_len);
@@ -149,7 +149,7 @@ASSERT (buf_inc_len (&work, outlen));/* if the tag is at end the end, allocate it now */ -if (opt->flags &CO_AEAD_TAG_AT_THE_END ) +if (opt->flags &CO_EPOCH_DATA_KEY_FORMAT ) {/* Reserve space for authentication tag */ mac_out =buf_write_alloc (&work, mac_len);
@@ -475,7 +475,7 @@uint8_t *tag_ptr =NULL ;int data_len =0 ; -if (opt->flags &CO_AEAD_TAG_AT_THE_END ) +if (opt->flags &CO_EPOCH_DATA_KEY_FORMAT ) { data_len =BLEN (buf) - tag_size; tag_ptr =BPTR (buf) + data_len;
src/openvpn/crypto.h +4 -3
@@ -359,9 +359,10 @@/**< Bit-flag indicating that renegotiations are using tls-crypt * with a TLS-EKM derived key. */ -#define CO_AEAD_TAG_AT_THE_END (1<<8) -/**< Bit-flag indicating that the AEAD tag is at the end of the -* packet. +#define CO_EPOCH_DATA_KEY_FORMAT (1<<8) +/**< Bit-flag indicating that the data format using +* AEAD tag is at the end of the packet and using epoch +* keys is used. */ unsigned int flags;/**< Bit-flags determining behavior of
src/openvpn/init.c +2 -2
@@ -2390,9 +2390,9 @@ {buf_printf (&out," dyn-tls-crypt" ); } -if (o->imported_protocol_flags &CO_AEAD_TAG_AT_THE_END ) +if (o->imported_protocol_flags &CO_EPOCH_DATA_KEY_FORMAT ) { -buf_printf (&out," aead-tag-end" ); +buf_printf (&out," aead-epoch" ); } }
src/openvpn/options.c +2 -2
@@ -8692,9 +8692,9 @@ options->imported_protocol_flags |=CO_USE_DYNAMIC_TLS_CRYPT ; }#endif - else if (streq(p[j], "aead-tag-end")) + else if (streq(p[j], "aead-epoch")) { - options->imported_protocol_flags |=CO_AEAD_TAG_AT_THE_END ; + options->imported_protocol_flags |=CO_EPOCH_DATA_KEY_FORMAT ; } else {
src/openvpn/push.c +2 -2
@@ -689,9 +689,9 @@buf_printf (&proto_flags," dyn-tls-crypt" ); } -if (o->imported_protocol_flags &CO_AEAD_TAG_AT_THE_END ) +if (o->imported_protocol_flags &CO_EPOCH_DATA_KEY_FORMAT ) { -buf_printf (&proto_flags," aead-tag-end" ); +buf_printf (&proto_flags," aead-epoch" ); }if (buf_len (&proto_flags) >0 )
src/openvpn/ssl.h +3 -0
@@ -107,6 +107,9 @@/** Support to dynamic tls-crypt (renegotiation with TLS-EKM derived tls-crypt key) */ #define IV_PROTO_DYN_TLS_CRYPT (1<<9) +/** Support the extended packet id and epoch format for data channel packets */ +#define IV_PROTO_DATA_EPOCH (1<<10) +/** Supports the --dns option after all the incompatible changes */ #define IV_PROTO_DNS_OPTION_V2 (1<<11)
tests/unit_tests/openvpn/test_ssl.c +1 -1
@@ -404,7 +404,7 @@ run_data_channel_with_cipher_end(const char *cipher) {struct crypto_options co =init_crypto_options (cipher,"none" ); - co.flags |=CO_AEAD_TAG_AT_THE_END ; + co.flags |=CO_EPOCH_DATA_KEY_FORMAT ;do_data_channel_round_trip (&co);uninit_crypto_options (&co); }
Signature · 13 lines
To view, visit http://gerrit.openvpn.net/c/openvpn/+/805?usp=email To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I9e9433b56dcbaa538d9bed30e50cf74948c647cc Gerrit-Change-Number: 805 Gerrit-PatchSet: 1 Gerrit-Owner: plaisthos <[email protected]...> Gerrit-Reviewer: flichtenheld <[email protected]...> Gerrit-CC: openvpn-devel <[email protected]> Gerrit-Attention: flichtenheld <[email protected]...> Gerrit-MessageType: newchange
Attention is currently required from: flichtenheld.
Hello flichtenheld,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/805?usp=email
to look at the new patch set (#3).
Change subject: Rename aead-tag-at-end to aead-epoch
......................................................................
Rename aead-tag-at-end to aead-epoch
---
M doc/man-sections/client-options.rst
M src/openvpn/crypto.c
M src/openvpn/crypto.h
M src/openvpn/init.c
M src/openvpn/options.c
M src/openvpn/push.c
M src/openvpn/ssl.h
M tests/unit_tests/openvpn/test_ssl.c
8 files changed, 18 insertions(+), 13 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/05/805/3
doc/man-sections/client-options.rst +1 -0
@@ -367,6 +367,7 @@ - bit 7: The client is capable of sending exit notification via control channel using ``EXIT`` message. Also, the client is accepting the protocol-flags pushed option for the EKM capability - bit 8: The client is capable of accepting ``AUTH_FAILED,TEMP`` messages - bit 9: The client is capable of dynamic tls-crypt + - bit 10: The client is capable of data epoch keys :code:`IV_NCP=2` Negotiable ciphers, client supports ``--cipher`` pushed by
src/openvpn/crypto.c +3 -3
@@ -128,7 +128,7 @@dmsg (D_PACKET_CONTENT ,"ENCRYPT AD: %s" ,format_hex (BPTR (&work),BLEN (&work),0 , &gc)); -if (!(opt->flags &CO_AEAD_TAG_AT_THE_END )) +if (!(opt->flags &CO_EPOCH_DATA_KEY_FORMAT )) {/* Reserve space for authentication tag */ mac_out =buf_write_alloc (&work, mac_len);
@@ -149,7 +149,7 @@ASSERT (buf_inc_len (&work, outlen));/* if the tag is at end the end, allocate it now */ -if (opt->flags &CO_AEAD_TAG_AT_THE_END ) +if (opt->flags &CO_EPOCH_DATA_KEY_FORMAT ) {/* Reserve space for authentication tag */ mac_out =buf_write_alloc (&work, mac_len);
@@ -475,7 +475,7 @@uint8_t *tag_ptr =NULL ;int data_len =0 ; -if (opt->flags &CO_AEAD_TAG_AT_THE_END ) +if (opt->flags &CO_EPOCH_DATA_KEY_FORMAT ) { data_len =BLEN (buf) - tag_size; tag_ptr =BPTR (buf) + data_len;
src/openvpn/crypto.h +4 -3
@@ -362,9 +362,10 @@/**< Bit-flag indicating that renegotiations are using tls-crypt * with a TLS-EKM derived key. */ -#define CO_AEAD_TAG_AT_THE_END (1<<8) -/**< Bit-flag indicating that the AEAD tag is at the end of the -* packet. +#define CO_EPOCH_DATA_KEY_FORMAT (1<<8) +/**< Bit-flag indicating that the data format using +* AEAD tag is at the end of the packet and using epoch +* keys is used. */ unsigned int flags;/**< Bit-flags determining behavior of
src/openvpn/init.c +2 -2
@@ -2390,9 +2390,9 @@ {buf_printf (&out," dyn-tls-crypt" ); } -if (o->imported_protocol_flags &CO_AEAD_TAG_AT_THE_END ) +if (o->imported_protocol_flags &CO_EPOCH_DATA_KEY_FORMAT ) { -buf_printf (&out," aead-tag-end" ); +buf_printf (&out," aead-epoch" ); } }
src/openvpn/options.c +2 -2
@@ -8692,9 +8692,9 @@ options->imported_protocol_flags |=CO_USE_DYNAMIC_TLS_CRYPT ; }#endif - else if (streq(p[j], "aead-tag-end")) + else if (streq(p[j], "aead-epoch")) { - options->imported_protocol_flags |=CO_AEAD_TAG_AT_THE_END ; + options->imported_protocol_flags |=CO_EPOCH_DATA_KEY_FORMAT ; } else {
src/openvpn/push.c +2 -2
@@ -689,9 +689,9 @@buf_printf (&proto_flags," dyn-tls-crypt" ); } -if (o->imported_protocol_flags &CO_AEAD_TAG_AT_THE_END ) +if (o->imported_protocol_flags &CO_EPOCH_DATA_KEY_FORMAT ) { -buf_printf (&proto_flags," aead-tag-end" ); +buf_printf (&proto_flags," aead-epoch" ); }if (buf_len (&proto_flags) >0 )
src/openvpn/ssl.h +3 -0
@@ -107,6 +107,9 @@/** Support to dynamic tls-crypt (renegotiation with TLS-EKM derived tls-crypt key) */ #define IV_PROTO_DYN_TLS_CRYPT (1<<9) +/** Support the extended packet id and epoch format for data channel packets */ +#define IV_PROTO_DATA_EPOCH (1<<10) +/** Supports the --dns option after all the incompatible changes */ #define IV_PROTO_DNS_OPTION_V2 (1<<11)
tests/unit_tests/openvpn/test_ssl.c +1 -1
@@ -404,7 +404,7 @@ run_data_channel_with_cipher_end(const char *cipher) {struct crypto_options co =init_crypto_options (cipher,"none" ); - co.flags |=CO_AEAD_TAG_AT_THE_END ; + co.flags |=CO_EPOCH_DATA_KEY_FORMAT ;do_data_channel_round_trip (&co);uninit_crypto_options (&co); }
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/805?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I9e9433b56dcbaa538d9bed30e50cf74948c647cc
Gerrit-Change-Number: 805
Gerrit-PatchSet: 3
Gerrit-Owner: plaisthos <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newpatchset
Attention is currently required from: plaisthos.
flichtenheld has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/805?usp=email )
Change subject: Rename aead-tag-at-end to aead-epoch
......................................................................
Patch Set 8: Code-Review-1
(2 comments)
Commit Message:
http://gerrit.openvpn.net/c/openvpn/+/805/comment/2441bc09_930b0af9 :
PS8, Line 8:
maybe add a short explanation like: "We combine several data-format changes into one flag since they will be introduced together and so we do not need to separate them."
File src/openvpn/crypto.h:
http://gerrit.openvpn.net/c/openvpn/+/805/comment/7b1afc57_7cafb3b5 :
PS8, Line 373: * AEAD tag is at the end of the packet and using epoch
Remove "at", remove additional space before "packet". The sentence is still not great then, but at least superficially correct. Maybe simpler:
"Bit-flag indicating that the AEAD tag is at the end of the packet and epoch keys are used"
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/805?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I9e9433b56dcbaa538d9bed30e50cf74948c647cc
Gerrit-Change-Number: 805
Gerrit-PatchSet: 8
Gerrit-Owner: plaisthos <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Comment-Date: Fri, 27 Dec 2024 15:46:02 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: flichtenheld.
plaisthos has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/805?usp=email )
Change subject: Rename aead-tag-at-end to aead-epoch
......................................................................
Patch Set 8:
(1 comment)
Commit Message:
http://gerrit.openvpn.net/c/openvpn/+/805/comment/661e6b3e_36aefa53 :
PS8, Line 8:
Quoted 1 line
maybe add a short explanation like: "We combine several data-format changes into one flag since they […]
Done
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/805?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I9e9433b56dcbaa538d9bed30e50cf74948c647cc
Gerrit-Change-Number: 805
Gerrit-PatchSet: 8
Gerrit-Owner: plaisthos <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Fri, 27 Dec 2024 17:39:14 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: flichtenheld <[email protected]...>
Gerrit-MessageType: comment
Attention is currently required from: flichtenheld.
plaisthos has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/805?usp=email )
Change subject: Rename aead-tag-at-end to aead-epoch
......................................................................
Patch Set 8:
(1 comment)
File src/openvpn/crypto.h:
http://gerrit.openvpn.net/c/openvpn/+/805/comment/41522d51_9f9f419f :
PS8, Line 373: * AEAD tag is at the end of the packet and using epoch
Quoted 1 line
Remove "at", remove additional space before "packet". […]
Done
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/805?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I9e9433b56dcbaa538d9bed30e50cf74948c647cc
Gerrit-Change-Number: 805
Gerrit-PatchSet: 8
Gerrit-Owner: plaisthos <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Fri, 27 Dec 2024 18:17:18 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: flichtenheld <[email protected]...>
Gerrit-MessageType: comment
Attention is currently required from: flichtenheld.
Hello flichtenheld,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/805?usp=email
to look at the new patch set (#9).
The following approvals got outdated and were removed:
Code-Review-1 by flichtenheld
Change subject: Rename aead-tag-at-end to aead-epoch
......................................................................
Rename aead-tag-at-end to aead-epoch
Since we introduce aead at the end and epoch data keys together and only allow the aead tag at the end if epoch data keys are used, we can use just one flag for both of them
---
M doc/man-sections/client-options.rst
M src/openvpn/crypto.c
M src/openvpn/crypto.h
M src/openvpn/init.c
M src/openvpn/options.c
M src/openvpn/push.c
M src/openvpn/ssl.h
M tests/unit_tests/openvpn/test_ssl.c
8 files changed, 19 insertions(+), 13 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/05/805/9
doc/man-sections/client-options.rst +1 -0
@@ -367,6 +367,7 @@ - bit 7: The client is capable of sending exit notification via control channel using ``EXIT`` message. Also, the client is accepting the protocol-flags pushed option for the EKM capability - bit 8: The client is capable of accepting ``AUTH_FAILED,TEMP`` messages - bit 9: The client is capable of dynamic tls-crypt + - bit 10: The client is capable of data epoch keys :code:`IV_NCP=2` Negotiable ciphers, client supports ``--cipher`` pushed by
src/openvpn/crypto.c +3 -3
@@ -127,7 +127,7 @@dmsg (D_PACKET_CONTENT ,"ENCRYPT AD: %s" ,format_hex (BPTR (&work),BLEN (&work),0 , &gc)); -if (!(opt->flags &CO_AEAD_TAG_AT_THE_END )) +if (!(opt->flags &CO_EPOCH_DATA_KEY_FORMAT )) {/* Reserve space for authentication tag */ mac_out =buf_write_alloc (&work, mac_len);
@@ -148,7 +148,7 @@ASSERT (buf_inc_len (&work, outlen));/* if the tag is at end the end, allocate it now */ -if (opt->flags &CO_AEAD_TAG_AT_THE_END ) +if (opt->flags &CO_EPOCH_DATA_KEY_FORMAT ) {/* Reserve space for authentication tag */ mac_out =buf_write_alloc (&work, mac_len);
@@ -481,7 +481,7 @@uint8_t *tag_ptr =NULL ;int data_len =0 ; -if (opt->flags &CO_AEAD_TAG_AT_THE_END ) +if (opt->flags &CO_EPOCH_DATA_KEY_FORMAT ) { data_len =BLEN (buf) - tag_size; tag_ptr =BPTR (buf) + data_len;
src/openvpn/crypto.h +5 -3
@@ -371,9 +371,11 @@/**< Bit-flag indicating that renegotiations are using tls-crypt * with a TLS-EKM derived key. */ -#define CO_AEAD_TAG_AT_THE_END (1<<8) -/**< Bit-flag indicating that the AEAD tag is at the end of the -* packet. +#define CO_EPOCH_DATA_KEY_FORMAT (1<<8) +/**< Bit-flag indicating the epoch the data format. This format +* has the AEAD tag is at the end of the packet and using a longer +* 64-bit packet id that is split into a 16 bit epoch and 48 bit +* epoch counter */ unsigned int flags;/**< Bit-flags determining behavior of
src/openvpn/init.c +2 -2
@@ -2390,9 +2390,9 @@ {buf_printf (&out," dyn-tls-crypt" ); } -if (o->imported_protocol_flags &CO_AEAD_TAG_AT_THE_END ) +if (o->imported_protocol_flags &CO_EPOCH_DATA_KEY_FORMAT ) { -buf_printf (&out," aead-tag-end" ); +buf_printf (&out," aead-epoch" ); } }
src/openvpn/options.c +2 -2
@@ -8692,9 +8692,9 @@ options->imported_protocol_flags |=CO_USE_DYNAMIC_TLS_CRYPT ; }#endif - else if (streq(p[j], "aead-tag-end")) + else if (streq(p[j], "aead-epoch")) { - options->imported_protocol_flags |=CO_AEAD_TAG_AT_THE_END ; + options->imported_protocol_flags |=CO_EPOCH_DATA_KEY_FORMAT ; } else {
src/openvpn/push.c +2 -2
@@ -689,9 +689,9 @@buf_printf (&proto_flags," dyn-tls-crypt" ); } -if (o->imported_protocol_flags &CO_AEAD_TAG_AT_THE_END ) +if (o->imported_protocol_flags &CO_EPOCH_DATA_KEY_FORMAT ) { -buf_printf (&proto_flags," aead-tag-end" ); +buf_printf (&proto_flags," aead-epoch" ); }if (buf_len (&proto_flags) >0 )
src/openvpn/ssl.h +3 -0
@@ -108,6 +108,9 @@/** Support to dynamic tls-crypt (renegotiation with TLS-EKM derived tls-crypt key) */ #define IV_PROTO_DYN_TLS_CRYPT (1<<9) +/** Support the extended packet id and epoch format for data channel packets */ +#define IV_PROTO_DATA_EPOCH (1<<10) +/** Supports the --dns option after all the incompatible changes */ #define IV_PROTO_DNS_OPTION_V2 (1<<11)
tests/unit_tests/openvpn/test_ssl.c +1 -1
@@ -404,7 +404,7 @@ run_data_channel_with_cipher_end(const char *cipher) {struct crypto_options co =init_crypto_options (cipher,"none" ); - co.flags |=CO_AEAD_TAG_AT_THE_END ; + co.flags |=CO_EPOCH_DATA_KEY_FORMAT ;do_data_channel_round_trip (&co);uninit_crypto_options (&co); }
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/805?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I9e9433b56dcbaa538d9bed30e50cf74948c647cc
Gerrit-Change-Number: 805
Gerrit-PatchSet: 9
Gerrit-Owner: plaisthos <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newpatchset
Attention is currently required from: flichtenheld, plaisthos.
MaxF has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/805?usp=email )
Change subject: Rename aead-tag-at-end to aead-epoch
......................................................................
Patch Set 12: Code-Review+2
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/805?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I9e9433b56dcbaa538d9bed30e50cf74948c647cc
Gerrit-Change-Number: 805
Gerrit-PatchSet: 12
Gerrit-Owner: plaisthos <[email protected]...>
Gerrit-Reviewer: MaxF <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Thu, 09 Jan 2025 18:15:22 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
PATCH v12 1/1 Rename aead-tag-at-end to aead-epoch
In reply to a message not in the archiveFrom: Arne Schwabe <[email protected]...>
Since we introduce aead at the end and epoch data keys together and only allow the aead tag at the end if epoch data keys are used, we can use just one flag for both of them
---
This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/805
This mail reflects revision 12 of this Change.
Acked-by according to Gerrit (reflected above):
MaxF <[email protected]...>
doc/man-sections/client-options.rst +1 -0
@@ -367,6 +367,7 @@ - bit 7: The client is capable of sending exit notification via control channel using ``EXIT`` message. Also, the client is accepting the protocol-flags pushed option for the EKM capability - bit 8: The client is capable of accepting ``AUTH_FAILED,TEMP`` messages - bit 9: The client is capable of dynamic tls-crypt + - bit 10: The client is capable of data epoch keys :code:`IV_NCP=2` Negotiable ciphers, client supports ``--cipher`` pushed by
src/openvpn/crypto.c +3 -3
@@ -127,7 +127,7 @@dmsg (D_PACKET_CONTENT ,"ENCRYPT AD: %s" ,format_hex (BPTR (&work),BLEN (&work),0 , &gc)); -if (!(opt->flags &CO_AEAD_TAG_AT_THE_END )) +if (!(opt->flags &CO_EPOCH_DATA_KEY_FORMAT )) {/* Reserve space for authentication tag */ mac_out =buf_write_alloc (&work, mac_len);
@@ -148,7 +148,7 @@ASSERT (buf_inc_len (&work, outlen));/* if the tag is at end the end, allocate it now */ -if (opt->flags &CO_AEAD_TAG_AT_THE_END ) +if (opt->flags &CO_EPOCH_DATA_KEY_FORMAT ) {/* Reserve space for authentication tag */ mac_out =buf_write_alloc (&work, mac_len);
@@ -479,7 +479,7 @@uint8_t *tag_ptr =NULL ;int data_len =0 ; -if (opt->flags &CO_AEAD_TAG_AT_THE_END ) +if (opt->flags &CO_EPOCH_DATA_KEY_FORMAT ) { data_len =BLEN (buf) - tag_size; tag_ptr =BPTR (buf) + data_len;
src/openvpn/crypto.h +5 -3
@@ -373,9 +373,11 @@/**< Bit-flag indicating that renegotiations are using tls-crypt * with a TLS-EKM derived key. */ -#define CO_AEAD_TAG_AT_THE_END (1<<8) -/**< Bit-flag indicating that the AEAD tag is at the end of the -* packet. +#define CO_EPOCH_DATA_KEY_FORMAT (1<<8) +/**< Bit-flag indicating the epoch the data format. This format +* has the AEAD tag is at the end of the packet and using a longer +* 64-bit packet id that is split into a 16 bit epoch and 48 bit +* epoch counter */ unsigned int flags;/**< Bit-flags determining behavior of
src/openvpn/init.c +2 -2
@@ -2407,9 +2407,9 @@ {buf_printf (&out," dyn-tls-crypt" ); } -if (o->imported_protocol_flags &CO_AEAD_TAG_AT_THE_END ) +if (o->imported_protocol_flags &CO_EPOCH_DATA_KEY_FORMAT ) { -buf_printf (&out," aead-tag-end" ); +buf_printf (&out," aead-epoch" ); } }
src/openvpn/options.c +2 -2
@@ -8659,9 +8659,9 @@ options->imported_protocol_flags |=CO_USE_DYNAMIC_TLS_CRYPT ; }#endif - else if (streq(p[j], "aead-tag-end")) + else if (streq(p[j], "aead-epoch")) { - options->imported_protocol_flags |=CO_AEAD_TAG_AT_THE_END ; + options->imported_protocol_flags |=CO_EPOCH_DATA_KEY_FORMAT ; } else {
src/openvpn/push.c +2 -2
@@ -689,9 +689,9 @@buf_printf (&proto_flags," dyn-tls-crypt" ); } -if (o->imported_protocol_flags &CO_AEAD_TAG_AT_THE_END ) +if (o->imported_protocol_flags &CO_EPOCH_DATA_KEY_FORMAT ) { -buf_printf (&proto_flags," aead-tag-end" ); +buf_printf (&proto_flags," aead-epoch" ); }if (buf_len (&proto_flags) >0 )
src/openvpn/ssl.h +3 -0
@@ -108,6 +108,9 @@/** Support to dynamic tls-crypt (renegotiation with TLS-EKM derived tls-crypt key) */ #define IV_PROTO_DYN_TLS_CRYPT (1<<9) +/** Support the extended packet id and epoch format for data channel packets */ +#define IV_PROTO_DATA_EPOCH (1<<10) +/** Supports the --dns option after all the incompatible changes */ #define IV_PROTO_DNS_OPTION_V2 (1<<11)
tests/unit_tests/openvpn/test_ssl.c +1 -1
@@ -404,7 +404,7 @@ run_data_channel_with_cipher_end(const char *cipher) {struct crypto_options co =init_crypto_options (cipher,"none" ); - co.flags |=CO_AEAD_TAG_AT_THE_END ; + co.flags |=CO_EPOCH_DATA_KEY_FORMAT ;do_data_channel_round_trip (&co);uninit_crypto_options (&co); }
[Openvpn-devel] [PATCH applied] Re: Rename aead-tag-at-end to aead-epoch
Fairly straightforward renaming of things, which makes sense. Just test compiled (as there is nothing yet which would care for the IV_ sent and push back "aead-epoch").
I've moved the "is" in the crypto.h comment to the end of the sentence, where it now seems to make more sense.
Your patch has been applied to the master branch.
commit 0671a4d009ae89870b645d1a8f3078d9943d5010
Author: Arne Schwabe Date: Thu Jan 9 22:28:03 2025 +0100
Rename aead-tag-at-end to aead-epoch
Signed-off-by: Arne Schwabe <[email protected]...>
Acked-by: MaxF <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg30395.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering
cron2 has uploaded a new patch set (#13) to the change originally created by plaisthos. ( http://gerrit.openvpn.net/c/openvpn/+/805?usp=email )
The following approvals got outdated and were removed:
Code-Review+2 by MaxF
Change subject: Rename aead-tag-at-end to aead-epoch
......................................................................
Rename aead-tag-at-end to aead-epoch
Since we introduce aead at the end and epoch data keys together and only allow the aead tag at the end if epoch data keys are used, we can use just one flag for both of them
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg30395.html
---
M doc/man-sections/client-options.rst
M src/openvpn/crypto.c
M src/openvpn/crypto.h
M src/openvpn/init.c
M src/openvpn/options.c
M src/openvpn/push.c
M src/openvpn/ssl.h
M tests/unit_tests/openvpn/test_ssl.c
8 files changed, 19 insertions(+), 13 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/05/805/13
doc/man-sections/client-options.rst +1 -0
@@ -367,6 +367,7 @@ - bit 7: The client is capable of sending exit notification via control channel using ``EXIT`` message. Also, the client is accepting the protocol-flags pushed option for the EKM capability - bit 8: The client is capable of accepting ``AUTH_FAILED,TEMP`` messages - bit 9: The client is capable of dynamic tls-crypt + - bit 10: The client is capable of data epoch keys :code:`IV_NCP=2` Negotiable ciphers, client supports ``--cipher`` pushed by
src/openvpn/crypto.c +3 -3
@@ -127,7 +127,7 @@dmsg (D_PACKET_CONTENT ,"ENCRYPT AD: %s" ,format_hex (BPTR (&work),BLEN (&work),0 , &gc)); -if (!(opt->flags &CO_AEAD_TAG_AT_THE_END )) +if (!(opt->flags &CO_EPOCH_DATA_KEY_FORMAT )) {/* Reserve space for authentication tag */ mac_out =buf_write_alloc (&work, mac_len);
@@ -148,7 +148,7 @@ASSERT (buf_inc_len (&work, outlen));/* if the tag is at end the end, allocate it now */ -if (opt->flags &CO_AEAD_TAG_AT_THE_END ) +if (opt->flags &CO_EPOCH_DATA_KEY_FORMAT ) {/* Reserve space for authentication tag */ mac_out =buf_write_alloc (&work, mac_len);
@@ -479,7 +479,7 @@uint8_t *tag_ptr =NULL ;int data_len =0 ; -if (opt->flags &CO_AEAD_TAG_AT_THE_END ) +if (opt->flags &CO_EPOCH_DATA_KEY_FORMAT ) { data_len =BLEN (buf) - tag_size; tag_ptr =BPTR (buf) + data_len;
src/openvpn/crypto.h +5 -3
@@ -373,9 +373,11 @@/**< Bit-flag indicating that renegotiations are using tls-crypt * with a TLS-EKM derived key. */ -#define CO_AEAD_TAG_AT_THE_END (1<<8) -/**< Bit-flag indicating that the AEAD tag is at the end of the -* packet. +#define CO_EPOCH_DATA_KEY_FORMAT (1<<8) +/**< Bit-flag indicating the epoch the data format. This format +* has the AEAD tag at the end of the packet and is using a longer +* 64-bit packet id that is split into a 16 bit epoch and 48 bit +* epoch counter */ unsigned int flags;/**< Bit-flags determining behavior of
src/openvpn/init.c +2 -2
@@ -2407,9 +2407,9 @@ {buf_printf (&out," dyn-tls-crypt" ); } -if (o->imported_protocol_flags &CO_AEAD_TAG_AT_THE_END ) +if (o->imported_protocol_flags &CO_EPOCH_DATA_KEY_FORMAT ) { -buf_printf (&out," aead-tag-end" ); +buf_printf (&out," aead-epoch" ); } }
src/openvpn/options.c +2 -2
@@ -8659,9 +8659,9 @@ options->imported_protocol_flags |=CO_USE_DYNAMIC_TLS_CRYPT ; }#endif - else if (streq(p[j], "aead-tag-end")) + else if (streq(p[j], "aead-epoch")) { - options->imported_protocol_flags |=CO_AEAD_TAG_AT_THE_END ; + options->imported_protocol_flags |=CO_EPOCH_DATA_KEY_FORMAT ; } else {
src/openvpn/push.c +2 -2
@@ -689,9 +689,9 @@buf_printf (&proto_flags," dyn-tls-crypt" ); } -if (o->imported_protocol_flags &CO_AEAD_TAG_AT_THE_END ) +if (o->imported_protocol_flags &CO_EPOCH_DATA_KEY_FORMAT ) { -buf_printf (&proto_flags," aead-tag-end" ); +buf_printf (&proto_flags," aead-epoch" ); }if (buf_len (&proto_flags) >0 )
src/openvpn/ssl.h +3 -0
@@ -108,6 +108,9 @@/** Support to dynamic tls-crypt (renegotiation with TLS-EKM derived tls-crypt key) */ #define IV_PROTO_DYN_TLS_CRYPT (1<<9) +/** Support the extended packet id and epoch format for data channel packets */ +#define IV_PROTO_DATA_EPOCH (1<<10) +/** Supports the --dns option after all the incompatible changes */ #define IV_PROTO_DNS_OPTION_V2 (1<<11)
tests/unit_tests/openvpn/test_ssl.c +1 -1
@@ -404,7 +404,7 @@ run_data_channel_with_cipher_end(const char *cipher) {struct crypto_options co =init_crypto_options (cipher,"none" ); - co.flags |=CO_AEAD_TAG_AT_THE_END ; + co.flags |=CO_EPOCH_DATA_KEY_FORMAT ;do_data_channel_round_trip (&co);uninit_crypto_options (&co); }
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/805?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I9e9433b56dcbaa538d9bed30e50cf74948c647cc
Gerrit-Change-Number: 805
Gerrit-PatchSet: 13
Gerrit-Owner: plaisthos <[email protected]...>
Gerrit-Reviewer: MaxF <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: newpatchset
cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/805?usp=email )
Change subject: Rename aead-tag-at-end to aead-epoch
......................................................................
Rename aead-tag-at-end to aead-epoch
Since we introduce aead at the end and epoch data keys together and only allow the aead tag at the end if epoch data keys are used, we can use just one flag for both of them
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg30395.html
---
M doc/man-sections/client-options.rst
M src/openvpn/crypto.c
M src/openvpn/crypto.h
M src/openvpn/init.c
M src/openvpn/options.c
M src/openvpn/push.c
M src/openvpn/ssl.h
M tests/unit_tests/openvpn/test_ssl.c
8 files changed, 19 insertions(+), 13 deletions(-)
doc/man-sections/client-options.rst +1 -0
@@ -367,6 +367,7 @@ - bit 7: The client is capable of sending exit notification via control channel using ``EXIT`` message. Also, the client is accepting the protocol-flags pushed option for the EKM capability - bit 8: The client is capable of accepting ``AUTH_FAILED,TEMP`` messages - bit 9: The client is capable of dynamic tls-crypt + - bit 10: The client is capable of data epoch keys :code:`IV_NCP=2` Negotiable ciphers, client supports ``--cipher`` pushed by
src/openvpn/crypto.c +3 -3
@@ -127,7 +127,7 @@dmsg (D_PACKET_CONTENT ,"ENCRYPT AD: %s" ,format_hex (BPTR (&work),BLEN (&work),0 , &gc)); -if (!(opt->flags &CO_AEAD_TAG_AT_THE_END )) +if (!(opt->flags &CO_EPOCH_DATA_KEY_FORMAT )) {/* Reserve space for authentication tag */ mac_out =buf_write_alloc (&work, mac_len);
@@ -148,7 +148,7 @@ASSERT (buf_inc_len (&work, outlen));/* if the tag is at end the end, allocate it now */ -if (opt->flags &CO_AEAD_TAG_AT_THE_END ) +if (opt->flags &CO_EPOCH_DATA_KEY_FORMAT ) {/* Reserve space for authentication tag */ mac_out =buf_write_alloc (&work, mac_len);
@@ -479,7 +479,7 @@uint8_t *tag_ptr =NULL ;int data_len =0 ; -if (opt->flags &CO_AEAD_TAG_AT_THE_END ) +if (opt->flags &CO_EPOCH_DATA_KEY_FORMAT ) { data_len =BLEN (buf) - tag_size; tag_ptr =BPTR (buf) + data_len;
src/openvpn/crypto.h +5 -3
@@ -373,9 +373,11 @@/**< Bit-flag indicating that renegotiations are using tls-crypt * with a TLS-EKM derived key. */ -#define CO_AEAD_TAG_AT_THE_END (1<<8) -/**< Bit-flag indicating that the AEAD tag is at the end of the -* packet. +#define CO_EPOCH_DATA_KEY_FORMAT (1<<8) +/**< Bit-flag indicating the epoch the data format. This format +* has the AEAD tag at the end of the packet and is using a longer +* 64-bit packet id that is split into a 16 bit epoch and 48 bit +* epoch counter */ unsigned int flags;/**< Bit-flags determining behavior of
src/openvpn/init.c +2 -2
@@ -2407,9 +2407,9 @@ {buf_printf (&out," dyn-tls-crypt" ); } -if (o->imported_protocol_flags &CO_AEAD_TAG_AT_THE_END ) +if (o->imported_protocol_flags &CO_EPOCH_DATA_KEY_FORMAT ) { -buf_printf (&out," aead-tag-end" ); +buf_printf (&out," aead-epoch" ); } }
src/openvpn/options.c +2 -2
@@ -8659,9 +8659,9 @@ options->imported_protocol_flags |=CO_USE_DYNAMIC_TLS_CRYPT ; }#endif - else if (streq(p[j], "aead-tag-end")) + else if (streq(p[j], "aead-epoch")) { - options->imported_protocol_flags |=CO_AEAD_TAG_AT_THE_END ; + options->imported_protocol_flags |=CO_EPOCH_DATA_KEY_FORMAT ; } else {
src/openvpn/push.c +2 -2
@@ -689,9 +689,9 @@buf_printf (&proto_flags," dyn-tls-crypt" ); } -if (o->imported_protocol_flags &CO_AEAD_TAG_AT_THE_END ) +if (o->imported_protocol_flags &CO_EPOCH_DATA_KEY_FORMAT ) { -buf_printf (&proto_flags," aead-tag-end" ); +buf_printf (&proto_flags," aead-epoch" ); }if (buf_len (&proto_flags) >0 )
src/openvpn/ssl.h +3 -0
@@ -108,6 +108,9 @@/** Support to dynamic tls-crypt (renegotiation with TLS-EKM derived tls-crypt key) */ #define IV_PROTO_DYN_TLS_CRYPT (1<<9) +/** Support the extended packet id and epoch format for data channel packets */ +#define IV_PROTO_DATA_EPOCH (1<<10) +/** Supports the --dns option after all the incompatible changes */ #define IV_PROTO_DNS_OPTION_V2 (1<<11)
tests/unit_tests/openvpn/test_ssl.c +1 -1
@@ -404,7 +404,7 @@ run_data_channel_with_cipher_end(const char *cipher) {struct crypto_options co =init_crypto_options (cipher,"none" ); - co.flags |=CO_AEAD_TAG_AT_THE_END ; + co.flags |=CO_EPOCH_DATA_KEY_FORMAT ;do_data_channel_round_trip (&co);uninit_crypto_options (&co); }
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/805?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I9e9433b56dcbaa538d9bed30e50cf74948c647cc
Gerrit-Change-Number: 805
Gerrit-PatchSet: 13
Gerrit-Owner: plaisthos <[email protected]...>
Gerrit-Reviewer: MaxF <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: merged