From: "plaisthos (Code Review)" Date: Wed, 9 Apr 2025 11:23:26 +0000 References: Reply-To: arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="2xPDbkeKGsg="; charset=UTF-8 Subject: [Openvpn-devel] [S] Change in openvpn[master]: Also print key agreement when printing negotiated details List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: flichtenheld Cc: openvpn-devel --2xPDbkeKGsg= 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/+/938?usp=3Demail to review the following change. Change subject: Also print key agreement when printing negotiated details ...................................................................... Also print key agreement when printing negotiated details With TLS 1.0 to 1.2, the used key agreement was depended on the certificates themselves. With TLS 1.3 is no longer the case but basically always X25519 was used. So this information has been very interesting so far. But with OpenSSL 3.5.0 and the new X25519MLKEM768 hybrid key agreement, the used key agreement group actually becomes interesting information. This commit adds printing this information for OpenSSL 3.0.0+ and uses a compat version for OpenSSL 3.0-3.1 to avoid an additional ifdef in the code itself. Example output with ML-DSA-65 certificates on the server (client output): Control Channel: TLSv1.3, cipher TLSv1.3 TLS_AES_256_GCM_SHA384, peer certificate: 15616 bits ML-DSA-65, signature: id-ml-dsa-65, peer signing digest/type: mldsa65 id-ml-dsa-65, key agreement: X25519MLKEM768 with an secp384r1 certificate: Control Channel: TLSv1.3, cipher TLSv1.3 TLS_AES_256_GCM_SHA384, peer certificate: 384 bits ECsecp384r1, signature: ecdsa-with-SHA256, peer signing digest/type: ecdsa_secp384r1_sha384 ECDSA, key agreement: X25519MLKEM768 Change-Id: I90d54853fe1b1d820661cc2c099e07ec5d31ed05 Signed-off-by: Arne Schwabe --- M src/openvpn/openssl_compat.h M src/openvpn/ssl_openssl.c 2 files changed, 29 insertions(+), 4 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/38/938/1 diff --git a/src/openvpn/openssl_compat.h b/src/openvpn/openssl_compat.h index e2bd9bf..bd6f09c 100644 --- a/src/openvpn/openssl_compat.h +++ b/src/openvpn/openssl_compat.h @@ -197,6 +197,13 @@ } #endif /* if OPENSSL_VERSION_NUMBER < 0x30500000 && (!defined(LIBRESSL_VER= SION_NUMBER) || LIBRESSL_VERSION_NUMBER > 0x3050400fL) */ - +#if OPENSSL_VERSION_NUMBER < 0x30200000L && OPENSSL_VERSION_NUMBER >=3D 0x= 30000000L +static inline const char * +SSL_get0_group_name(SSL *s) +{ + int nid =3D SSL_get_negotiated_group(s); + return SSL_group_to_name(s, nid); +} +#endif #endif /* OPENSSL_COMPAT_H_ */ diff --git a/src/openvpn/ssl_openssl.c b/src/openvpn/ssl_openssl.c index 23b0266..d1d5d3e 100644 --- a/src/openvpn/ssl_openssl.c +++ b/src/openvpn/ssl_openssl.c @@ -2486,7 +2486,21 @@ peer_sig, peer_sig_type); } - +#if OPENSSL_VERSION_NUMBER >=3D 0x30000000L +void +print_tls_key_agreement_group(SSL *ssl, char *buf, size_t buflen) +{ + const char *groupname =3D SSL_get0_group_name(ssl); + if (!groupname) + { + snprintf(buf, buflen, ", key agreement: (error fetching group)"); + } + else + { + snprintf(buf, buflen, ", key agreement: %s", groupname); + } +} +#endif /* ************************************** * @@ -2503,8 +2517,9 @@ char s2[256]; char s3[256]; char s4[256]; + char s5[256]; - s1[0] =3D s2[0] =3D s3[0] =3D s4[0] =3D 0; + s1[0] =3D s2[0] =3D s3[0] =3D s4[0] =3D s5[0] =3D 0; ciph =3D SSL_get_current_cipher(ks_ssl->ssl); snprintf(s1, sizeof(s1), "%s %s, cipher %s %s", prefix, @@ -2520,8 +2535,11 @@ } print_server_tempkey(ks_ssl->ssl, s3, sizeof(s3)); print_peer_signature(ks_ssl->ssl, s4, sizeof(s4)); +#if OPENSSL_VERSION_NUMBER >=3D 0x30000000L + print_tls_key_agreement_group(ks_ssl->ssl, s5, sizeof(s5)); +#endif - msg(D_HANDSHAKE, "%s%s%s%s", s1, s2, s3, s4); + msg(D_HANDSHAKE, "%s%s%s%s%s", s1, s2, s3, s4, s5); } void -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/938?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: I90d54853fe1b1d820661cc2c099e07ec5d31ed05 Gerrit-Change-Number: 938 Gerrit-PatchSet: 1 Gerrit-Owner: plaisthos Gerrit-Reviewer: flichtenheld Gerrit-CC: openvpn-devel Gerrit-Attention: flichtenheld Gerrit-MessageType: newchange --2xPDbkeKGsg= 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

