From patchwork Fri Feb 9 15:51:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juliusz Sosinowicz X-Patchwork-Id: 3611 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:e8a8:b0:554:adf7:68e6 with SMTP id oz40csp970236mab; Fri, 9 Feb 2024 08:22:44 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVsAbfy+e+o9ahMD/gwAYOYznvvwExPvcDdqVCIeCQxJ+8fHvAaSzihY2K19VhFoyQD8qNr1//IbCK0ILOQJc6UNc+I3TA= X-Google-Smtp-Source: AGHT+IGxCpoXBBOGj044+fl2Ib5UlZFrMz5kcw6sRtTVsjakJ5mruaoQAyS1xWIypEeDXLu0Py/l X-Received: by 2002:a05:6a20:1602:b0:19e:4007:46a7 with SMTP id l2-20020a056a20160200b0019e400746a7mr2381259pzj.1.1707495764447; Fri, 09 Feb 2024 08:22:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1707495764; cv=none; d=google.com; s=arc-20160816; b=FrFNp17sDuyvt0slHF8H0KkBpf+SjitRk/C5XIHiVUTG8z4nYT2Xlnr3OmWSY7nDzs Pq+p+uw4hFISfX7XyxX3D94alxBs6cb3R8INbxG607KcbxDDass3HWIxuoP0wepoJqOD QUfKTqQ+U+FsD5aUzF39kVV6aBeS939qp2Ro6EUNFpD97n5fiPsZnWpEVaCLh82pTGLR F50dFBKOzYf+33La+XJzQsoPkA2LRtpnpjM2415HcH8q2BJ5W4JpKwIYJBYGqE6lNT7q 7mtywnHR7CtIwxH74ImvpQa8RA7otLLV0U3lXP28V19wVORbzD+ZJ5ivyrDlCXNR9AZ5 4hsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:date:to:from:dkim-signature:dkim-signature :dkim-signature; bh=nOeCrn1imY578dVrUBW8mHX8JFdst1MBlaOWzZOWel0=; fh=TIWXQs+NsyCl1HkGePaNVmh6wknuGyeags6HX89uqJk=; b=czgFE7zMWfF/hiNiD5lf5dPq9Yk9flj/edlRpNUWZ9qViUMqJa7/vjklyVv0RlGxYo zfTb6hV84BV3H9pYFq1ud5gVafJKHCJwqHe06K+khI0bVqwcbfM66Y6pxUD3nzyncnAF UCFMgGBr9ocWsWbQ10APFMu4MVULBV9xnVEyCpQVR76owO24Fz2bExenbcYgwE0C9w78 XRnLEQBD/OMkaRGldUSPz546jVVaZQC+YCxi/cZRQ9pEtvBNDaJavpbn8SBK0w8AKKpj Dj30hh7GRuA0sSdPxphj8/Sno0MmNittE3GYkScLmi5fhTQpexDTWSv9KmleaF51H5AE PdnQ==; darn=openvpn.net ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=SkYVKpjK; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=FGTChi1R; dkim=neutral (body hash did not verify) header.i=@wolfssl-com.20230601.gappssmtp.com header.s=20230601 header.b=CRTJYhbc; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=wolfssl.com X-Forwarded-Encrypted: i=1; AJvYcCX48ROx6Wk4lg4vdMD30ipoj3+qt1dXTH1c9Db0lQA65s6MFE1Zrci5zH5R4472BLiBVUD1jAAThOBnAMjXM2q1zUW3A98BY1zVPl1NA2PTRFCbPhTV0FY3y0WEcaALLpuCKJZGhuB2sO4H8VW02iSsgdlh6Co= Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id h3-20020a17090aea8300b00290260542c3si1778615pjz.184.2024.02.09.08.22.44 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Feb 2024 08:22:44 -0800 (PST) Received-SPF: pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) client-ip=216.105.38.7; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=SkYVKpjK; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=FGTChi1R; dkim=neutral (body hash did not verify) header.i=@wolfssl-com.20230601.gappssmtp.com header.s=20230601 header.b=CRTJYhbc; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=wolfssl.com Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1rYTdm-0002pR-A6; Fri, 09 Feb 2024 16:22:14 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1rYTdk-0002pE-Rf for openvpn-devel@lists.sourceforge.net; Fri, 09 Feb 2024 16:22:13 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=ItWBg9t3X0rgNuemlYjAyK0gIMu/bp8T03tbm+ZkqQ0=; b=SkYVKpjKOb5cWIklo3au3mNF3P 1x6zkaMYRzjyUiO95FBOl3ksLtLvz1KQKCoyE8bnVHB53mJJnXDEtzX/uR6qdbSmxXFjo3+hy1cny 4x+97VSEGjY5/nn9uS6TL9dbNRD8ea4wWCfWbh5/1Zew/csStNRh2qp1k8Nm4KKJdcsg=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:Cc:To:From :Sender:Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=ItWBg9t3X0rgNuemlYjAyK0gIMu/bp8T03tbm+ZkqQ0=; b=F GTChi1RPQ8aUu4OibJeVYok2yb6QpVF3o7bRC3XF1datu2woR5Zg0Z5uhP//yTYMFwdZasuVel9J+ iLz4jRYlQ62WVuiPjx0McWnNBY5FmFd1AcG20pkJkujKE9/JT8tUVoWVY61VzLb/pBfMzLC0ejY4K B77a+leJOXVKhx1E=; Received: from mail-ed1-f53.google.com ([209.85.208.53]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1rYTdf-0001ql-F5 for openvpn-devel@lists.sourceforge.net; Fri, 09 Feb 2024 16:22:13 +0000 Received: by mail-ed1-f53.google.com with SMTP id 4fb4d7f45d1cf-55fe4534e9bso1566957a12.0 for ; Fri, 09 Feb 2024 08:22:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wolfssl-com.20230601.gappssmtp.com; s=20230601; t=1707495721; x=1708100521; darn=lists.sourceforge.net; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=ItWBg9t3X0rgNuemlYjAyK0gIMu/bp8T03tbm+ZkqQ0=; b=CRTJYhbcHX7DOTfT8TQ/eYL0WDxjoVJaH7ZrpmeIyhSix5EGEI9PuZXKhECU4Fvlub c7F3wKp5yH4H/fF9aPpfIhOt9TKHlqTzjrOgFSjbZ4VoirZAJCVntaroOfkovPOPQS7R SWzr9G44bNPyT587G0K7+Otc8n4/3IEtfjFppo7VyhCoVSuwPJ+h57dCMS6tFLCRaxie pJXWFbghJNlCmF7wYW4wNgktPiWC0C00SzXZF7A77yUcWpZZLqtTQs/lVwtyZekk/d2Z zN6RsmxmQiSlmDYxqQFETTAv4BjHwy74UB8VnmV4luYOI+ur7ITz0gARNuAl/ldcen+t o7lQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707495721; x=1708100521; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ItWBg9t3X0rgNuemlYjAyK0gIMu/bp8T03tbm+ZkqQ0=; b=spYwFV+k9amY/ybr3goVBM8RIq9kGR5m2TfnSQhwjHwj0BhewOTUBPW29cexwFzh0q fNCISXf9ORffRPulLAK3YsUMSDwXanXeCn0150eMyyPFPEtDplzlMiQ7ZXIreWvPpXK6 rzludOYQGZDwrf51esHGXZsnGVSHQA59cycxnVpd2YOVaVkHO2e1l2SErIgmMtF1oekJ 0zaUNUN7XZRxN36P7QyesGs/TqW9q7aDAhwwgGm05uCUniLAHE/NgT9nXk2n5E+iP/+R g+GPN4JzBN84GtcRuQsrMHZoBYKm3BqcQZLo1nfR3cuB+XFOm0LRHVtsjsvF8O52EJTo bSkw== X-Gm-Message-State: AOJu0Ywd3TXNhsXw2Ng6T4hXhA4gCSHT8sa/SjCa2S+S78Z/podDvVCa Hv2Uxy+fsYPJW/tHpVw/P8Jkc6azC5WQ0vY80JpyFcKp3aeJidqPrJdyuFXJB1h7u0YZymDhlTv JcvuG+g== X-Received: by 2002:a05:6512:3b14:b0:511:483b:91cd with SMTP id f20-20020a0565123b1400b00511483b91cdmr1734922lfv.67.1707493875989; Fri, 09 Feb 2024 07:51:15 -0800 (PST) Received: from localhost.localdomain ([85.203.44.158]) by smtp.gmail.com with ESMTPSA id f8-20020a19ae08000000b0051162f2fdbcsm334056lfc.127.2024.02.09.07.51.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Feb 2024 07:51:15 -0800 (PST) From: Juliusz Sosinowicz To: openvpn-devel@lists.sourceforge.net Date: Fri, 9 Feb 2024 16:51:09 +0100 Message-Id: <20240209155109.110542-1-juliusz@wolfssl.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Spam-Report: Spam detection software, running on the system "util-spamd-1.v13.lw.sourceforge.com", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Including "ssl.h" conflicts with the wolfSSL ssl.h header file. The include/wolfssl directory is included before openvpn/src. include/wolfssl needs to be included so that openvpn can pick up wolfSSL c [...] Content analysis details: (-0.0 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.208.53 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.208.53 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Headers-End: 1rYTdf-0001ql-F5 Subject: [Openvpn-devel] [PATCH] wolfssl: include "ssl.h" by "src/openvpn/ssl.h" X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1790439078466071089?= X-GMAIL-MSGID: =?utf-8?q?1790439078466071089?= Including "ssl.h" conflicts with the wolfSSL ssl.h header file. The include/wolfssl directory is included before openvpn/src. include/wolfssl needs to be included so that openvpn can pick up wolfSSL compatibility headers instead of OpenSSL headers without changing the paths. Signed-off-by: Juliusz Sosinowicz --- src/openvpn/auth_token.c | 2 +- src/openvpn/dco_linux.c | 2 +- src/openvpn/manage.c | 2 +- src/openvpn/openvpn.h | 2 +- src/openvpn/options.c | 2 +- src/openvpn/ps.h | 2 +- src/openvpn/push.c | 2 +- src/openvpn/ssl.c | 2 +- src/openvpn/tls_crypt.c | 2 +- tests/unit_tests/openvpn/mock_ssl_dependencies.c | 2 +- tests/unit_tests/openvpn/test_pkcs11.c | 2 +- tests/unit_tests/openvpn/test_ssl.c | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/openvpn/auth_token.c b/src/openvpn/auth_token.c index 6787ea7d..e020bdcb 100644 --- a/src/openvpn/auth_token.c +++ b/src/openvpn/auth_token.c @@ -12,7 +12,7 @@ #include "auth_token.h" #include "push.h" #include "integer.h" -#include "ssl.h" +#include "src/openvpn/ssl.h" #include "ssl_verify.h" #include diff --git a/src/openvpn/dco_linux.c b/src/openvpn/dco_linux.c index 3c91606b..eac81924 100644 --- a/src/openvpn/dco_linux.c +++ b/src/openvpn/dco_linux.c @@ -37,7 +37,7 @@ #include "socket.h" #include "tun.h" -#include "ssl.h" +#include "src/openvpn/ssl.h" #include "fdmisc.h" #include "multi.h" #include "ssl_verify.h" diff --git a/src/openvpn/manage.c b/src/openvpn/manage.c index 27b6f90e..11c922c5 100644 --- a/src/openvpn/manage.c +++ b/src/openvpn/manage.c @@ -37,7 +37,7 @@ #include "otime.h" #include "integer.h" #include "misc.h" -#include "ssl.h" +#include "src/openvpn/ssl.h" #include "common.h" #include "manage.h" #include "openvpn.h" diff --git a/src/openvpn/openvpn.h b/src/openvpn/openvpn.h index dabc5be4..3a3d1733 100644 --- a/src/openvpn/openvpn.h +++ b/src/openvpn/openvpn.h @@ -28,7 +28,7 @@ #include "options.h" #include "socket.h" #include "crypto.h" -#include "ssl.h" +#include "src/openvpn/ssl.h" #include "packet_id.h" #include "comp.h" #include "tun.h" diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 2c79a1ec..cb06063e 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -42,7 +42,7 @@ #include "run_command.h" #include "shaper.h" #include "crypto.h" -#include "ssl.h" +#include "src/openvpn/ssl.h" #include "ssl_ncp.h" #include "options.h" #include "misc.h" diff --git a/src/openvpn/ps.h b/src/openvpn/ps.h index 2fe0c4c5..21427480 100644 --- a/src/openvpn/ps.h +++ b/src/openvpn/ps.h @@ -28,7 +28,7 @@ #include "basic.h" #include "buffer.h" -#include "ssl.h" +#include "src/openvpn/ssl.h" typedef void (*post_fork_cleanup_func_t)(void *arg); diff --git a/src/openvpn/push.c b/src/openvpn/push.c index 22494340..854bf471 100644 --- a/src/openvpn/push.c +++ b/src/openvpn/push.c @@ -29,7 +29,7 @@ #include "push.h" #include "options.h" -#include "ssl.h" +#include "src/openvpn/ssl.h" #include "ssl_verify.h" #include "ssl_ncp.h" #include "manage.h" diff --git a/src/openvpn/ssl.c b/src/openvpn/ssl.c index 33c86704..ac077a1c 100644 --- a/src/openvpn/ssl.c +++ b/src/openvpn/ssl.c @@ -54,7 +54,7 @@ #include "route.h" #include "tls_crypt.h" -#include "ssl.h" +#include "src/openvpn/ssl.h" #include "ssl_verify.h" #include "ssl_backend.h" #include "ssl_ncp.h" diff --git a/src/openvpn/tls_crypt.c b/src/openvpn/tls_crypt.c index 975d31fa..3df2bc61 100644 --- a/src/openvpn/tls_crypt.c +++ b/src/openvpn/tls_crypt.c @@ -33,7 +33,7 @@ #include "platform.h" #include "run_command.h" #include "session_id.h" -#include "ssl.h" +#include "src/openvpn/ssl.h" #include "tls_crypt.h" diff --git a/tests/unit_tests/openvpn/mock_ssl_dependencies.c b/tests/unit_tests/openvpn/mock_ssl_dependencies.c index 9231d655..da22bbfe 100644 --- a/tests/unit_tests/openvpn/mock_ssl_dependencies.c +++ b/tests/unit_tests/openvpn/mock_ssl_dependencies.c @@ -34,7 +34,7 @@ #include -#include "ssl.h" +#include "src/openvpn/ssl.h" #include "ssl_verify.h" int diff --git a/tests/unit_tests/openvpn/test_pkcs11.c b/tests/unit_tests/openvpn/test_pkcs11.c index 81cdf882..76cb80e5 100644 --- a/tests/unit_tests/openvpn/test_pkcs11.c +++ b/tests/unit_tests/openvpn/test_pkcs11.c @@ -33,7 +33,7 @@ #include "xkey_common.h" #include "cert_data.h" #include "pkcs11.h" -#include "ssl.h" +#include "src/openvpn/ssl.h" #include #include diff --git a/tests/unit_tests/openvpn/test_ssl.c b/tests/unit_tests/openvpn/test_ssl.c index 8c1fb5b2..893bf8ec 100644 --- a/tests/unit_tests/openvpn/test_ssl.c +++ b/tests/unit_tests/openvpn/test_ssl.c @@ -44,7 +44,7 @@ #include "ssl_verify_backend.h" #include "win32.h" #include "test_common.h" -#include "ssl.h" +#include "src/openvpn/ssl.h" #include "buffer.h" #include "packet_id.h"