diff mbox series

[Openvpn-devel,v1] Fix building test_tls_crypt with cmocka 2.0

Message ID 20260108154248.21706-1-gert@greenie.muc.de
State New
Headers show
Series [Openvpn-devel,v1] Fix building test_tls_crypt with cmocka 2.0 | expand

Commit Message

Gert Doering Jan. 8, 2026, 3:42 p.m. UTC 
From: Frank Lichtenheld <frank@lichtenheld.com>

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 <frank@lichtenheld.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1460
---

This change was reviewed on Gerrit and approved by at least one
developer. I request to merge it to master.

Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1460
This mail reflects revision 1 of this Change.

Acked-by according to Gerrit (reflected above):
Gert Doering <gert@greenie.muc.de>

Comments

Gert Doering Jan. 8, 2026, 3:51 p.m. UTC | #1 
As it says on the lid :-) - the change affects only UT test code, is
straightforward, and the tests still pass for old libcmocka versions.

Onwards!

Your patch has been applied to the master branch.

commit 20f8127bcd31918af6f97570765d136ebf0fb801
Author: Frank Lichtenheld
Date:   Thu Jan 8 16:42:43 2026 +0100

     Fix building test_tls_crypt with cmocka 2.0

     Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
     Acked-by: Gert Doering <gert@greenie.muc.de>
     Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1460
     Message-Id: <20260108154248.21706-1-gert@greenie.muc.de>
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering
diff mbox series

Patch

diff --git a/tests/unit_tests/openvpn/test_tls_crypt.c b/tests/unit_tests/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 char *pem = 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 = mock_ptr_type(const char *);
     struct buffer ret = alloc_buf_gc(strlen(pem_str) + 1, gc);