From: "cron2 (Code Review)" Date: Thu, 8 Jan 2026 15:52:11 +0000 In-Reply-To: References: Reply-To: gert@...1296..., 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="XKJClutoo4k="; charset=UTF-8 Subject: [Openvpn-devel] [XS] Change in openvpn[master]: Fix building test_tls_crypt with cmocka 2.0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: flichtenheld Cc: plaisthos , openvpn-devel --XKJClutoo4k= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/14= 60?usp=3Demail ) Change subject: Fix building test_tls_crypt with cmocka 2.0 ...................................................................... Fix building test_tls_crypt with cmocka 2.0 This was missed in commit 6db186e0b1d9783ea96e8a945a47fd23b45e4778 since we only built with cmocka 2.0 on macOS and that doesn't build test_tls_crypt. Now that we build with cmocka 2.0 also on Debian Sid we noticed the additional issues. Change-Id: Ibc964c13724316ca96276ba6b7d34dbbfcf52064 Signed-off-by: Frank Lichtenheld Acked-by: Gert Doering Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1460 Message-Id: <20260108154248.21706-1-gert@...1296...> Signed-off-by: Gert Doering --- M tests/unit_tests/openvpn/test_tls_crypt.c 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/unit_tests/openvpn/test_tls_crypt.c b/tests/unit_tests/o= penvpn/test_tls_crypt.c index 4a80a4c..730841e 100644 --- a/tests/unit_tests/openvpn/test_tls_crypt.c +++ b/tests/unit_tests/openvpn/test_tls_crypt.c @@ -110,8 +110,8 @@ __wrap_buffer_write_file(const char *filename, const struct buffer *buf) { const char *pem =3D BSTR(buf); - check_expected(filename); - check_expected(pem); + check_expected_ptr(filename); + check_expected_ptr(pem); return mock_type(bool); } @@ -119,7 +119,7 @@ struct buffer __wrap_buffer_read_from_file(const char *filename, struct gc_arena *gc) { - check_expected(filename); + check_expected_ptr(filename); const char *pem_str =3D mock_ptr_type(const char *); struct buffer ret =3D alloc_buf_gc(strlen(pem_str) + 1, gc); -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1460?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: Ibc964c13724316ca96276ba6b7d34dbbfcf52064 Gerrit-Change-Number: 1460 Gerrit-PatchSet: 2 Gerrit-Owner: flichtenheld Gerrit-Reviewer: cron2 Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel --XKJClutoo4k= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 sub= mitted this change.

View Change

Fix building test_tls_crypt with cmocka 2.0
<= br>This was missed in commit
6db186e0b1d9783ea96e8a945a47fd23b45e4778 si= nce we
only built with cmocka 2.0 on macOS and that doesn't
build= test_tls_crypt.

Now that we build with cmocka 2.0 also on Debian Si= d
we noticed the additional issues.

Change-Id: Ibc964c13724316ca9= 6276ba6b7d34dbbfcf52064
Signed-off-by: Frank Lichtenheld <frank@...2375...= 41...>
Acked-by: Gert Doering <gert@...1296...>
Gerrit URL: = https://gerrit.openvpn.net/c/openvpn/+/1460
Message-Id: <202601081542= 48.21706-1-gert@...1296...>
Signed-off-by: Gert Doering <gert@...1386...= 296...>
---
M tests/unit_tests/openvpn/test_tls_crypt.c
1 file = changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/unit_tests/openvpn/test_tls_crypt.c b/tests/unit_test=
s/openvpn/test_tls_crypt.c
index 4a80a4c..730841e 100644
--- a/tests/unit_tests/openvpn/test_tls_crypt.c
+++ b/tests/unit_tests/openvpn/test_tls_crypt.c

@@ -110,= 8 +110,8 @@
__wrap_buffer_write_file(const char *filename,= const struct buffer *buf)
{
const ch= ar *pem =3D BSTR(buf);
= - check_expected(filename);
- check_expected(pem);
+ check_expected_ptr(filename);
+ check_expected_ptr(pem);
<= /span>
return mock_type(bool);
}
<= span>@@ -119,7 +119,7 @@

struct buffer
__= wrap_buffer_read_from_file(const char *filename, struct gc_arena *gc)
{
- chec= k_expected(filename);
+ check_expected_ptr(filename);

= const char *pem_str =3D mock_ptr_type(const char *);
s= truct buffer ret =3D alloc_buf_gc(strlen(pem_str) + 1, gc);

To view, visit change 1460. To unsubscribe, or for help wr= iting mail filters, visit settings.

=
Gerrit-MessageType: merged
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ibc964c13724316ca96276ba6b7d= 34dbbfcf52064
Gerrit-Change-Number: 1460
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>
= --XKJClutoo4k=--