From: "cron2 (Code Review)" Date: Sun, 5 Apr 2026 14:27:25 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <761f9d2fe1c5563399550a48ee7df9c62e786cc9-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="pBDZzmCCtfs="; charset=UTF-8 Subject: [Openvpn-devel] [M] Change in openvpn[master]: crypto_backend: Remove md_full List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: flichtenheld Cc: plaisthos , openvpn-devel --pBDZzmCCtfs= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/16= 12?usp=3Demail ) Change subject: crypto_backend: Remove md_full ...................................................................... crypto_backend: Remove md_full There was only one user for mbedtls < 4.0, so remove all the unused implementations. Identified by cppcheck. Change-Id: Ie2285f5bf52f5c669fb01f9ae36d6aa1674f0929 Signed-off-by: Frank Lichtenheld Acked-by: Gert Doering Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1612 Message-Id: <20260405103110.32401-1-gert@...1296...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg36= 495.html Signed-off-by: Gert Doering --- M src/openvpn/crypto_backend.h M src/openvpn/crypto_mbedtls.c M src/openvpn/crypto_mbedtls_legacy.c M src/openvpn/crypto_mbedtls_legacy.h M src/openvpn/crypto_openssl.c M src/openvpn/ssl_mbedtls.c 6 files changed, 5 insertions(+), 54 deletions(-) diff --git a/src/openvpn/crypto_backend.h b/src/openvpn/crypto_backend.h index 0bfa8b4..b602ba1 100644 --- a/src/openvpn/crypto_backend.h +++ b/src/openvpn/crypto_backend.h @@ -549,18 +549,6 @@ * */ -/** - * Calculates the message digest for the given buffer. - * - * @param mdname message digest name - * @param src Buffer to digest. May not be NULL. - * @param src_len The length of the incoming buffer. - * @param dst Buffer to write the message digest to. May not be = NULL. - * - * @return true on success, false on failure - */ -bool md_full(const char *mdname, const uint8_t *src, size_t src_len, uint8= _t *dst); - /* * Allocate a new message digest context * diff --git a/src/openvpn/crypto_mbedtls.c b/src/openvpn/crypto_mbedtls.c index c41daef..6662def 100644 --- a/src/openvpn/crypto_mbedtls.c +++ b/src/openvpn/crypto_mbedtls.c @@ -696,28 +696,6 @@ return ctx; } -bool -md_full(const char *mdname, const uint8_t *src, size_t src_len, uint8_t *d= st) -{ - const md_info_t *md =3D md_get(mdname); - if (md =3D=3D NULL) - { - return false; - } - - /* We depend on the caller to ensure that dst has enough room for the = hash, - * so we just tell PSA that it can hold the appropriate amount of byte= s. */ - size_t dst_size =3D PSA_HASH_LENGTH(md->psa_alg); - size_t hash_length =3D 0; - - psa_status_t status =3D psa_hash_compute(md->psa_alg, src, src_len, ds= t, dst_size, &hash_length); - if (status !=3D PSA_SUCCESS || hash_length !=3D dst_size) - { - return false; - } - return true; -} - void md_ctx_free(md_ctx_t *ctx) { diff --git a/src/openvpn/crypto_mbedtls_legacy.c b/src/openvpn/crypto_mbedt= ls_legacy.c index 087d94c..debd53d 100644 --- a/src/openvpn/crypto_mbedtls_legacy.c +++ b/src/openvpn/crypto_mbedtls_legacy.c @@ -769,7 +769,7 @@ */ -static const mbedtls_md_info_t * +const mbedtls_md_info_t * md_get(const char *digest) { const mbedtls_md_info_t *md =3D NULL; @@ -825,13 +825,6 @@ * */ -bool -md_full(const char *mdname, const uint8_t *src, size_t src_len, uint8_t *d= st) -{ - const mbedtls_md_info_t *kt =3D md_get(mdname); - return 0 =3D=3D mbedtls_md(kt, src, src_len, dst); -} - mbedtls_md_context_t * md_ctx_new(void) { diff --git a/src/openvpn/crypto_mbedtls_legacy.h b/src/openvpn/crypto_mbedt= ls_legacy.h index 1005057..23113be 100644 --- a/src/openvpn/crypto_mbedtls_legacy.h +++ b/src/openvpn/crypto_mbedtls_legacy.h @@ -137,4 +137,6 @@ */ #define mbed_ok(errval) mbed_log_func_line_lite(D_CRYPT_ERRORS, errval, __= func__, __LINE__) +const mbedtls_md_info_t *md_get(const char *digest); + #endif /* CRYPTO_MBEDTLS_H_ */ diff --git a/src/openvpn/crypto_openssl.c b/src/openvpn/crypto_openssl.c index 9900d06..c11cfd8 100644 --- a/src/openvpn/crypto_openssl.c +++ b/src/openvpn/crypto_openssl.c @@ -1107,17 +1107,6 @@ * */ -bool -md_full(const char *mdname, const uint8_t *src, size_t src_len, uint8_t *d= st) -{ - unsigned int in_md_len =3D 0; - evp_md_type *kt =3D md_get(mdname); - - int ret =3D EVP_Digest(src, src_len, dst, &in_md_len, kt, NULL); - EVP_MD_free(kt); - return ret =3D=3D 1; -} - EVP_MD_CTX * md_ctx_new(void) { diff --git a/src/openvpn/ssl_mbedtls.c b/src/openvpn/ssl_mbedtls.c index d0c481e..a62ff76 100644 --- a/src/openvpn/ssl_mbedtls.c +++ b/src/openvpn/ssl_mbedtls.c @@ -1029,8 +1029,9 @@ if (NULL !=3D ctx->crt_chain) { mbedtls_x509_crt *cert =3D ctx->crt_chain; + const mbedtls_md_info_t *kt =3D md_get("SHA256"); - if (!md_full("SHA256", cert->tbs.p, cert->tbs.len, sha256_hash)) + if (0 !=3D mbedtls_md(kt, cert->tbs.p, cert->tbs.len, sha256_hash)) { msg(M_WARN, "WARNING: failed to personalise random"); } -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1612?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings?usp=3Demail Gerrit-MessageType: merged Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: Ie2285f5bf52f5c669fb01f9ae36d6aa1674f0929 Gerrit-Change-Number: 1612 Gerrit-PatchSet: 2 Gerrit-Owner: flichtenheld Gerrit-Reviewer: cron2 Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel --pBDZzmCCtfs= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 sub= mitted this change.

View Change

crypto_backend: Remove md_full

There was = only one user for mbedtls < 4.0,
so remove all the unused implementat= ions.

Identified by cppcheck.

Change-Id: Ie2285f5bf52f5c669fb= 01f9ae36d6aa1674f0929
Signed-off-by: Frank Lichtenheld <frank@...2746...= ...>
Acked-by: Gert Doering <gert@...1296...>
Gerrit URL: ht= tps://gerrit.openvpn.net/c/openvpn/+/1612
Message-Id: <20260405103110= .32401-1-gert@...1296...>
URL: https://www.mail-archive.com/openvpn-d= evel@lists.sourceforge.net/msg36495.html
Signed-off-by: Gert Doering <= ;gert@...1296...>
---
M src/openvpn/crypto_backend.h
M src/open= vpn/crypto_mbedtls.c
M src/openvpn/crypto_mbedtls_legacy.c
M src/open= vpn/crypto_mbedtls_legacy.h
M src/openvpn/crypto_openssl.c
M src/open= vpn/ssl_mbedtls.c
6 files changed, 5 insertions(+), 54 deletions(-)
<= br>
diff --git a/src/openvpn/crypto_backend.h b/src/openvpn/crypto_backend.h=

index 0bfa8b4..b602ba1 100644
--- a/src/op= envpn/crypto_backend.h
+++ b/src/openvpn/crypto_backend.h
@@ -549,18 +549,6 @@
*
*= /

-/*= *
- * Calculates the me= ssage digest for the given buffer.
- *
- * @pa= ram mdname message digest name
- * @param src Buffer to digest. May not be NULL.<= /span>
- * @param src_len = The length of the incoming buffer.
- * @param dst Buffer to write the message digest t= o. May not be NULL.
- *=
- * @return = true on success, false on failure
- */
-boo= l md_full(const char *mdname, const uint8_t *src, size_t src_len, uint8_t *= dst);
-
/*

* Allocate a new message digest context
*

diff --git a/src/openvpn/crypto_mbedtls.c b/src/ope= nvpn/crypto_mbedtls.c
index c41daef..6662def 100644<= br>--- a/src/openvpn/crypto_mbedtls.c
+++ b/src/openv= pn/crypto_mbedtls.c
@@ -696,28 +696,6 @@
= return ctx;
}

-bool
-md_full(const char *mdname, const uint8_t *src, size_t src_l= en, uint8_t *dst)
-{
- const md_info_t *md = =3D md_get(mdname);
- = if (md =3D=3D NULL)
-= {
- return f= alse;
- }
= -
- /* We depend on the caller to ensure that dst has= enough room for the hash,
- * so we just tell PSA that it can hold the appropriate amount of = bytes. */
- size_t d= st_size =3D PSA_HASH_LENGTH(md->psa_alg);
- size_t hash_length =3D 0;
-
- psa_status_t status =3D psa_hash_compute(md->psa_alg, src= , src_len, dst, dst_size, &hash_length);
- if (status !=3D PSA_SUCCESS || hash_length !=3D = dst_size)
- {=
- return false;=
- }
- return true;
-}
-
void
md_ctx_free(md_ctx_t *ctx)
{
diff --git a/src/openvpn/crypto_mbedtls_l= egacy.c b/src/openvpn/crypto_mbedtls_legacy.c
index 087d94c= ..debd53d 100644
--- a/src/openvpn/crypto_mbedtls_legacy.c<= /span>
+++ b/src/openvpn/crypto_mbedtls_legacy.c
@= @ -769,7 +769,7 @@
*/

=
-static const mbedtls_= md_info_t *
+const mb= edtls_md_info_t *
md_get(const char *digest)
{

const mbedtls_md_info_t *md =3D NULL;
= @@ -825,13 +825,6 @@
*
*/<= br>
-bool=
-md_full(const char *mdname, = const uint8_t *src, size_t src_len, uint8_t *dst)
-{
- const mbedtls_md_info_t *kt =3D md_get(mdname);
- return 0 =3D=3D mbedtls_md(kt, sr= c, src_len, dst);

-}
-
mbedtl= s_md_context_t *
md_ctx_new(void)
{
diff --git a/src/openvpn/crypto_mbedtls_legacy.h b/src/openvpn/c= rypto_mbedtls_legacy.h
index 1005057..23113be 100644=
--- a/src/openvpn/crypto_mbedtls_legacy.h
+++ b/s= rc/openvpn/crypto_mbedtls_legacy.h
@@ -137,4 +137,6 @@
*/
#define mbed_ok(errval) mbed_log_func_lin= e_lite(D_CRYPT_ERRORS, errval, __func__, __LINE__)
=
+const mbedtls_md_info_t *m= d_get(const char *digest);
+
#endif /* CRYPTO_MBEDTLS_H_ */
dif= f --git a/src/openvpn/crypto_openssl.c b/src/openvpn/crypto_openssl.c
index 9900d06..c11cfd8 100644
--- a/src/openvpn/= crypto_openssl.c
+++ b/src/openvpn/crypto_openssl.c<= br>@@ -1107,17 +1107,6 @@
*
*/

-bool
-md_full(const char *mdn= ame, const uint8_t *src, size_t src_len, uint8_t *dst)
-{
- unsigned int in_md_len =3D 0;
- evp_md_type *kt =3D md_get(mdname);
= -
- int ret =3D EVP_Digest(src, src_len, dst, &in= _md_len, kt, NULL);
- = EVP_MD_free(kt);
- = return ret =3D=3D 1;
-= }
-
EV= P_MD_CTX *
md_ctx_new(void)
{
<= span>diff --git a/src/openvpn/ssl_mbedtls.c b/src/openvpn/ssl_mbedtls.c

index d0c481e..a62ff76 100644
--- a/src/openvp= n/ssl_mbedtls.c
+++ b/src/openvpn/ssl_mbedtls.c
<= span>@@ -1029,8 +1029,9 @@
if (NULL !=3D ctx->crt_c= hain)
{
mbedtls_x509_crt *cer= t =3D ctx->crt_chain;
+ const mbedtls_md_info_t *kt =3D md_get("SHA256");

- = if (!md_full("SHA256", cert->tbs.p, cert->tbs.len, sha256= _hash))
+ if (= 0 !=3D mbedtls_md(kt, cert->tbs.p, cert->tbs.len, sha256_hash))
{
msg(M_WARN, "WARNIN= G: failed to personalise random");
}

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

Gerrit-MessageType: merged
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ie2285f5bf52f5c669fb01f9ae36= d6aa1674f0929
Gerrit-Change-Number: 1612
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>
= --pBDZzmCCtfs=--