From: "plaisthos (Code Review)" Date: Mon, 11 Dec 2023 13:59:45 +0000 In-Reply-To: References: Reply-To: arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <7d56103e9446f61284301de726a31e9354938731-EmailReplacePatchSet-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="DXamz7LDvOc="; charset=UTF-8 Subject: [Openvpn-devel] [L] Change in openvpn[master]: Add test_ssl unit test and test export of PEM to file List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: flichtenheld Cc: openvpn-devel --DXamz7LDvOc= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: flichtenheld. Hello flichtenheld,=20 I'd like you to reexamine a change. Please visit http://gerrit.openvpn.net/c/openvpn/+/471?usp=3Demail to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review-1 by flichtenheld Change subject: Add test_ssl unit test and test export of PEM to file ...................................................................... Add test_ssl unit test and test export of PEM to file This introduces a number of mock function to be able to compile ssl_verify_*.c and ssl_mbedtls.c/ssl_openssl.c into a unit and adds quite a number of files to that unit. But it allows similar unit tests (in term of dependencies) to be added in the future. Change-Id: Ie248d35d063bb6878f3dd42840c77ba0d6fa3381 Signed-off-by: Arne Schwabe --- M .github/workflows/build.yaml M CMakeLists.txt M tests/unit_tests/openvpn/Makefile.am A tests/unit_tests/openvpn/mock_management.c A tests/unit_tests/openvpn/mock_ssl_dependencies.c A tests/unit_tests/openvpn/test_ssl.c 6 files changed, 315 insertions(+), 2 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/71/471/2 diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 4393f5c..bdb30c8 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -85,7 +85,7 @@ fail-fast: false matrix: arch: [x86, x64] - test: [argv, auth_token, buffer, cryptoapi, crypto, misc, ncp, pac= ket_id, pkt, provider, tls_crypt] + test: [argv, auth_token, buffer, cryptoapi, crypto, misc, ncp, pac= ket_id, pkt, provider, ssl, tls_crypt] runs-on: windows-latest name: "mingw unittest ${{ matrix.test }} - ${{ matrix.arch }} - OSSL" diff --git a/CMakeLists.txt b/CMakeLists.txt index 8c24cca..746e538 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -562,6 +562,7 @@ "test_packet_id" "test_pkt" "test_provider" + "test_ssl" ) if (WIN32) @@ -671,6 +672,34 @@ src/openvpn/mss.c ) + target_sources(test_ssl PRIVATE + tests/unit_tests/openvpn/mock_management.c + tests/unit_tests/openvpn/mock_ssl_dependencies.c + src/openvpn/argv.c + src/openvpn/base64.c + src/openvpn/block_dns.c + src/openvpn/crypto.c + src/openvpn/crypto_mbedtls.c + src/openvpn/crypto_openssl.c + src/openvpn/cryptoapi.c + src/openvpn/env_set.c + src/openvpn/env_set.c + src/openvpn/mss.c + src/openvpn/mtu.c + src/openvpn/options_util.c + src/openvpn/otime.c + src/openvpn/packet_id.c + src/openvpn/run_command.c + src/openvpn/ssl_mbedtls.c + src/openvpn/ssl_openssl.c + src/openvpn/ssl_util.c + src/openvpn/ssl_verify_mbedtls.c + src/openvpn/ssl_verify_openssl.c + src/openvpn/win32.c + src/openvpn/xkey_helper.c + src/openvpn/xkey_provider.c + ) + target_sources(test_misc PRIVATE tests/unit_tests/openvpn/mock_get_random.c src/openvpn/options_util.c diff --git a/tests/unit_tests/openvpn/Makefile.am b/tests/unit_tests/openvp= n/Makefile.am index ef45b11..5d3eb70 100644 --- a/tests/unit_tests/openvpn/Makefile.am +++ b/tests/unit_tests/openvpn/Makefile.am @@ -7,7 +7,8 @@ endif test_binaries +=3D crypto_testdriver packet_id_testdriver auth_token_testd= river ncp_testdriver misc_testdriver \ - pkt_testdriver + pkt_testdriver ssl_testdriver + if HAVE_LD_WRAP_SUPPORT if !WIN32 test_binaries +=3D tls_crypt_testdriver @@ -67,6 +68,29 @@ $(top_srcdir)/src/openvpn/win32-util.c \ $(top_srcdir)/src/openvpn/mss.c +ssl_testdriver_CFLAGS =3D @TEST_CFLAGS@ \ + -I$(top_srcdir)/include -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/op= envpn +ssl_testdriver_LDFLAGS =3D @TEST_LDFLAGS@ +ssl_testdriver_SOURCES =3D test_crypto.c mock_msg.c mock_msg.h \ + mock_management.c mock_ssl_dependencies.c \ + $(top_srcdir)/src/openvpn/buffer.c \ + $(top_srcdir)/src/openvpn/crypto.c \ + $(top_srcdir)/src/openvpn/crypto_mbedtls.c \ + $(top_srcdir)/src/openvpn/crypto_openssl.c \ + $(top_srcdir)/src/openvpn/otime.c \ + $(top_srcdir)/src/openvpn/packet_id.c \ + $(top_srcdir)/src/openvpn/platform.c \ + $(top_srcdir)/src/openvpn/mtu.c \ + $(top_srcdir)/src/openvpn/win32-util.c \ + $(top_srcdir)/src/openvpn/mss.c \ + $(top_srcdir)/src/openvpn/xkey_provider.c \ + $(top_srcdir)/src/openvpn/xkey_helper.c \ + $(top_srcdir)/src/openvpn/ssl_util.c \ + $(top_srcdir)/src/openvpn/base64.c \ + $(top_srcdir)/src/openvpn/cryptoapi.c \ + $(top_srcdir)/src/openvpn/win32.c + + packet_id_testdriver_CFLAGS =3D @TEST_CFLAGS@ \ -I$(top_srcdir)/include -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/op= envpn packet_id_testdriver_LDFLAGS =3D @TEST_LDFLAGS@ diff --git a/tests/unit_tests/openvpn/mock_management.c b/tests/unit_tests/= openvpn/mock_management.c new file mode 100644 index 0000000..ab2945f --- /dev/null +++ b/tests/unit_tests/openvpn/mock_management.c @@ -0,0 +1,54 @@ +/* + * OpenVPN -- An application to securely tunnel IP networks + * over a single UDP port, with support for SSL/TLS-based + * session authentication and key exchange, + * packet encryption, packet authentication, and + * packet compression. + * + * Copyright (C) 2002-2023 OpenVPN Inc + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +/* Minimal set of mocked management function/globals to get unit tests to + * compile */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "syshead.h" + +#include "manage.h" + +#ifdef ENABLE_MANAGEMENT + +struct management *management; /* GLOBAL */ + +void +management_auth_failure(struct management *man, const char *type, const ch= ar *reason) +{ + ASSERT(false); +} + +char * +management_query_pk_sig(struct management *man, const char *b64_data, + const char *algorithm) +{ + (void) man; + (void) b64_data; + (void) algorithm; + return NULL; +} +#endif diff --git a/tests/unit_tests/openvpn/mock_ssl_dependencies.c b/tests/unit_= tests/openvpn/mock_ssl_dependencies.c new file mode 100644 index 0000000..9231d65 --- /dev/null +++ b/tests/unit_tests/openvpn/mock_ssl_dependencies.c @@ -0,0 +1,67 @@ +/* + * OpenVPN -- An application to securely tunnel IP networks + * over a single UDP port, with support for SSL/TLS-based + * session authentication and key exchange, + * packet encryption, packet authentication, and + * packet compression. + * + * Copyright (C) 2002-2023 OpenVPN Inc + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +/* Minimal set of mocked function/globals to get unit tests to + * compile that use the ssl_* files */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "syshead.h" + +#include +#include + + +#include "ssl.h" +#include "ssl_verify.h" + +int +parse_line(const char *line, char **p, const int n, const char *file, + const int line_num, int msglevel, struct gc_arena *gc) +{ + /* Dummy function to get the linker happy, should never be called */ + assert_true(false); + return 0; +} + + +int +pem_password_callback(char *buf, int size, int rwflag, void *u) +{ + return 0; +} + +void +cert_hash_remember(struct tls_session *session, const int cert_depth, + const struct buffer *cert_hash) +{ + assert_false(true); +} + +result_t +verify_cert(struct tls_session *session, openvpn_x509_cert_t *cert, int ce= rt_depth) +{ + return FAILURE; +} diff --git a/tests/unit_tests/openvpn/test_ssl.c b/tests/unit_tests/openvpn= /test_ssl.c new file mode 100644 index 0000000..acaaad5 --- /dev/null +++ b/tests/unit_tests/openvpn/test_ssl.c @@ -0,0 +1,139 @@ +/* + * OpenVPN -- An application to securely tunnel IP networks + * over a single UDP port, with support for SSL/TLS-based + * session authentication and key exchange, + * packet encryption, packet authentication, and + * packet compression. + * + * Copyright (C) 2023 OpenVPN Inc + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "syshead.h" + +#include +#include +#include +#include +#include +#include + +#include "crypto.h" +#include "options.h" +#include "ssl_backend.h" +#include "options_util.h" + +#include "mock_msg.h" +#include "mss.h" +#include "ssl_verify_backend.h" +#include "win32.h" + +/* Mock function to be allowed to include win32.c which is required for + * getting the temp directory */ +#ifdef _WIN32 +struct signal_info siginfo_static; /* GLOBAL */ + +const char * +strerror_win32(DWORD errnum, struct gc_arena *gc) +{ + ASSERT(false); +} + +void +throw_signal(const int signum) +{ + ASSERT(false); +} +#endif + + +const char *unittest_cert =3D "-----BEGIN CERTIFICATE-----\n" + "MIIBuTCCAUCgAwIBAgIUTLtjSBzx53qZRvZ6Ur7D9kgoO= HkwCgYIKoZIzj0EAwIw\n" + "EzERMA8GA1UEAwwIdW5pdHRlc3QwIBcNMjMxMTIxMDk1N= DQ3WhgPMjA3ODA4MjQw\n" + "OTU0NDdaMBMxETAPBgNVBAMMCHVuaXR0ZXN0MHYwEAYHK= oZIzj0CAQYFK4EEACID\n" + "YgAEHYB2hn2xx3f4lClXDtdi36P19pMZA+kI1Dkv/Vn10= vBZ/j9oa+P99T8duz/e\n" + "QlPeHpesNJO4fX8iEDj6+vMeWejOT7jAQ4MmG5EZjpcBK= xCfwFooEvzu8bVujUcu\n" + "wTQEo1MwUTAdBgNVHQ4EFgQUPcgBEVXjF5vYfDsInoE3d= F6UfQswHwYDVR0jBBgw\n" + "FoAUPcgBEVXjF5vYfDsInoE3dF6UfQswDwYDVR0TAQH/B= AUwAwEB/zAKBggqhkjO\n" + "PQQDAgNnADBkAjBLPAGrQAyinigqiu0RomoV8TVaknVLF= Sq6H6A8jgvzfsFCUK1O\n" + "dvNZhFPM6idKB+oCME2JLOBANCSV8o7aJzq7SYHKwPyb1= J4JFlwKe/0Jpv7oh9b1\n" + "IJbuaM9Z/VSKbrIXGg=3D=3D\n" + "-----END CERTIFICATE-----\n"; + +static const char * +get_tmp_dir() +{ + const char *ret; +#ifdef _WIN32 + ret =3D win_get_tempdir(); +#else + ret =3D "/tmp"; +#endif + assert_non_null(ret); + return ret; +} + +static void +crypto_pem_encode_certificate(void **state) +{ + struct gc_arena gc =3D gc_new(); + + struct tls_root_ctx ctx =3D { 0 }; + tls_ctx_client_new(&ctx); + tls_ctx_load_cert_file(&ctx, unittest_cert, true); + + openvpn_x509_cert_t *cert =3D NULL; + + /* we do not have methods to fetch certificates from ssl contexts, use + * internal TLS library methods for the unit test */ +#ifdef ENABLE_CRYPTO_OPENSSL + cert =3D SSL_CTX_get0_certificate(ctx.ctx); +#elif defined(ENABLE_CRYPTO_MBEDTLS) + cert =3D ctx.crt_chain; +#endif + + const char *tmpfile =3D platform_create_temp_file(get_tmp_dir(), "ut_p= em", &gc); + backend_x509_write_pem(cert, tmpfile); + + struct buffer exported_pem =3D buffer_read_from_file(tmpfile, &gc); + assert_string_equal(BSTR(&exported_pem), unittest_cert); + + unlink(tmpfile); + gc_free(&gc); +} + +int +main(void) +{ + const struct CMUnitTest tests[] =3D { + cmocka_unit_test(crypto_pem_encode_certificate) + }; + +#if defined(ENABLE_CRYPTO_OPENSSL) + OpenSSL_add_all_algorithms(); +#endif + + int ret =3D cmocka_run_group_tests_name("crypto tests", tests, NULL, N= ULL); + +#if defined(ENABLE_CRYPTO_OPENSSL) + EVP_cleanup(); +#endif + + return ret; +} -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/471?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: Ie248d35d063bb6878f3dd42840c77ba0d6fa3381 Gerrit-Change-Number: 471 Gerrit-PatchSet: 2 Gerrit-Owner: plaisthos Gerrit-Reviewer: flichtenheld Gerrit-CC: openvpn-devel Gerrit-Attention: flichtenheld Gerrit-MessageType: newpatchset --DXamz7LDvOc= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: flichtenheld.