Also print key agreement when printing negotiated details
=
With TLS 1.0 to 1.2, the used key agreement was depended on the certifi= cates
themselves. With TLS 1.3 is no longer the case but basically alway= s X25519
was used. So this information has been very interesting so far.= But with
OpenSSL 3.5.0 and the new X25519MLKEM768 hybrid key agreement,= the used
key agreement group actually becomes interesting information.<= br>
This commit adds printing this information for OpenSSL 3.0.0+ and us= es
a compat version for OpenSSL 3.0-3.1 to avoid an additional ifdef in = the
code itself.

Example output with ML-DSA-65 certificates on th= e server (client output):

Control Channel: TLSv1.3, cipher
= TLSv1.3 TLS_AES_256_GCM_SHA384, peer certificate: 15616
bits ML-DSA-6= 5, signature: id-ml-dsa-65, peer signing
digest/type: mldsa65 id-ml-d= sa-65,
key agreement: X25519MLKEM768

with an secp384r1 certifi= cate:

Control Channel: TLSv1.3, cipher
TLSv1.3 TLS_AES_256_GC= M_SHA384, peer certificate: 384
bits ECsecp384r1, signature: ecdsa-wit= h-SHA256, peer signing
digest/type: ecdsa_secp384r1_sha384 ECDSA,
= key agreement: X25519MLKEM768

Change-Id: I90d54853fe1b1d820661cc2c0= 99e07ec5d31ed05
Signed-off-by: Arne Schwabe <arne@...1227...>
-= --
M src/openvpn/openssl_compat.h
M src/openvpn/ssl_openssl.c
2 fi= les changed, 29 insertions(+), 4 deletions(-)

git pull ssh://gerr=
it.openvpn.net:29418/openvpn refs/changes/38/938/1
diff --git a/src=
/openvpn/openssl_compat.h b/src/openvpn/openssl_compat.h
in= dex e2bd9bf..bd6f09c 100644
--- a/src/openvpn/openssl_compa= t.h
+++ b/src/openvpn/openssl_compat.h
@@ -= 197,6 +197,13 @@
}
#endif /* if OPENSSL_V= ERSION_NUMBER < 0x30500000 && (!defined(LIBRESSL_VERSION_NUMBER)= || LIBRESSL_VERSION_NUMBER > 0x3050400fL) */
-
+#if OPENSSL_VERSION_NUMBER < 0x30200000L &= & OPENSSL_VERSION_NUMBER >=3D 0x30000000L
+static inline const char *
+SSL_get0_group_name(SSL *s)
<= span style=3D"color: hsl(120, 100%, 40%);">+{
+ int nid =3D SSL_get_negotiated_group(s);
+ return SSL_group_to_= name(s, nid);
+}
+#endif
=
#endif /* OPENSSL_COMPAT_H_ */
diff --git= a/src/openvpn/ssl_openssl.c b/src/openvpn/ssl_openssl.c
in= dex 23b0266..d1d5d3e 100644
--- a/src/openvpn/ssl_openssl.c=
+++ b/src/openvpn/ssl_openssl.c
@@ -2486,7= +2486,21 @@
peer_sig, peer_sig_type);=
}

-
+#if OPENSS= L_VERSION_NUMBER >=3D 0x30000000L
+void
+print_tls_key_agreement_group(SSL *ssl, char *buf, size_t buflen)<= br>+{
+ const char *groupname =3D SSL_get0_group_= name(ssl);
+ if (!= groupname)
+ {
+ snprintf(buf, b= uflen, ", key agreement: (error fetching group)");
+ }

+ else
+ {
+ snprintf(buf, buflen, ", key agreement: %s", groupname)= ;
+ }
+}

+#endif

/* *****= *********************************
*
@@ -2= 503,8 +2517,9 @@
char s2[256];
ch= ar s3[256];
char s4[256];
+ char s5[256];

- s1[0] =3D s2[0] =3D s3[0] =3D = s4[0] =3D 0;

+ s1[= 0] =3D s2[0] =3D s3[0] =3D s4[0] =3D s5[0] =3D 0;
ciph= =3D SSL_get_current_cipher(ks_ssl->ssl);
snprintf(= s1, sizeof(s1), "%s %s, cipher %s %s",
= prefix,
@@ -2520,8 +2535,11 @@
}
print_server_tempkey(ks_ssl->ssl, s3, sizeof(s3));
print_peer_signature(ks_ssl->ssl, s4, sizeof(s4));
+#if OPENSSL_VERSION_N= UMBER >=3D 0x30000000L
+ print_tls_key_agreement_group(ks_ssl->ssl, s5, sizeof(s5));
+#endif

- msg(D_HANDSHAKE= , "%s%s%s%s", s1, s2, s3, s4);
+ msg(D_HANDSHAKE, "%s%s%s%s%s", s1, s2, s= 3, s4, s5);
}

void

To view, visit change 938. To unsubscribe, or fo= r help writing mail filters, visit settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I90d54853fe1b1d820661cc2c099= e07ec5d31ed05
Gerrit-Change-Number: 938
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
--2xPDbkeKGsg=--