From: "cron2 (Code Review)" Date: Tue, 16 Jan 2024 22:06:46 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <29469c7f51db174a3ee638a364ca86120ebc79b1-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="bk+ToWlUj0A="; 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: plaisthos Cc: flichtenheld , openvpn-devel --bk+ToWlUj0A= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/47= 1?usp=3Demail ) 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 Acked-by: Gert Doering Message-Id: <20240116214152.27316-1-gert@...1296...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg28= 028.html Signed-off-by: Gert Doering --- 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, 322 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 51100c3..cc98813 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 6f370c3..6a1895a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -595,6 +595,7 @@ "test_packet_id" "test_pkt" "test_provider" + "test_ssl" ) if (WIN32) @@ -699,6 +700,32 @@ src/openvpn/mss.c ) + target_sources(test_ssl PRIVATE + tests/unit_tests/openvpn/mock_management.c + tests/unit_tests/openvpn/mock_ssl_dependencies.c + tests/unit_tests/openvpn/mock_win32_execve.c + src/openvpn/argv.c + src/openvpn/base64.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/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/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 cecf4dc..f81a10f 100644 --- a/tests/unit_tests/openvpn/Makefile.am +++ b/tests/unit_tests/openvpn/Makefile.am @@ -9,7 +9,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 @@ -69,6 +70,40 @@ $(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@ $(OPTIONAL_CRYPTO_LIBS) +ssl_testdriver_SOURCES =3D test_ssl.c mock_msg.c mock_msg.h \ + mock_management.c mock_ssl_dependencies.c mock_win32_execve.c \ + $(top_srcdir)/src/openvpn/argv.c \ + $(top_srcdir)/src/openvpn/base64.c \ + $(top_srcdir)/src/openvpn/buffer.c \ + $(top_srcdir)/src/compat/compat-strsep.c \ + $(top_srcdir)/src/openvpn/crypto.c \ + $(top_srcdir)/src/openvpn/cryptoapi.c \ + $(top_srcdir)/src/openvpn/crypto_mbedtls.c \ + $(top_srcdir)/src/openvpn/crypto_openssl.c \ + $(top_srcdir)/src/openvpn/env_set.c \ + $(top_srcdir)/src/openvpn/mss.c \ + $(top_srcdir)/src/openvpn/mtu.c \ + $(top_srcdir)/src/openvpn/otime.c \ + $(top_srcdir)/src/openvpn/options_util.c \ + $(top_srcdir)/src/openvpn/packet_id.c \ + $(top_srcdir)/src/openvpn/platform.c \ + $(top_srcdir)/src/openvpn/run_command.c \ + $(top_srcdir)/src/openvpn/ssl_openssl.c \ + $(top_srcdir)/src/openvpn/ssl_mbedtls.c \ + $(top_srcdir)/src/openvpn/ssl_util.c \ + $(top_srcdir)/src/openvpn/ssl_verify_mbedtls.c \ + $(top_srcdir)/src/openvpn/ssl_verify_openssl.c \ + $(top_srcdir)/src/openvpn/xkey_helper.c \ + $(top_srcdir)/src/openvpn/xkey_provider.c \ + $(top_srcdir)/src/openvpn/win32-util.c + +if WIN32 +ssl_testdriver_LDADD =3D -lcrypt32 -lncrypt -lfwpuclnt -liphlpapi -lws2_32 +endif + 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..8936c3a --- /dev/null +++ b/tests/unit_tests/openvpn/mock_management.c @@ -0,0 +1,51 @@ +/* + * 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) +{ + 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..fd2049f --- /dev/null +++ b/tests/unit_tests/openvpn/test_ssl.c @@ -0,0 +1,140 @@ +/* + * 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); + + tls_ctx_free(&ctx); + 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: 10 Gerrit-Owner: plaisthos Gerrit-Reviewer: cron2 Gerrit-Reviewer: flichtenheld Gerrit-CC: openvpn-devel Gerrit-MessageType: merged --bk+ToWlUj0A= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 submitted this change.

View Change

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

This introduces a number of mock function to be able to comp= ile
ssl_verify_*.c and ssl_mbedtls.c/ssl_openssl.c into a unit and adds<= br>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: Ie= 248d35d063bb6878f3dd42840c77ba0d6fa3381
Signed-off-by: Arne Schwabe <= arne@...1227...>
Acked-by: Gert Doering <gert@...1296...>
Me= ssage-Id: <20240116214152.27316-1-gert@...1296...>
URL: https://ww= w.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg28028.html
Sig= ned-off-by: Gert Doering <gert@...1296...>
---
M .github/workfl= ows/build.yaml
M CMakeLists.txt
M tests/unit_tests/openvpn/Makefile.a= m
A tests/unit_tests/openvpn/mock_management.c
A tests/unit_tests/ope= nvpn/mock_ssl_dependencies.c
A tests/unit_tests/openvpn/test_ssl.c
6 = files changed, 322 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml=

index 51100c3..cc98813 100644
--- a/.githu= b/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, packet_id, pkt, provider, tls_= crypt]
+ test:= [argv, auth_token, buffer, cryptoapi, crypto, misc, ncp, packet_id, pkt, p= rovider, ssl, tls_crypt]

runs-on: wi= ndows-latest
name: "mingw unittest ${{ matrix.tes= t }} - ${{ matrix.arch }} - OSSL"
diff --git a/CMakeLi= sts.txt b/CMakeLists.txt
index 6f370c3..6a1895a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -595,6 +595,7 @@
"test_packet_i= d"
"test_pkt"
= "test_provider"
+ "test_ssl"
)
if (WIN32)
@@ -699,6 +700,32 = @@
src/openvpn/mss.c
)

+ = target_sources(test_ssl PRIVATE
+ tests/unit_tests/openvpn/mock_management.c+ tests/unit_tests= /openvpn/mock_ssl_dependencies.c
+ tests/unit_tests/openvpn/mock_win32_execve.c
+ src/openvpn/a= rgv.c
+ sr= c/openvpn/base64.c
+ = src/openvpn/crypto.c
+ src/openvpn/crypto_mbedtls.c
+ src/openvpn/crypto_openssl.c<= /span>
+ src/open= vpn/cryptoapi.c
+ = src/openvpn/env_set.c
+ src/openvpn/mss.c
+ src/openvpn/mtu.c
+ src/openvpn/options_util.c=
+ src/openvpn/ot= ime.c
+ sr= c/openvpn/packet_id.c
+ src/openvpn/run_command.c
+ src/openvpn/ssl_mbedtls.c
+ src/openvpn/ssl_openssl.c=
+ src/ope= nvpn/ssl_util.c
+ = src/openvpn/ssl_verify_mbedtls.c
+ src/openvpn/ssl_verify_openssl.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/ope= nvpn/options_util.c
diff --git a/tests/unit_tests/openvpn/M= akefile.am b/tests/unit_tests/openvpn/Makefile.am
index cec= f4dc..f81a10f 100644
--- a/tests/unit_tests/openvpn/Makefil= e.am
+++ b/tests/unit_tests/openvpn/Makefile.am
<= span>@@ -9,7 +9,8 @@

endif

test_binaries +=3D crypto_testdriver packet_id_testdriver auth_token_te= stdriver ncp_testdriver misc_testdriver \

- pkt_testdriver
+ pkt_testdriver ssl_testdriver
+
if HAVE_LD_WRAP_SUPPORT=
if !WIN32
test_binaries +=3D tls_crypt_testdriv= er
@@ -69,6 +70,40 @@
$(top_srcdir)/src/o= penvpn/win32-util.c \
$(top_srcdir)/src/openvpn/mss.c


+ssl_t= estdriver_CFLAGS =3D @TEST_CFLAGS@ \
+ -I$(top_srcdir)/include -I$(top_srcdir)/src/compat -I$(t= op_srcdir)/src/openvpn
+ssl_testdriver_SOURCES = =3D test_ssl.c mock_msg.c mock_msg.h \
+ mock_management.c mock_ssl_dependencies.c mock_win32_ex= ecve.c \
+ $(top_srcd= ir)/src/openvpn/argv.c \
+ $(top_srcdir)/src/openvpn/base64.c \
+ $(top_srcdir)/src/openvpn/buffer.c \
+ $(top_srcdir)/src/compat/compat-s= trsep.c \
+ $(top_src= dir)/src/openvpn/crypto.c \
+ $(top_srcdir)/src/openvpn/cryptoapi.c \
+ $(top_srcdir)/src/openvpn/crypto_mbedtls.c \<= /span>
+ $(top_srcdir)/src/o= penvpn/crypto_openssl.c \
+ $(top_srcdir)/src/openvpn/env_set.c \
+ $(top_srcdir)/src/openvpn/mss.c \
+ $(top_srcdir)/src/openvpn/mtu.c \<= /span>
+ $(top_srcdir)/src/o= penvpn/otime.c \
+ $(= top_srcdir)/src/openvpn/options_util.c \
+ $(top_srcdir)/src/openvpn/packet_id.c \
+ $(top_srcdir)/src/openvpn/platfo= rm.c \

+ $(top_srcdir= )/src/openvpn/run_command.c \
+ $(top_srcdir)/src/openvpn/ssl_openssl.c \
+ $(top_srcdir)/src/openvpn/ssl_mbedtls.c = \
+ $(top_srcdir)/src= /openvpn/ssl_util.c \
+ $(top_srcdir)/src/openvpn/ssl_verify_mbedtls.c \
+ $(top_srcdir)/src/openvpn/ssl_verify_ope= nssl.c \
+ $(top_srcd= ir)/src/openvpn/xkey_helper.c \
+ $(top_srcdir)/src/openvpn/xkey_provider.c \
+ $(top_srcdir)/src/openvpn/win32-util.= c
+
+if WIN32
+ssl_testdriver_LDADD =3D -lcrypt32 -lncrypt -lf= wpuclnt -liphlpapi -lws2_32
+endif
+
packet_id_testdriver_CFLAGS =3D @TEST_CFLAGS@ \
-I$(top_srcdir)/include -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/= openvpn

packet_id_testdriver_LDFLAGS =3D @TEST_LDFLAGS@
diff --git a/tests/unit_tests/openvpn/mock_management.c b/tes= ts/unit_tests/openvpn/mock_management.c
new file mode 10064= 4
index 0000000..8936c3a
--- /dev/null

+++ b/tests/unit_tests/openvpn/mock_management.c
@@ -0,0 +1,51 @@
+/= *
+ * 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 redistr= ibute it and/or modify
+ * as published by the F= ree Software Foundation.
+ *
+ * This pro= gram is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without e= ven the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Publi= c License for more details.
+ *
+ * You s= hould have received a copy of the GNU General Public License along+ * with this program; if no= t, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA= 02110-1301 USA.
+ */=
+
+/* Minimal set of mocked management fu= nction/globals to get unit tests to
+ * compile */
+
+#ifdef HA= VE_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, cons= t char *reason)
+{
+ ASSERT(false);

+}
+
+char *
+management_query_pk_sig(struct management *man, const char *b64_data,
+ = const char *algorithm)
+{
+ return NUL= L;
+}
+#endif

diff --git a= /tests/unit_tests/openvpn/mock_ssl_dependencies.c b/tests/unit_tests/openvp= n/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 applicat= ion to securely tunnel IP networks
+ * over a single UDP port, with support for SSL/= TLS-based
+ * = session authentication and key exchange,
+ * packet encryption, packet authenti= cation, and
+ * = packet compression.
+ *
+ * Copyri= ght (C) 2002-2023 OpenVPN Inc <sales@...515...>
+ *
+ * This program is free software; you can redistribute it= and/or modify
+ * i= t under the terms of the GNU General Public License version 2
+ * as published by the Free Soft= ware Foundation.
+ *<= /span>
+ * 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 Licens= e for more details.
+= *
+ * You should ha= ve 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-1= 301 USA.
+ */<= br>+
+/* Minimal set of mocked function/globals to g= et unit tests to
+ * = compile that use the ssl_* files */
+
+#if= def HAVE_CONFIG_H
+#i= nclude "config.h"
+#endif
+

+#include "syshead.h= "
+
+#include <setjmp.h>=
+#include <cmocka.h><= /span>
+
+
+#include "ssl.h"
+#include "ssl_verify.h"
+
+int
+ const int l= ine_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_ca= llback(char *buf, int size, int rwflag, void *u)
+{
+ return 0;
+}
+
+void

+cert_hash_remember(struct tls_session *session,= const int cert_depth,
+{
+ assert_false(true);
+}
+
+result_t+verify_cert(struct tls_sessi= on *session, openvpn_x509_cert_t *cert, int cert_depth)
+{
+ return FAILURE;
+}
diff --git a/tests/unit_tests/openvpn/t= est_ssl.c b/tests/unit_tests/openvpn/test_ssl.c
new file mo= de 100644
index 0000000..fd2049f
--- /dev/n= ull
+++ b/tests/unit_tests/openvpn/test_ssl.c
@@ -0,0 +1,140 @@
= +/*
+ * OpenVPN -- A= n application to securely tunnel IP networks
+ * over a single UDP port, with suppor= t for SSL/TLS-based
+= * session authentication and key exchange,
+ * packet encryption, packe= t authentication, and
+ * packet compression.
+ *
+= * Copyright (C) 2023 OpenVPN Inc <sales@...515...>
+ *
+ * This program is free software; you can redistribut= e 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 eve= n the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

+ * GNU General Public = License for more details.
+ *
+ * You sho= uld 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 0= 2110-1301 USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#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"
+#include "options.h"
= +#include "ssl_backend.h&q= uot;
+#include "= options_util.h"
= +
+#include "moc= k_msg.h"
+#inclu= de "mss.h"
= +#include "ssl_verify_backend.h"
+#include "win32.h"
+
+/* Mock function to be allowed to include win32.c which is r= equired for
+ * getti= ng the temp directory */
+#ifdef _WIN32
+s= truct 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"
+ "MIIBuTCCAUCgAwIBAgIUTLtjSBzx53= qZRvZ6Ur7D9kgoOHkwCgYIKoZIzj0EAwIw\n"
+ "EzERMA8GA1UEAwwIdW= 5pdHRlc3QwIBcNMjMxMTIxMDk1NDQ3WhgPMjA3ODA4MjQw\n"
+ "OTU0ND= daMBMxETAPBgNVBAMMCHVuaXR0ZXN0MHYwEAYHKoZIzj0CAQYFK4EEACID\n"+ = "YgAEHYB2hn2xx3f4lClXDtdi36P19pMZA+kI1Dkv/Vn10vBZ/j9oa+P99T8duz/e\n&qu= ot;
+ = "QlPeHpesNJO4fX8iEDj6+vMeWejOT7jAQ4MmG5EZjpcBKxCfwFooEvzu8= bVujUcu\n"
+ = "wTQEo1MwUTAdBgNVHQ4EFgQUPcgBEVXjF5vYfDsInoE3d= F6UfQswHwYDVR0jBBgw\n"
+ "FoAUPcgBEVXjF5vYfDsInoE3dF6UfQswD= wYDVR0TAQH/BAUwAwEB/zAKBggqhkjO\n"
+ "PQQDAgNnADBkAjBLPAGrQ= Ayinigqiu0RomoV8TVaknVLFSq6H6A8jgvzfsFCUK1O\n"
+ "dvNZhFP= M6idKB+oCME2JLOBANCSV8o7aJzq7SYHKwPyb1J4JFlwKe/0Jpv7oh9b1\n"+ &= quot;IJbuaM9Z/VSKbrIXGg=3D=3D\n"
+ "-----END CERTIFICATE---= --\n";
+<= br>+static const char *<= br>+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 c= tx =3D { 0 };
+ tl= s_ctx_client_new(&ctx);
+ tls_ctx_load_cert_file(&ctx, unittest_cert, true);+
+ openvpn_x509_cert_t *cert =3D NULL;<= br>+
+ /* we do not have methods to fetch certifi= cates from ssl contexts, use
+ * internal TLS library methods for the unit test */+#ifdef ENABLE_CRYPTO_OPENSSL<= /span>
+ 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(), &quo= t;ut_pem", &gc);
+ backend_x509_write_pem(cert, tmpfile);
+
+ struct buffer exported_pem =3D buffer_read_from_file(tmpfile,= &gc);
+ asser= t_string_equal(BSTR(&exported_pem), unittest_cert);
+
+ tls_ctx_free(&ctx);
+ 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: 10
Gerrit-Owner: plaisthos <arne-openvpn@...1711...= 27...>
Gerrit-Reviewer: cron2 <gert@...1296...>=
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-MessageType: merged
--bk+ToWlUj0A=--