plaisthos uploaded patch set #2 to this change.

<= a href=3D"http://gerrit.openvpn.net/c/openvpn/+/471?usp=3Demail">View Chang= e

The following approvals got outdated and were removed: Code-Review-1 by flichtenheld

Add test_ssl unit test and test export of PEM=
 to file

This introduces a number of mock function to be able to com= pile
ssl_verify_*.c and ssl_mbedtls.c/ssl_openssl.c into a unit and adds=
quite a number of files to that unit. But it allows similar unit tests<= br>(in term of dependencies) to be added in the future.

Change-Id: I= e248d35d063bb6878f3dd42840c77ba0d6fa3381
Signed-off-by: Arne Schwabe <= ;arne@...1227...>
---
M .github/workflows/build.yaml
M CMakeLis= ts.txt
M tests/unit_tests/openvpn/Makefile.am
A tests/unit_tests/open= vpn/mock_management.c
A tests/unit_tests/openvpn/mock_ssl_dependencies.c=
A tests/unit_tests/openvpn/test_ssl.c
6 files changed, 315 insertion= s(+), 2 deletions(-)

git pull ssh://gerrit.openvpn.net:29418/open=
vpn refs/changes/71/471/2
diff --git a/.github/workflows/build.yaml=
 b/.github/workflows/build.yaml
