From patchwork Fri Feb 9 15:47:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juliusz Sosinowicz X-Patchwork-Id: 3612 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:e8a8:b0:554:adf7:68e6 with SMTP id oz40csp982981mab; Fri, 9 Feb 2024 08:45:49 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWRuK58887KYZsR3p3CWxm9aHGcxCKOcBEM1UXvNaTLbRI/OzknJcwGQHo++xWK70vT3HqmOrn310ep143B7bdpgRuXxyw= X-Google-Smtp-Source: AGHT+IGiulFzIWTVFkBpBOvmiv0PkCBHG7iRzQVyPJxQ7CSpgU6iWGAckmtqYnai2hLl+/1uGkXu X-Received: by 2002:a17:902:fe0c:b0:1d9:f630:50d8 with SMTP id g12-20020a170902fe0c00b001d9f63050d8mr2106274plj.5.1707497149712; Fri, 09 Feb 2024 08:45:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1707497149; cv=none; d=google.com; s=arc-20160816; b=bWt6/ECjxZv/+RoSp1ezR11TklDTkOspW1ta9zTAm08z9rJvZPW0Njy6PTwIhzLz7m Ts2LXWR0rKQftHXPd0O69NT73s9Ku6m9Lay/ARRpuyGysaES8XXbZ0jwzLoixgb812Jp aYZCNImL6ioNG8668PfI281FwfePYAoP3Qmdg3O7cSs55yxOR3qyJVKNV8KniuXJmU2f QPB+YS1MSHXP3KWlTEm2bbVC6VBCMA341usj7mL4mm0kT7SdTac2ak9RiLq1/t3scojX lFJmGNicHprmLeHMxsss2NxB5Ys1kSCCJkt6cJZWQn3Hu2sQR/PEqNUz4RiD6LzTGRRu FS+w== 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=xGe+K4zXemoQtSwU/wg6QiXDLpePj7pW9jclqm9jv4I=; fh=jkuFBuB/sRaJeOquQRc+EsQ22eA0u9IcvKoCGz22dSw=; b=BzuEwJcAc4+Wt8DPfWw9519NZ3bql+zTzYhwzESpnBaf851S4cWvj/rk3XC+lft9aZ OI68ZdnIptGo6qa4GYF1kzp3fxXVvgeEhefNkC77bWYMOT4CqoPsRdWbMUlNoJ5CyIAm cJiGQ5SVUo3HsdLp4CWH5ttF2w99n332E4mKT7Ntqwidpjh2LJOW0GP9oaWmWhKuDwYP RzxOJc9klsaD/+Q1863UJooN2BO3LAB4jqeTzWzC4qfOQZKlWGT48k/SbRsorcNN/pUP gZQdsgq0bHKYLPDYxhy/t8zFMvgv0FQcFMiLW9wNXtPynbYTOABBQzF6X9/NMCj+1/6w 0AQw==; 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=OQPlqOyS; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=fNwPY7D0; dkim=neutral (body hash did not verify) header.i=@wolfssl-com.20230601.gappssmtp.com header.s=20230601 header.b=baHv+Nx9; 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; AJvYcCWZbqQQCpuKD3OmO+8kbB57GywN+VpjrO66SATjxEp6QPl1BwLLOH3AkSuFhfzg/tb9DfqpPjP52xjsbQPwIgmpMYffL2AHPFMYOj9Cgn7kOkDke8Dp8g3ZOLp0BrwpnhKPQlZE6TOoXCGSPWSJxj7hUNrqSCQ= Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id f5-20020a170902684500b001d9871e4da8si1896639pln.33.2024.02.09.08.45.48 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Feb 2024 08:45:49 -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=OQPlqOyS; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=fNwPY7D0; dkim=neutral (body hash did not verify) header.i=@wolfssl-com.20230601.gappssmtp.com header.s=20230601 header.b=baHv+Nx9; 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 1rYU0H-0004ZN-Dj; Fri, 09 Feb 2024 16:45:29 +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 1rYU0F-0004Z9-S1 for openvpn-devel@lists.sourceforge.net; Fri, 09 Feb 2024 16:45:28 +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=oiIB+MHdbyoFa2xeUy6MX4vSgB/au5LPt9zF/XjbttQ=; b=OQPlqOySktRH/caM1zVTvDp4j/ oANLWLIqZgPixmT81VWi5JYd1mjN2rqBKIfNCT4R8CyLdmX/5+SZr5HJ08/h+Ap8VSt3nfNI3NXVi noMllZV0oApzg66dpWVJQZCAxjHjQ1MiFE18vhffiRUx/pO4QND/BiDfQvazNAsdFpNg=; 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=oiIB+MHdbyoFa2xeUy6MX4vSgB/au5LPt9zF/XjbttQ=; b=f NwPY7D0UTk7eHMNeGKBffNkM9zWt77l5Y2c2OdqboI72NDF6gKy7j/3+MYqR3O/MIuwjhxwQ28KBa rN8dxIfCuoAeisHUJtLE7vyr50Aclqw8fhOOB1MWa/KuRKlMoASFSD+CwNQCuqzfYucBbmHusnF9K EAlpGoXuEt9It+7g=; Received: from mail-lj1-f182.google.com ([209.85.208.182]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1rYU0B-0003L5-Lo for openvpn-devel@lists.sourceforge.net; Fri, 09 Feb 2024 16:45:28 +0000 Received: by mail-lj1-f182.google.com with SMTP id 38308e7fff4ca-2d0d799b55cso16351151fa.0 for ; Fri, 09 Feb 2024 08:45:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wolfssl-com.20230601.gappssmtp.com; s=20230601; t=1707497117; x=1708101917; 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=oiIB+MHdbyoFa2xeUy6MX4vSgB/au5LPt9zF/XjbttQ=; b=baHv+Nx9F9khAHKT2q+ccNhfcDfauf2ik/RcLa6X2VVxIbvpFYSMzhl3shmEh67ZOc 10TGpD8sfCP4xr9P9MbxUAGfKVV2XuoP2WDGK7qjTjJ6NhZAE5O0bYTyo0oVZWWjv6VX ben7EKS1A6v4vficqguXx6mDayYCi8CWd29uE4xZPUZK9QpBRyMF52KDysxYy5WN6CAu yszbbfJiB4H8bZcsu0kGw/LoGSliiK8IpBRJ85gjbl6KUZ9YPpzORvpjPIywLQIcD/qs XN+tmqjXlADKqalaS/CWmuQQR+G33TtLdiwBvSsjwKgB/k/uX1jsNdSYhH0sRO9TnOxk 1Ynw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707497117; x=1708101917; 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=oiIB+MHdbyoFa2xeUy6MX4vSgB/au5LPt9zF/XjbttQ=; b=jqoKrB74Fh63LbpYlaKvlsvnSd+U965zQFY2NSJSqkAynkzt13Fi5tYK5A1J1IcGh7 7rDo1pqSn0r3P5A0foveJVF73aqK2oZ8I/l7na3ny8Lwwi1V1BnbFkMsPDydq3ZwR80b za1U835lXAXFF6Ruznwd9d0FFRkG2hgbCiFhiSgsnGVvoqJTEbKDj4MHlbNRyR9WIc2P Aiuyqcz3RP73/ySZKILzEeCjzLIjNOOFmJMRJDIloWufenJKDG6JvColzJLM/gjLjwss M9LI89s+mVdPlfa4hlMF45n+dco97v9+B09ZLkpRLwKOGAjuNZZqck+R++RdEQPgUa9R 4Wvw== X-Gm-Message-State: AOJu0Yw7k6HdTsAmRcOY8TZiJ6waWQgPab9UDdh6feSe6lH6RhB1Uv07 PfuJqyyCr1Gj9BphNwyGpxWfyEqase0iTATtl1FmS/e4PTYYZeB4pu9oxrpoPfOGeVGB5DQgEMJ HYhpJLA== X-Received: by 2002:ac2:47e7:0:b0:511:6f46:38d6 with SMTP id b7-20020ac247e7000000b005116f4638d6mr1403560lfp.8.1707493663500; Fri, 09 Feb 2024 07:47:43 -0800 (PST) Received: from localhost.localdomain ([85.203.44.158]) by smtp.gmail.com with ESMTPSA id u6-20020a05651206c600b005117583a519sm298192lff.180.2024.02.09.07.47.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Feb 2024 07:47:43 -0800 (PST) From: Juliusz Sosinowicz To: openvpn-devel@lists.sourceforge.net Date: Fri, 9 Feb 2024 16:47:08 +0100 Message-Id: <20240209154708.109848-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-2.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.182 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.208.182 listed in list.dnswl.org] -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: 1rYU0B-0003L5-Lo 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?1790440531235828359?= 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. --- 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"