From: "plaisthos (Code Review)"
Date: Mon, 11 Nov 2024 02:00:05 +0000
References:
Reply-To: arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net,
frank@...2641...
Message-ID: <1dd11ecfdbe24eff158a3ab357bfd4ba3d22cec2-HTML@...2715...>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Disposition: inline
Content-Type: multipart/alternative; boundary="DYbN2SvTVlc="; 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
--DYbN2SvTVlc=
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
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=3Demail
to review the following change.
Change subject: Rename aead-tag-at-end to aead-epoch
......................................................................
Rename aead-tag-at-end to aead-epoch
Change-Id: I9e9433b56dcbaa538d9bed30e50cf74948c647cc
Signed-off-by: Arne Schwabe
---
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
diff --git a/src/openvpn/crypto.c b/src/openvpn/crypto.c
index dc23ffc..996830c 100644
--- a/src/openvpn/crypto.c
+++ b/src/openvpn/crypto.c
@@ -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 =3D 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 =3D buf_write_alloc(&work, mac_len);
@@ -475,7 +475,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 abba30c..933bc2f 100644
--- a/src/openvpn/crypto.h
+++ b/src/openvpn/crypto.h
@@ -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
diff --git a/src/openvpn/init.c b/src/openvpn/init.c
index 9371024..2c831fe 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 10ee9f6..ec27e7f 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 6c06374..01d3699 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 eea1323..e47a94d 100644
--- a/src/openvpn/ssl.h
+++ b/src/openvpn/ssl.h
@@ -107,6 +107,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);
}
--=20
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: 1
Gerrit-Owner: plaisthos
Gerrit-Reviewer: flichtenheld
Gerrit-CC: openvpn-devel
Gerrit-Attention: flichtenheld
Gerrit-MessageType: newchange
--DYbN2SvTVlc=
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Attention is currently required from: flichtenheld.
plaisthos would like flichtenheld to review this change.
Vi=
ew Change
Rename aead-tag-at-end to aead-epoch
Change-Id: I9e943=
3b56dcbaa538d9bed30e50cf74948c647cc
Signed-off-by: Arne Schwabe <arne=
@...1227...>
---
M src/openvpn/crypto.c
M src/openvpn/crypto.h<=
br>M src/openvpn/init.c
M src/openvpn/options.c
M src/openvpn/push.c<=
br>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
diff --git a/src/op=
envpn/crypto.c b/src/openvpn/crypto.c
index dc23ffc..996830=
c 100644
--- a/src/openvpn/crypto.c
+++ b/s=
rc/openvpn/crypto.c
@@ -128,7 +128,7 @@
=
dmsg(D_PACKET_CONTENT, "ENCRYPT AD: %s",
=
format_hex(BPTR(&work), BLEN(&work), 0, &gc));
- if (!(opt-&g=
t;flags & CO_AEAD_TAG_AT_THE_END))
+ if (!(opt->flags & CO_EPOCH_DATA_KEY_FORMAT))=
{
/* Reserve space for authe=
ntication tag */
mac_out =3D buf_write_alloc(&=
work, mac_len);
@@ -149,7 +149,7 @@
AS=
SERT(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);
@=
@ -475,7 +475,7 @@
uint8_t *tag_ptr =3D NULL; int data_len =3D 0;
- if (opt->flags & CO_AEAD_TAG_AT_THE=
_END)
+ if (opt-&g=
t;flags & CO_EPOCH_DATA_KEY_FORMAT)
{
data_len =3D BLEN(buf) - tag_size;
ta=
g_ptr =3D BPTR(buf) + data_len;
diff --git a/src/openvpn/cr=
ypto.h b/src/openvpn/crypto.h
index abba30c..933bc2f 100644=
--- a/src/openvpn/crypto.h
+++ b/src/openv=
pn/crypto.h
@@ -359,9 +359,10 @@
/**&l=
t; 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
<=
span style=3D"color: hsl(0, 100%, 40%);">- * packet.
+#define CO_EPOCH_DATA_KEY_FORMAT (1=
<<8)
+ /**&l=
t; 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=
diff --git a/src/openvpn/init.c b/src/openvpn/init.c
index 9371024..2c831fe 100644
--- a/src/openvpn/=
init.c
+++ b/src/openvpn/init.c
@@ -2390,9 =
+2390,9 @@
{
buf_prin=
tf(&out, " dyn-tls-crypt");
}=
- if (o->imported_p=
rotocol_flags & CO_AEAD_TAG_AT_THE_END)
+ if (o->imported_protocol_flags & CO_=
EPOCH_DATA_KEY_FORMAT)
{
- buf_printf(&out, " aead-ta=
g-end");
+ =
buf_printf(&out, " aead-epoch");
=
}
}
diff --git a/=
src/openvpn/options.c b/src/openvpn/options.c
index 10ee9f6=
..ec27e7f 100644
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -8692,9 +8692,9 @@<=
br> options->imported_protocol_flags |=3D CO_USE_D=
YNAMIC_TLS_CRYPT;
}
#endif
- else if (str=
eq(p[j], "aead-tag-end"))
+ else if (streq(p[j], "aead-epoch"))=
span>
{
- options->imported_protocol_flags |=3D CO_AEAD_TA=
G_AT_THE_END;
+ =
options->imported_protocol_flags |=3D CO_EPOCH_DATA_KEY_FORMAT=
;
}
else {
diff --git a/src/openvpn/push.c b/sr=
c/openvpn/push.c
index 6c06374..01d3699 100644
--- a/src/openvpn/push.c
+++ b/src/openvpn/push.c
@@ -689,9 +689,9 @@
buf_printf(&pro=
to_flags, " dyn-tls-crypt");
}
- if (o->imp=
orted_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 eea1323..e47a94d 100644
--- a/src/o=
penvpn/ssl.h
+++ b/src/openvpn/ssl.h
@@ -10=
7,6 +107,9 @@
/** Support to dynamic tls-crypt (renegotiat=
ion with TLS-EKM derived tls-crypt key) */
#define IV_PROT=
O_DYN_TLS_CRYPT (1<<9)
+/** Support the extended packet id and epoch f=
ormat for data channel packets */
+#define IV_PROTO_DATA_EPOCH (1<<10)
+
/** Supports the=
--dns option after all the incompatible changes */
#defin=
e 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_t=
ests/openvpn/test_ssl.c
@@ -404,7 +404,7 @@
run_data_channel_with_cipher_end(const char *cipher)
{=
span>
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 change 805. To unsubscribe, or for help writing mail filter=
s, visit settings.
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I9e9433b56dcbaa538d9bed30e50=
cf74948c647cc
Gerrit-Change-Number: 805
Gerrit-PatchSet: 1
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: newchange
--DYbN2SvTVlc=--