From: "cron2 (Code Review)" Date: Tue, 14 Jan 2025 17:34:53 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <7929155b70e063dddef7a5b60068593718850992-EmailReplacePatchSet-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="SR0sSLmrZvE="; charset=UTF-8 Subject: [Openvpn-devel] [M] Change in openvpn[master]: ssl_openssl: Clean up unused functions and add missing "static" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: flichtenheld , plaisthos Cc: openvpn-devel --SR0sSLmrZvE= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has uploaded a new patch set (#2) to the change originally created by= flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/860?usp=3Demail ) The following approvals got outdated and were removed: Code-Review+2 by cron2 Change subject: ssl_openssl: Clean up unused functions and add missing "sta= tic" ...................................................................... ssl_openssl: Clean up unused functions and add missing "static" Just some misc cleanups found while looking at the code. Change-Id: Ifa06a3cb843dbf6a9639164d12aabe572aab162c Signed-off-by: Frank Lichtenheld Acked-by: Gert Doering Message-Id: <20250114164938.12828-1-gert@...1296...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg30= 453.html Signed-off-by: Gert Doering --- M src/openvpn/ssl_backend.h M src/openvpn/ssl_mbedtls.c M src/openvpn/ssl_openssl.c 3 files changed, 5 insertions(+), 50 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/60/860/2 diff --git a/src/openvpn/ssl_backend.h b/src/openvpn/ssl_backend.h index a6a9695..e25727f 100644 --- a/src/openvpn/ssl_backend.h +++ b/src/openvpn/ssl_backend.h @@ -529,12 +529,12 @@ * ***************************************/ -/* +/** * Print a one line summary of SSL/TLS session handshake. */ void print_details(struct key_state_ssl *ks_ssl, const char *prefix); -/* +/** * Show the TLS ciphers that are available for us to use in the * library depending on the TLS version. This function prints * a list of ciphers without headers/footers. @@ -549,17 +549,11 @@ const char *tls_cert_profile, bool tls13); -/* +/** * Show the available elliptic curves in the crypto library */ void show_available_curves(void); -/* - * The OpenSSL library has a notion of preference in TLS ciphers. Higher - * preference =3D=3D more secure. Return the highest preference cipher. - */ -void get_highest_preference_tls_cipher(char *buf, int size); - /** * return a pointer to a static memory area containing the * name and version number of the SSL library in use diff --git a/src/openvpn/ssl_mbedtls.c b/src/openvpn/ssl_mbedtls.c index 56eef36..92b52fe 100644 --- a/src/openvpn/ssl_mbedtls.c +++ b/src/openvpn/ssl_mbedtls.c @@ -1585,20 +1585,6 @@ } } =20 -void -get_highest_preference_tls_cipher(char *buf, int size) -{ - const char *cipher_name; - const int *ciphers =3D mbedtls_ssl_list_ciphersuites(); - if (*ciphers =3D=3D 0) - { - msg(M_FATAL, "Cannot retrieve list of supported SSL ciphers."); - } - - cipher_name =3D mbedtls_ssl_get_ciphersuite_name(*ciphers); - strncpynt(buf, cipher_name, size); -} - const char * get_ssl_library_version(void) { diff --git a/src/openvpn/ssl_openssl.c b/src/openvpn/ssl_openssl.c index 98eba9d..89d0328 100644 --- a/src/openvpn/ssl_openssl.c +++ b/src/openvpn/ssl_openssl.c @@ -354,7 +354,7 @@ return true; } -void +static void convert_tls_list_to_openssl(char *openssl_ciphers, size_t len, const char = *ciphers) { /* Parse supplied cipher list and pass on to OpenSSL */ @@ -461,7 +461,7 @@ } } -void +static void convert_tls13_list_to_openssl(char *openssl_ciphers, size_t len, const char *ciphers) { @@ -2638,31 +2638,6 @@ #endif /* ifndef OPENSSL_NO_EC */ } -void -get_highest_preference_tls_cipher(char *buf, int size) -{ - SSL_CTX *ctx; - SSL *ssl; - const char *cipher_name; - - ctx =3D SSL_CTX_new(SSLv23_method()); - if (!ctx) - { - crypto_msg(M_FATAL, "Cannot create SSL_CTX object"); - } - ssl =3D SSL_new(ctx); - if (!ssl) - { - crypto_msg(M_FATAL, "Cannot create SSL object"); - } - - cipher_name =3D SSL_get_cipher_list(ssl, 0); - strncpynt(buf, cipher_name, size); - - SSL_free(ssl); - SSL_CTX_free(ctx); -} - const char * get_ssl_library_version(void) { -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/860?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: Ifa06a3cb843dbf6a9639164d12aabe572aab162c Gerrit-Change-Number: 860 Gerrit-PatchSet: 2 Gerrit-Owner: flichtenheld Gerrit-Reviewer: cron2 Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-MessageType: newpatchset --SR0sSLmrZvE= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 uploaded patch set #2 to the change originally cr= eated by flichtenheld.

View Change

The following approvals got outda= ted and were removed: Code-Review+2 by cron2

ssl_openssl: Clean up unused functions and add missi=
ng "static"

Just some misc cleanups found while looking at= the code.

Change-Id: Ifa06a3cb843dbf6a9639164d12aabe572aab162c
S= igned-off-by: Frank Lichtenheld <frank@...2641...>
Acked-by: Gert = Doering <gert@...1296...>
Message-Id: <20250114164938.12828-1-g= ert@...1296...>
URL: https://www.mail-archive.com/openvpn-devel@...1697...= .sourceforge.net/msg30453.html
Signed-off-by: Gert Doering <gert@...1386...= 296...>
---
M src/openvpn/ssl_backend.h
M src/openvpn/ssl_mbedt= ls.c
M src/openvpn/ssl_openssl.c
3 files changed, 5 insertions(+), 50= deletions(-)

git pull ssh://gerrit.openvpn.net:29418/openvpn ref=
s/changes/60/860/2
diff --git a/src/openvpn/ssl_backend.h b/src/ope=
nvpn/ssl_backend.h
index a6a9695..e25727f 100644
= --- a/src/openvpn/ssl_backend.h
+++ b/src/openvpn/ssl= _backend.h
@@ -529,12 +529,12 @@
*=
***************************************/

-/*
+/**
* Print a one line = summary of SSL/TLS session handshake.
*/
= void print_details(struct key_state_ssl *ks_ssl, const char *prefix);

-/*
+/**
* S= how the TLS ciphers that are available for us to use in the
* library depending on the TLS version. This function prints

<= span> * a list of ciphers without headers/footers.

@@ -549= ,17 +549,11 @@
const char = *tls_cert_profile,
bool tl= s13);

-/*
+/**
<= span> * Show the available elliptic curves in the crypto library
*/
void show_available_curves(void);

-/*
- * The OpenSSL library has a notion= of preference in TLS ciphers. Higher
- * preference =3D=3D more secure. Return the highest prefe= rence cipher.
- */
-void get_highest_preferenc= e_tls_cipher(char *buf, int size);
-
/**
* return a pointer to = a static memory area containing the
* name and version nu= mber of the SSL library in use
diff --git a/src/openvpn/ssl= _mbedtls.c b/src/openvpn/ssl_mbedtls.c
index 56eef36..92b52= fe 100644
--- a/src/openvpn/ssl_mbedtls.c
+= ++ b/src/openvpn/ssl_mbedtls.c
@@ -1585,20 +1585,6 @@
}
}

-void
-get_highest_preference_tls_cipher(char *buf, int size)
-{
- const char *cipher_name;
- const int *ciphers =3D mbedtls_ssl_= list_ciphersuites();
- = if (*ciphers =3D=3D 0)
- {
- msg(= M_FATAL, "Cannot retrieve list of supported SSL ciphers.");
- }
-
- cipher_name =3D mbedtls_ssl_get_ciphersuite_name(*ciphers);<= /span>
- strncpynt(buf, cip= her_name, size);
-}

-
const c= har *
get_ssl_library_version(void)
{
diff --git a/src/openvpn/ssl_openssl.c b/src/openvpn/ssl_opens= sl.c
index 98eba9d..89d0328 100644
--- a/sr= c/openvpn/ssl_openssl.c
+++ b/src/openvpn/ssl_openssl.c
@@ -354,7 +354,7 @@
return true; }

-void
+static v= oid
convert_tls_list_to_openssl(char *openssl_ciphers, siz= e_t len, const char *ciphers)
{
/* Pa= rse supplied cipher list and pass on to OpenSSL */
@@ -461,= 7 +461,7 @@
}
}

