From: "plaisthos (Code Review)" Date: Fri, 27 Dec 2024 18:19:18 +0000 In-Reply-To: References: Reply-To: arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <5a3c182f18e1da1657340e4636d608c439ad004e-EmailReplacePatchSet-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="4zMM/J4gyAg="; charset=UTF-8 Subject: [Openvpn-devel] [S] Change in openvpn[master]: Rename aead-tag-at-end to aead-epoch List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: flichtenheld Cc: openvpn-devel --4zMM/J4gyAg= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: flichtenheld. Hello flichtenheld,=20 I'd like you to reexamine a change. Please visit http://gerrit.openvpn.net/c/openvpn/+/805?usp=3Demail 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 Change-Id: I9e9433b56dcbaa538d9bed30e50cf74948c647cc Signed-off-by: Arne Schwabe --- 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 diff --git a/doc/man-sections/client-options.rst b/doc/man-sections/client-= options.rst index 5ca85e0..0aee9e2 100644 --- a/doc/man-sections/client-options.rst +++ b/doc/man-sections/client-options.rst @@ -367,6 +367,7 @@ - bit 7: The client is capable of sending exit notification via contro= l channel using ``EXIT`` message. Also, the client is accepting the protoco= l-flags pushed option for the EKM capability - bit 8: The client is capable of accepting ``AUTH_FAILED,TEMP`` messa= ges - bit 9: The client is capable of dynamic tls-crypt + - bit 10: The client is capable of data epoch keys :code:`IV_NCP=3D2` Negotiable ciphers, client supports ``--cipher`` pushed by diff --git a/src/openvpn/crypto.c b/src/openvpn/crypto.c index 4e93882..763d756 100644 --- a/src/openvpn/crypto.c +++ b/src/openvpn/crypto.c @@ -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 =3D 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 =3D buf_write_alloc(&work, mac_len); @@ -481,7 +481,7 @@ uint8_t *tag_ptr =3D NULL; int data_len =3D 0; - if (opt->flags & CO_AEAD_TAG_AT_THE_END) + if (opt->flags & CO_EPOCH_DATA_KEY_FORMAT) { data_len =3D BLEN(buf) - tag_size; tag_ptr =3D BPTR(buf) + data_len; diff --git a/src/openvpn/crypto.h b/src/openvpn/crypto.h index 8ad3edb..e678d98 100644 --- a/src/openvpn/crypto.h +++ b/src/openvpn/crypto.h @@ -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 diff --git a/src/openvpn/init.c b/src/openvpn/init.c index 7145495..ee28380 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -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"); } } diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 20e8d55..30fb561 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -8692,9 +8692,9 @@ options->imported_protocol_flags |=3D CO_USE_DYNAMIC_TLS_C= RYPT; } #endif - else if (streq(p[j], "aead-tag-end")) + else if (streq(p[j], "aead-epoch")) { - options->imported_protocol_flags |=3D CO_AEAD_TAG_AT_THE_E= ND; + options->imported_protocol_flags |=3D CO_EPOCH_DATA_KEY_FO= RMAT; } else { diff --git a/src/openvpn/push.c b/src/openvpn/push.c index de44eb2..a7cd3bf 100644 --- a/src/openvpn/push.c +++ b/src/openvpn/push.c @@ -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) diff --git a/src/openvpn/ssl.h b/src/openvpn/ssl.h index 3561c41..c32cb6c 100644 --- a/src/openvpn/ssl.h +++ b/src/openvpn/ssl.h @@ -108,6 +108,9 @@ /** Support to dynamic tls-crypt (renegotiation with TLS-EKM derived tls-c= rypt key) */ #define IV_PROTO_DYN_TLS_CRYPT (1<<9) +/** Support the extended packet id and epoch format for data channel packe= ts */ +#define IV_PROTO_DATA_EPOCH (1<<10) + /** Supports the --dns option after all the incompatible changes */ #define IV_PROTO_DNS_OPTION_V2 (1<<11) diff --git a/tests/unit_tests/openvpn/test_ssl.c b/tests/unit_tests/openvpn= /test_ssl.c index caacd9e..845ca56 100644 --- a/tests/unit_tests/openvpn/test_ssl.c +++ b/tests/unit_tests/openvpn/test_ssl.c @@ -404,7 +404,7 @@ run_data_channel_with_cipher_end(const char *cipher) { struct crypto_options co =3D init_crypto_options(cipher, "none"); - co.flags |=3D CO_AEAD_TAG_AT_THE_END; + co.flags |=3D 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=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I9e9433b56dcbaa538d9bed30e50cf74948c647cc Gerrit-Change-Number: 805 Gerrit-PatchSet: 9 Gerrit-Owner: plaisthos Gerrit-Reviewer: flichtenheld Gerrit-CC: openvpn-devel Gerrit-Attention: flichtenheld Gerrit-MessageType: newpatchset --4zMM/J4gyAg= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: flichtenheld.

plaisthos uploaded patch set #9 to this change.

<= a href=3D"http://gerrit.openvpn.net/c/openvpn/+/805?usp=3Demail">View Chang= e

The following approvals got outdated and were removed: Code-Review-1 by flichtenheld

Rename aead-tag-at-end to aead-epoch

S= ince 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 ju= st one flag for both of them

Change-Id: I9e9433b56dcbaa538d9bed30e50= cf74948c647cc
Signed-off-by: Arne Schwabe <arne@...1227...>
---=
M doc/man-sections/client-options.rst
M src/openvpn/crypto.c
M sr= c/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/tes= t_ssl.c
8 files changed, 19 insertions(+), 13 deletions(-)