index 4393f5c..bdb30c8 1006= 44
--- a/.github/workflows/build.yaml
+++ b= /.github/workflows/build.yaml
@@ -85,7 +85,7 @@
<= span> fail-fast: false
matrix:
arch: [x86, x64]
- test: [argv, auth_token, buffer, cryptoapi, crypto, misc, ncp,= packet_id, pkt, provider, tls_crypt]
+ test: [argv, auth_token, buffer, cryptoapi, crypt= o, misc, ncp, packet_id, pkt, provider, ssl, tls_crypt]

runs-on: windows-latest
name: &quo= t;mingw unittest ${{ matrix.test }} - ${{ matrix.arch }} - OSSL"

diff --git a/CMakeLists.txt b/CMakeLists.txt
ind= ex 8c24cca..746e538 100644
--- a/CMakeLists.txt
<= span>+++ b/CMakeLists.txt
@@ -562,6 +562,7 @@
"test_packet_id"
"test_= pkt"
"test_provider"
+ "test_ssl"
)

if (WIN32)

@@ -671,6 +672,34 @@
src/openvpn/mss.= c
)

+ target_sources(test_ssl PRIVATE
+ tests/unit_tests/ope= nvpn/mock_management.c
+ src/openvpn/argv.c<= /span>
+ src/open= vpn/base64.c
+ = src/openvpn/block_dns.c
+ src/openvpn/crypto.c
+ src/openvpn/crypto_mbedtls.c
+ src/openvpn/crypto_o= penssl.c

+ = src/openvpn/cryptoapi.c
+ src/openvpn/env_set.c
+ src/openvpn/env_set.c
+ src/openvpn/mss.c
<= span style=3D"color: hsl(120, 100%, 40%);">+ src/openvpn/mtu.c
+ src/openv= pn/options_util.c
+ = src/openvpn/otime.c
+ src/openvpn/packet_id.c
+ src/openvpn/run_command.c
<= span style=3D"color: hsl(120, 100%, 40%);">+ src/openvpn/ssl_mbe= dtls.c
+ s= rc/openvpn/ssl_openssl.c
+ src/openvpn/ssl_util.c
+ src/openvpn/ssl_verify_mbedtls.c
= + src/openvpn/ssl_ve= rify_openssl.c
+ = src/openvpn/win32.c
+ src/openvpn/xkey_helper.c
+ src/openvpn/xkey_provider.c
= + )
+
target_sources(test_mi= sc PRIVATE
tests/unit_tests/openvpn/mock_get_rando= m.c
src/openvpn/options_util.c
dif= f --git a/tests/unit_tests/openvpn/Makefile.am b/tests/unit_tests/openvpn/M= akefile.am
index ef45b11..5d3eb70 100644
--= - a/tests/unit_tests/openvpn/Makefile.am
+++ b/tests/unit_t= ests/openvpn/Makefile.am
@@ -7,7 +7,8 @@
e= ndif

test_binaries +=3D crypto_testdrive= r packet_id_testdriver auth_token_testdriver ncp_testdriver misc_testdriver= \
- pkt_testdriver
+ pkt_testdriver ssl_tes= tdriver
+
<= span> if HAVE_LD_WRAP_SUPPORT

if !WIN32
t= est_binaries +=3D tls_crypt_testdriver
@@ -67,6 +68,29 @@
$(top_srcdir)/src/openvpn/win32-util.c \
= $(top_srcdir)/src/openvpn/mss.c

+ssl_testdriver_CFLAGS =3D @TEST_CFLAGS@ \
+ -I$(top_srcdir)/incl= ude -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/openvpn
+ssl_testdriver_LDFLAGS =3D @TEST_LDF= LAGS@
+ssl_testdriver= _SOURCES =3D test_crypto.c mock_msg.c mock_msg.h \
+ mock_management.c mock_ssl_dependencies.= c \
+ $(top_srcdir)/s= rc/openvpn/buffer.c \
+ $(top_srcdir)/src/openvpn/crypto.c \
+ $(top_srcdir)/src/openvpn/crypto_mbedtls.c \+ $(top_srcdir)/src/openvpn/cr= ypto_openssl.c \
+ $(= top_srcdir)/src/openvpn/otime.c \
+ $(top_srcdir)/src/openvpn/packet_id.c \
+ $(top_srcdir)/src/openvpn/platform.c \<= /span>
+ $(top_srcdir)/src/o= penvpn/mtu.c \
+ $(to= p_srcdir)/src/openvpn/win32-util.c \
+ $(top_srcdir)/src/openvpn/mss.c \
+ $(top_srcdir)/src/openvpn/xkey_provid= er.c \
+ $(top_src= dir)/src/openvpn/xkey_helper.c \
+ $(top_srcdir)/src/openvpn/ssl_util.c \
+ $(top_srcdir)/src/openvpn/base64.c = \
+ $(top_srcdir)/= src/openvpn/cryptoapi.c \
+ $(top_srcdir)/src/openvpn/win32.c
+
+
packet_id_testdriver_CFLAGS =3D @TEST_CFLAGS@ \
-I$(top_srcdir)/include -I$(top_srcdir)/src/compat -I$(top_s= rcdir)/src/openvpn
packet_id_testdriver_LDFLAGS =3D @TEST_= LDFLAGS@
diff --git a/tests/unit_tests/openvpn/mock_managem= ent.c b/tests/unit_tests/openvpn/mock_management.c
new file= mode 100644
index 0000000..ab2945f
--- /de= v/null
+++ b/tests/unit_tests/openvpn/mock_management.c
@@ -0,0 +1,54 @@
+/*
+ * Ope= nVPN -- An application to securely tunnel IP networks
+ * over a single UDP port, wi= th support for SSL/TLS-based
+ * session authentication and key exchange,
= + * packet encrypti= on, packet authentication, and
+ * packet compression.
+ *
+ * Copyright (C) 2002-2023 OpenVPN Inc <sales@...515...>

+ *
+ * This program is free software; you = can redistribute it and/or modify
+ * it under the terms of the GNU General Public License vers= ion 2
+ * as publish= ed by the Free Software Foundation.
+ *
+ = * This program is distributed in the hope that it will be useful,+ * but WITHOUT ANY WARRANTY= ; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.= See the
+ * GNU Ge= neral Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License alo= ng
+ * with this pro= gram; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor,= Boston, MA 02110-1301 USA.
+ */
+<= br>+/* Minimal set of mocked ma= nagement function/globals to get unit tests to
+ * compile */
+
+#ifdef HAVE_CONFIG_H
+#endif
+=
+#include "sysh= ead.h"
+<= br>+#include "manage.h&quo= t;
+
+#ifdef ENABLE_MANAGEMENT
<= span style=3D"color: hsl(120, 100%, 40%);">+
+struct management *management; /* GLOBAL */=
+
+void
+management_auth_failure(struct management *man, const char *= type, const char *reason)
+{
+ ASSERT(f= alse);
+}
<= span style=3D"color: hsl(120, 100%, 40%);">+
+char *
+management_query_pk_sig(struct management *man, const char *b64= _data,
+ = const char *algorithm)
+{
+ = (void) man;
+ (voi= d) b64_data;
+ (vo= id) algorithm;
+ r= eturn NULL;
+}=
+#endif
dif= f --git a/tests/unit_tests/openvpn/mock_ssl_dependencies.c b/tests/unit_tes= ts/openvpn/mock_ssl_dependencies.c
new file mode 100644
index 0000000..9231d65
--- /dev/null+++ b/tests/unit_tests/openvpn/mock_ssl_dependencies.c
@@ -0,0 +1,67 @@

+= /*
+ * OpenVPN -- An= application to securely tunnel IP networks
+ * over a single UDP port, with support= for SSL/TLS-based
+ = * session authentication and key exchange,
+ * packet encryption, packet= authentication, and
= + * packet compression.
+ *
+ = * Copyright (C) 2002-2023 OpenVPN Inc <sales@...515...>
+ *
+ * This program is free software; you can redist= ribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the = Free Software Foundation.
+ *
+ * This pr= ogram is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without = even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the<= /span>
+ * GNU General Publ= ic License for more details.
+ *
+ * You = should have received a copy of the GNU General Public License along<= br>+ * with this program; if n= ot, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, M= A 02110-1301 USA.
+ *= /
+
+/* Minimal set of mocked function/glo= bals to get unit tests to
+ * compile that use the ssl_* files */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "= syshead.h"
+
+#include <setjmp.h&g= t;
+#include <cmoc= ka.h>
+
= +
+#include "ssl.h"
+#include "ssl_verify.h"<= br>+
+int
+parse_line(const char *line, char **p, const int n, const char= *file,
+ c= onst int line_num, int msglevel, struct gc_arena *gc)
+{
+ /* Dummy function to get the linker happy, should never= be called */
+ as= sert_true(false);
+ = return 0;
+}=
+
+
+int
+pem_p= assword_callback(char *buf, int size, int rwflag, void *u)
+{
+ return 0;
+}
+

+void
+cert_hash_remember(struct tls_session= *session, const int cert_depth,
+ const struct buffer *cert_hash)
<= span style=3D"color: hsl(120, 100%, 40%);">+{
+ assert_false(true);
+}
+
+result_= t
+verify_cert(struct= tls_session *session, openvpn_x509_cert_t *cert, int cert_depth)+{
+ return FAILURE;
+}
diff --git a/tests/unit_tests= /openvpn/test_ssl.c b/tests/unit_tests/openvpn/test_ssl.c
n= ew file mode 100644
index 0000000..acaaad5
= --- /dev/null
+++ b/tests/unit_tests/openvpn/test_ssl.c
@@ -0,0 +1,139 @@
+/*
+ * Op= enVPN -- An application to securely tunnel IP networks
+ * over a single UDP port, w= ith support for SSL/TLS-based
+ * session authentication and key exchange,+ * packet encrypt= ion, packet authentication, and
+ * packet compression.
+ *
+ * Copyright (C) 2023 OpenVPN Inc <sales@...515...><= br>+ *
+ * This program is free software; you can r= edistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2=
+ * as published by= the Free Software Foundation.
+ *
+ * Th= is program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; wit= hout even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See= the
+ * GNU General= Public License for more details.
+ *
+ * = You should have received a copy of the GNU General Public License along
+ * with this program;= if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Bost= on, MA 02110-1301 USA.
+
+#ifdef HAVE_CONFIG_H

<= span style=3D"color: hsl(120, 100%, 40%);">+#include "config.h"
+#endif
+
+#include "syshead.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <setjmp.h>+#include <cmocka.h>
+
+#include "crypto.h"
<= span style=3D"color: hsl(120, 100%, 40%);">+#include "options.h"<= /span>
+#include "ssl_b= ackend.h"
+#incl= ude "options_util.h"
+
+#include= "mock_msg.h"
+#include "mss.h"
+#include "ssl_verify_backend.h"
+#include "win32.h"
+

+/* Mock function to be allowed to include win32.c w= hich is required for
= + * getting the temp directory */
+#ifdef _WIN32
+struct signal_info siginfo_static; /* GLOBAL */
+
+const char *
+strerror_win32(DWORD errnum, struct gc_arena *gc)
+{
+ ASSERT(false);
+}
+void
<= span style=3D"color: hsl(120, 100%, 40%);">+throw_signal(const int signum)<= /span>
+{
+ ASSERT(false);
+}
+#endif
+
+
+const char *unittest_cert =3D &qu= ot;-----BEGIN CERTIFICATE-----\n"
+ "MIIBuTCCAUCgAwIBAgIUTL= tjSBzx53qZRvZ6Ur7D9kgoOHkwCgYIKoZIzj0EAwIw\n"
+ "EzERMA8GA1= UEAwwIdW5pdHRlc3QwIBcNMjMxMTIxMDk1NDQ3WhgPMjA3ODA4MjQw\n"
+ &quo= t;OTU0NDdaMBMxETAPBgNVBAMMCHVuaXR0ZXN0MHYwEAYHKoZIzj0CAQYFK4EEACID\n"<= /span>
+ = "YgAEHYB2hn2xx3f4lClXDtdi36P19pMZA+kI1Dkv/Vn10vBZ/j9oa+P99T8du= z/e\n"
+ = "QlPeHpesNJO4fX8iEDj6+vMeWejOT7jAQ4MmG5EZjpcBKxCfw= FooEvzu8bVujUcu\n"
+ "wTQEo1MwUTAdBgNVHQ4EFgQUPcgBEVXjF5vYf= DsInoE3dF6UfQswHwYDVR0jBBgw\n"
+ "FoAUPcgBEVXjF5vYfDsInoE3d= F6UfQswDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjO\n"
+ "PQQDAgNnADBkA= jBLPAGrQAyinigqiu0RomoV8TVaknVLFSq6H6A8jgvzfsFCUK1O\n"
+ "d= vNZhFPM6idKB+oCME2JLOBANCSV8o7aJzq7SYHKwPyb1J4JFlwKe/0Jpv7oh9b1\n"

+ = "IJbuaM9Z/VSKbrIXGg=3D=3D\n"
+ "-----END CERTIFIC= ATE-----\n";
+
+static const char *
+get_tmp_dir()<= br>+{
+ const char *ret;
+#ifdef _WIN32
+ ret =3D win_get_tempdir();
+#else
+ ret =3D "/tmp";
+#endif
+ assert_non_null(ret);
+ return ret;
+}
+
+static void
+crypto_pem_encode_cert= ificate(void **state)
+{
+ struct gc_ar= ena gc =3D gc_new();
= +
+ struct tls_roo= t_ctx ctx =3D { 0 };
= + tls_ctx_client_new(&ctx);
+ tls_ctx_load_cert_file(&ctx, unittest_cert, true);
+
+ openvpn_x509_cert_t *cert =3D NULL;<= /span>
+
+ /* we do not have methods to fetch = certificates from ssl contexts, use
+ * internal TLS library methods for the unit test */
+#ifdef ENABLE_CRYPTO_O= PENSSL
+ cert =3D = SSL_CTX_get0_certificate(ctx.ctx);
+#elif defined(ENABLE_CRYPTO_MBEDTLS)
+ cert =3D ctx.crt_chain;
+#endif

+
+ const char *tmpfile =3D platform_create_temp_file(get_tmp_dir= (), "ut_pem", &gc);
+ backend_x509_write_pem(cert, tmpfile);
+
+ struct buffer exported_pem =3D buffer_read_from_file(= tmpfile, &gc);
+ = assert_string_equal(BSTR(&exported_pem), unittest_cert);
<= span style=3D"color: hsl(120, 100%, 40%);">+

+ unlink(tmpfile);
+ gc_free(&gc);
+}
+
+int

+main(void)
+{
+ const struct CMUnitTest tests[] =3D {
= + cmocka_unit_test(crypt= o_pem_encode_certificate)
+ };
+=
+#if defined(ENABLE_CRYPTO_= OPENSSL)
+ OpenSSL= _add_all_algorithms();
++ int ret =3D cmocka_run_gr= oup_tests_name("crypto tests", tests, NULL, NULL);
+
+#if defined(ENABLE_CRYPTO_OPENSSL)
+ EVP_cleanup();
+#endif
+
+ return ret;
+= }

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

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ie248d35d063bb6878f3dd42840c= 77ba0d6fa3381
Gerrit-Change-Number: 471
Gerrit-PatchSet: 2
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
--DXamz7LDvOc=--