-void
+static void
convert_tls= 13_list_to_openssl(char *openssl_ciphers, size_t len,
= const char *ciphers)
{@@ -2638,31 +2638,6 @@
#endif /* ifndef OPENSSL_NO_= EC */
}

-void
-get_highest_preference_tls_cipher(char *buf, int size)
-{
- SSL_CTX *ctx;
- SSL *ssl;
- const char *cipher_name;
-
- ctx = =3D SSL_CTX_new(SSLv23_method());
- if (!ctx)
- {
- cryp= to_msg(M_FATAL, "Cannot create SSL_CTX object");
- }
- ssl =3D SSL_new(ctx);
- if (!ssl)
- {
= - crypto_msg(M_FATAL, "Cannot create SSL object");<= br>- }
-
- cipher_name =3D SSL_get_cipher_list(ssl, 0);
- strncpynt(buf, cipher_name, size)= ;

-
- SSL_free(ssl);
- SSL_CTX_free(ctx);
-}
-
const char *
get_ssl_librar= y_version(void)
{

To v= iew, visit change 860. To unsubscribe, or for help writing mail filters, visit <= a href=3D"http://gerrit.openvpn.net/settings">settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ifa06a3cb843dbf6a9639164d12a= abe572aab162c
Gerrit-Change-Number: 860
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <frank@...2723...= .>
Gerrit-Reviewer: cron2 <gert@...1296...>=
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-MessageType: newpatchset
--SR0sSLmrZvE=--