=
git=
 pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/05/805/9
= diff --git a/doc/man-sections/client-options.rst b/doc/man-sections/client-= options.rst
index 5ca85e0..0aee9e2 100644
-= -- a/doc/man-sections/client-options.rst
+++ b/doc/man-sect= ions/client-options.rst
@@ -367,6 +367,7 @@
- bit 7: The client is capable of sending exit notification via contr= ol channel using ``EXIT`` message. Also, the client is accepting the protoc= ol-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
<= span style=3D"color: hsl(120, 100%, 40%);">+ - bit 10: The client is cap= able of data epoch keys

:code:`IV_NCP= =3D2`
Negotiable ciphers, client supports ``--ciph= er`` pushed by
diff --git a/src/openvpn/crypto.c b/src/open= vpn/crypto.c
index 4e93882..763d756 100644
= --- a/src/openvpn/crypto.c
+++ b/src/openvpn/crypto.c

@@ -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 =3D buf_write_alloc(&work, mac_len);@@ -148,7 +148,7 @@
ASSERT(buf_inc_len(&wor= k, 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)
{
/* Reserv= e space for authentication tag */
mac_out =3D buf_= write_alloc(&work, mac_len);
@@ -481,7 +481,7 @@=
uint8_t *tag_ptr =3D NULL;
int data_len= =3D 0;

- if (opt->flags & CO_AEAD_TAG_AT_THE_END)
+ if (opt->flags & CO_EPOCH_DA= TA_KEY_FORMAT)
{
data_len =3D= BLEN(buf) - tag_size;
tag_ptr =3D BPTR(buf) + dat= a_len;
diff --git a/src/openvpn/crypto.h b/src/openvpn/cryp= to.h
index 8ad3edb..e678d98 100644
--- a/sr= c/openvpn/crypto.h
+++ b/src/openvpn/crypto.h
@@ -371,9 +371,11 @@

/**< Bit-flag indicating th= at 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 th= e epoch the data format. This format
+ * has the AEAD tag is at the end of the packet and us= ing 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
diff --git a= /src/openvpn/init.c b/src/openvpn/init.c
index 7145495..ee2= 8380 100644
--- a/src/openvpn/init.c
+++ b/= src/openvpn/init.c
@@ -2390,9 +2390,9 @@
= {
buf_printf(&out, " dyn-tls-c= rypt");
}
- if (o->imported_protocol_flags & CO_AEAD_T= AG_AT_THE_END)
+ = if (o->imported_protocol_flags & CO_EPOCH_DATA_KEY_FORMAT)=
{
- = buf_printf(&out, " aead-tag-end");
+ buf_printf(&out, &q= uot; aead-epoch");
}
}

diff --git a/src/openvpn/options.c b/src/o= penvpn/options.c
index 20e8d55..30fb561 100644
--- a/src/openvpn/options.c

+++ b/src/openvpn/options.c=
@@ -8692,9 +8692,9 @@
opt= ions->imported_protocol_flags |=3D CO_USE_DYNAMIC_TLS_CRYPT;
<= span> }
#endif
- else if (streq(p[j], "aead-tag-end&q= uot;))
+ e= lse if (streq(p[j], "aead-epoch"))
{=
- optio= ns->imported_protocol_flags |=3D CO_AEAD_TAG_AT_THE_END;
+ options->importe= d_protocol_flags |=3D CO_EPOCH_DATA_KEY_FORMAT;
= }
else
{=
diff --git a/src/openvpn/push.c b/src/openvpn/push.c
index de44eb2..a7cd3bf 100644
--- a/src/openvpn/push.c<= /span>
+++ b/src/openvpn/push.c
@@ -689,9 +689,9 @= @
buf_printf(&proto_flags, " dyn-tls-cryp= t");
}

- 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_fl= ags, " aead-epoch");
}

if (buf_len(&proto_flags) > 0)
dif= f --git a/src/openvpn/ssl.h b/src/openvpn/ssl.h
index 3561c= 41..c32cb6c 100644
--- a/src/openvpn/ssl.h
= +++ b/src/openvpn/ssl.h
@@ -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 packet= s */
+#define IV_PROT= O_DATA_EPOCH (1<<10)
+
/** Supports the --dns option after all the i= ncompatible changes */
#define IV_PROTO_DNS_OPTION_V2 (1= <<11)

diff --git a/tests/unit_tests= /openvpn/test_ssl.c b/tests/unit_tests/openvpn/test_ssl.c
i= ndex caacd9e..845ca56 100644
--- a/tests/unit_tests/openvpn= /test_ssl.c
+++ b/tests/unit_tests/openvpn/test_ssl.c
@@ -404,7 +404,7 @@
run_data_channel_with_ciphe= r_end(const char *cipher)
{
struct cr= ypto_options co =3D init_crypto_options(cipher, "none");- co.flags |=3D CO_AEAD_TAG_= AT_THE_END;
+ co.f= lags |=3D CO_EPOCH_DATA_KEY_FORMAT;
do_data_channel_ro= und_trip(&co);
uninit_crypto_options(&co);
}

To view, visit change 805. = To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I9e9433b56dcbaa538d9bed30e50= cf74948c647cc
Gerrit-Change-Number: 805
Gerrit-PatchSet: 9
Gerrit-Owner: plaisthos <arne-openvpn@...1711...= 27...>
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: flichtenheld <frank@...2375...= 41...>
Gerrit-MessageType: newpatchset
--4zMM/J4gyAg=--