From: "ordex (Code Review)" Date: Tue, 1 Apr 2025 11:38:18 +0000 In-Reply-To: References: Reply-To: antonio@...2726..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <4ab536d09d8e6eb46990599e7a673ff1367e448d-EmailReplacePatchSet-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="CSoFwfsww5I="; charset=UTF-8 Subject: [Openvpn-devel] [S] Change in openvpn[master]: Use SSL_get0_peer_signature_name instead of SSL_get_peer_signature_nid List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: plaisthos , flichtenheld Cc: openvpn-devel --CSoFwfsww5I= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: flichtenheld. ordex has uploaded a new patch set (#3) to the change originally created by= plaisthos. ( http://gerrit.openvpn.net/c/openvpn/+/927?usp=3Demail ) Change subject: Use SSL_get0_peer_signature_name instead of SSL_get_peer_si= gnature_nid ...................................................................... Use SSL_get0_peer_signature_name instead of SSL_get_peer_signature_nid SSL_get0_peer_signature_name returns a string instead of hardcoded NIDs. NIDS do not work with provider provided signatures or the new PQ signatures introduced in OpenSSL 3.5. Remove also the comment that was added earlier that says that there is no proper API replacement for SSL_get_peer_signature_nid yet as OpenSSL 3.5.0 has now introduced it. Change-Id: I2bc782ceebcc91a8dc8ada0bb72ac042be46cad6 Signed-off-by: Arne Schwabe --- M src/openvpn/openssl_compat.h M src/openvpn/ssl_openssl.c 2 files changed, 34 insertions(+), 11 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/27/927/3 diff --git a/src/openvpn/openssl_compat.h b/src/openvpn/openssl_compat.h index 3e3b406..e2bd9bf 100644 --- a/src/openvpn/openssl_compat.h +++ b/src/openvpn/openssl_compat.h @@ -173,4 +173,30 @@ #endif /* OPENSSL_VERSION_NUMBER < 0x30000000L */ +#if OPENSSL_VERSION_NUMBER < 0x30500000 && (!defined(LIBRESSL_VERSION_NUMB= ER) || LIBRESSL_VERSION_NUMBER > 0x3050400fL) +static inline int +SSL_get0_peer_signature_name(SSL *ssl, const char **sigalg) +{ + int peer_sig_nid; + if (SSL_get_peer_signature_nid(ssl, &peer_sig_nid) + && peer_sig_nid !=3D NID_undef) + { + *sigalg =3D OBJ_nid2sn(peer_sig_nid); + return 1; + } + return 0; +} +#elif defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER <=3D 0x3= 050400fL +/* The older LibreSSL version do not implement any variant of getting the = peer + * signature */ +static inline int +SSL_get0_peer_signature_name(const SSL *ssl, const char **sigalg) +{ + *sigalg =3D NULL; + return 0; +} +#endif /* if OPENSSL_VERSION_NUMBER < 0x30500000 && (!defined(LIBRESSL_VER= SION_NUMBER) || LIBRESSL_VERSION_NUMBER > 0x3050400fL) */ + + + #endif /* OPENSSL_COMPAT_H_ */ diff --git a/src/openvpn/ssl_openssl.c b/src/openvpn/ssl_openssl.c index aad79a4..23b0266 100644 --- a/src/openvpn/ssl_openssl.c +++ b/src/openvpn/ssl_openssl.c @@ -2454,20 +2454,17 @@ static void print_peer_signature(SSL *ssl, char *buf, size_t buflen) { - int peer_sig_nid =3D NID_undef, peer_sig_type_nid =3D NID_undef; - const char *peer_sig =3D "unknown"; + int peer_sig_type_nid =3D NID_undef; + const char *peer_sig_unknown =3D "unknown"; + const char *peer_sig =3D peer_sig_unknown; const char *peer_sig_type =3D "unknown type"; - /* Even though these methods use the deprecated NIDs instead of using - * string as new OpenSSL APIs do, there seem to be no API that replaces - * it yet */ -#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER > 0x30504= 00fL - if (SSL_get_peer_signature_nid(ssl, &peer_sig_nid) - && peer_sig_nid !=3D NID_undef) + const char *signame =3D NULL; + SSL_get0_peer_signature_name(ssl, &signame); + if (signame) { - peer_sig =3D OBJ_nid2sn(peer_sig_nid); + peer_sig =3D signame; } -#endif #if !defined(LIBRESSL_VERSION_NUMBER) \ || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >=3D 0= x3090000fL) @@ -2480,7 +2477,7 @@ } #endif - if (peer_sig_nid =3D=3D NID_undef && peer_sig_type_nid =3D=3D NID_unde= f) + if (peer_sig =3D=3D peer_sig_unknown && peer_sig_type_nid =3D=3D NID_u= ndef) { return; } -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/927?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: I2bc782ceebcc91a8dc8ada0bb72ac042be46cad6 Gerrit-Change-Number: 927 Gerrit-PatchSet: 3 Gerrit-Owner: plaisthos Gerrit-Reviewer: flichtenheld Gerrit-CC: openvpn-devel Gerrit-Attention: flichtenheld Gerrit-MessageType: newpatchset --CSoFwfsww5I= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: flichtenheld.

ordex uploaded patch set #3 to the change originally cr= eated by plaisthos.

View Change

Use SSL_get0_peer_signature_name instead o=
f SSL_get_peer_signature_nid

SSL_get0_peer_signature_name returns a = string instead of hardcoded NIDs.
NIDS do not work with provider provide= d signatures or the new PQ
signatures introduced in OpenSSL 3.5.

= Remove also the comment that was added earlier that says that there
is n= o proper API replacement for SSL_get_peer_signature_nid yet as OpenSSL
3= .5.0 has now introduced it.

Change-Id: I2bc782ceebcc91a8dc8ada0bb72a= c042be46cad6
Signed-off-by: Arne Schwabe <arne@...1227...>
---<= br>M src/openvpn/openssl_compat.h
M src/openvpn/ssl_openssl.c
2 files= changed, 34 insertions(+), 11 deletions(-)

git pull ssh://gerrit=
.openvpn.net:29418/openvpn refs/changes/27/927/3
diff --git a/src/o=
penvpn/openssl_compat.h b/src/openvpn/openssl_compat.h
inde= x 3e3b406..e2bd9bf 100644
--- a/src/openvpn/openssl_compat.= h
+++ b/src/openvpn/openssl_compat.h
@@ -17= 3,4 +173,30 @@

#endif /* OPENSSL_VERSION= _NUMBER < 0x30000000L */

+#if OPENSSL_VERSION_NUMBER < 0x30500000 &&= amp; (!defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER > 0x3= 050400fL)
+static inl= ine int
+SSL_get0_pee= r_signature_name(SSL *ssl, const char **sigalg)
+{
+ int peer_sig_nid;
+ if (SSL_get_peer_signature_nid(ssl, &peer_sig_nid)
+ && peer_= sig_nid !=3D NID_undef)
+ {
+ *s= igalg =3D OBJ_nid2sn(peer_sig_nid);
+ return 1;
+ }
+= return 0;
+}
+#elif defined(LIBRESSL_V= ERSION_NUMBER) && LIBRESSL_VERSION_NUMBER <=3D 0x3050400fL
+/* The older LibreSSL ver= sion do not implement any variant of getting the peer
+ * signature */
+static inline int
+SSL_get0_peer_signature_name(const SSL *ssl, co= nst char **sigalg)
+{=
+ *sigalg =3D NUL= L;
+ return 0;
+}
+#endif /* if OPENSSL_VERSION_NUMBER < = 0x30500000 && (!defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSIO= N_NUMBER > 0x3050400fL) */
+
++
#endif /* = OPENSSL_COMPAT_H_ */
diff --git a/src/openvpn/ssl_openssl.c= b/src/openvpn/ssl_openssl.c
index aad79a4..23b0266 100644<= /span>
--- a/src/openvpn/ssl_openssl.c
+++ b/src/o= penvpn/ssl_openssl.c
@@ -2454,20 +2454,17 @@
static void

print_peer_signature(SSL *ssl, char *buf, s= ize_t buflen)
{
- int peer_sig_nid =3D NID_undef, peer_sig_type_nid =3D NID_un= def;
- const char *p= eer_sig =3D "unknown";
+ int peer_sig_type_nid =3D NID_undef;
+ const char *peer_sig_unknown =3D &quo= t;unknown";
+ = const char *peer_sig =3D peer_sig_unknown;
const char= *peer_sig_type =3D "unknown type";

<= span style=3D"color: hsl(0, 100%, 40%);">- /* Even though these methods = use the deprecated NIDs instead of using

- * string as new OpenSSL APIs do, there seem to be n= o API that replaces
- = * it yet */
-#if !de= fined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER > 0x3050400fL<= /span>
- if (SSL_get_peer_s= ignature_nid(ssl, &peer_sig_nid)
- && peer_sig_nid !=3D NID_undef)
+ const char *signame =3D NULL= ;

+ SSL_get0_peer_= signature_name(ssl, &signame);
+ if (signame)
{
- peer_sig =3D OBJ_nid2sn(peer_sig_n= id);
+ peer_si= g =3D signame;
}
-#endif

#if !defined(LIBR= ESSL_VERSION_NUMBER) \
|| (defined(LIBRESSL_VERSION_NU= MBER) && LIBRESSL_VERSION_NUMBER >=3D 0x3090000fL)
@@ -2480,7 +2477,7 @@

}
#endif

- if = (peer_sig_nid =3D=3D NID_undef && peer_sig_type_nid =3D=3D NID_unde= f)
+ if (peer_sig = =3D=3D peer_sig_unknown && peer_sig_type_nid =3D=3D NID_undef)
{
return;
}<= /span>

To view, visit change 927. To unsubscribe, o= r for help writing mail filters, visit settings.

=
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I2bc782ceebcc91a8dc8ada0bb72= ac042be46cad6
Gerrit-Change-Number: 927
Gerrit-PatchSet: 3
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
--CSoFwfsww5I=--