From patchwork Sat Oct 28 14:54:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "its_Giaan (Code Review)" X-Patchwork-Id: 3409 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:693c:240a:b0:f2:62eb:61c1 with SMTP id me10csp1317686dyc; Sat, 28 Oct 2023 07:55:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH1N9JQ5vNESuBYNrWbooyDwSjzdncnWSu4rGxSIzL1lcJs5Af1uPzkA0lmmbACnI3o0+pH X-Received: by 2002:a05:6a00:1f8b:b0:6be:a1e:952 with SMTP id bg11-20020a056a001f8b00b006be0a1e0952mr5578630pfb.2.1698504939234; Sat, 28 Oct 2023 07:55:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698504939; cv=none; d=google.com; s=arc-20160816; b=rmeOjEIaAxJAVWhv0NxzZbYOwTHQAll4nUOaG9+ueFEaPuj76dOpLJy6wyV8KVHJHo dZnujUJnsJMkUgz47SyfoB+Xm4LshGUTUXqUQzVEwBaUHSjWv2PqO5PBcpkWw7GsCSHF N1U61qDE5U0TIgPJBk+0j2q9U9N2kRmmT7jZ6hr9GxpkvEwiks2aHhWVDLPfhSeZT8Oh I8EjE9xlwjRP+xEH0d9lbHnomGV6yZJn/YQt188SSXGV/7KodUPSk5jXylyy0dVTJsCR 2/Iqs0vVRF8MRle9/wrrqiu3fqupxMfMvwlPdz7b5IFa3Q2sYw+viJ6tKFwSvU7GyA4P JKxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:cc:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:user-agent :mime-version:message-id:references:auto-submitted:to:date:from :dkim-signature:dkim-signature:dkim-signature; bh=j+X7ciQK+6uRnTnoJFHhm5R0K4QupPW6SY/dU1Co2Bs=; fh=lm0MLPW7DntlrDqRECIiC9JlE1uPxhepE0URYHIf+eE=; b=Xses4qTLmnhX1LAdXYtr0jP3z8DKyu8dK5TId4/dqF6nuLzmdGhbhftm1GWzqU0z0H Kr11DXWfKM/3EBVK8Owzd3SvWua2yj9i/D7PqPWLToqVmEOnHcSYPLPWrv0h+IlRamuE G/VGel4gVutfwF38GEZXp+JzhB+gEjS4SV5uNmC5kyW5f2zzPfj3l/dRLzdGGASAmXky NSVNQOT83W+oqfWhk2r3OCH1aLrNGLbAus6kr2YToEnJjNChia7hfcwZISk/PC7J3PYm Y5EbgsmnpzGgDd/r2eQ4gN58nWu/ghGmyaSlYg9ecDrrpewsiyMptoaVnZUxs5KBHMcb XAvg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=XkBth8uw; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=ZoPfupSJ; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=PunQOXR0; 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=openvpn.net Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id p19-20020a056a000a1300b006b77c54544dsi2488502pfh.195.2023.10.28.07.55.38 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 28 Oct 2023 07:55:39 -0700 (PDT) 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=XkBth8uw; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=ZoPfupSJ; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=PunQOXR0; 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=openvpn.net Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1qwki3-0003so-FN; Sat, 28 Oct 2023 14:54:43 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1qwki1-0003si-Ed for openvpn-devel@lists.sourceforge.net; Sat, 28 Oct 2023 14:54:41 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Type:Content-Transfer-Encoding:MIME-Version :Message-ID:Reply-To:References:Subject:List-Unsubscribe:List-Id:Cc:To:Date: From:Sender:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:List-Help: List-Subscribe:List-Post:List-Owner:List-Archive; bh=2BzgZZUdK4sdkp3HYbK67nkLF9TOjoGowgaoAVy/mI8=; b=XkBth8uwjoZVXAPIuIhfT9nUF8 G+73pYQx18ws75rUanpHvw/PnPrOa7U16ejZMnMayHfZkrIPx1U9N1YWc3lW4nPMDDUNvDa4psxmU gDgCfxT+TkV0Xw+FXCN+0W+IXlyNSWQZLaVbmLchQtpG2M8XZFVmkGBkTMFUn0Tgwk0s=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Type:Content-Transfer-Encoding:MIME-Version:Message-ID:Reply-To: References:Subject:List-Unsubscribe:List-Id:Cc:To:Date:From:Sender:Content-ID :Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To: Resent-Cc:Resent-Message-ID:In-Reply-To:List-Help:List-Subscribe:List-Post: List-Owner:List-Archive; bh=2BzgZZUdK4sdkp3HYbK67nkLF9TOjoGowgaoAVy/mI8=; b=Z oPfupSJqxug1me+6WQp6TcrM79hNo/yBp8lxGqdhpzUuvamib3tQYx8fqcs3H5TxZoUqRMhehktO9 SQavQ4uMikajD7OMykYlHMpAauQ65sMusJ+s1e6tRreonyvOaHBXi5yhbOHEkS49T3xXEGOSHBFC8 O7pZldqifqfwlgBo=; Received: from mail-wm1-f48.google.com ([209.85.128.48]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1qwkhx-00CUvN-Ph for openvpn-devel@lists.sourceforge.net; Sat, 28 Oct 2023 14:54:41 +0000 Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-40859dee28cso23883255e9.0 for ; Sat, 28 Oct 2023 07:54:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvpn.net; s=google; t=1698504871; x=1699109671; darn=lists.sourceforge.net; h=user-agent:content-disposition:content-transfer-encoding :mime-version:message-id:reply-to:references:subject :list-unsubscribe:list-id:auto-submitted:cc:to:date:from:from:to:cc :subject:date:message-id:reply-to; bh=2BzgZZUdK4sdkp3HYbK67nkLF9TOjoGowgaoAVy/mI8=; b=PunQOXR02/xn2U4ydDukH7zQ+U4YLodGTVoNQJGICv+0bJ86c6c3SyJAx82uRY4pEx j00eHyB//9twFtPpBkXTaJtq27ukp8+ihztz5IDAXISC/YPqQEH4i1yIFjLn+ga0EUUg ZrskDsnXyI9BtdZerqvDnsIkxKcC4i1x+aifWNO01LQg+qz4TqwvsMYzChlliehUe7Xs AsDArmZukyRoiAa8LMjgwqaVpmaPFQOXCBm9E8Zm/kiUUcgk2L9jHW4qbUixS6dUEJmM SBp1qWh51Eik5NvmwCxkwuGYZnAfPe4cmfgKieW/Ua28ZtNYCWAuGr9Ow7eyxDKWkhoh U7fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698504871; x=1699109671; h=user-agent:content-disposition:content-transfer-encoding :mime-version:message-id:reply-to:references:subject :list-unsubscribe:list-id:auto-submitted:cc:to:date:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=2BzgZZUdK4sdkp3HYbK67nkLF9TOjoGowgaoAVy/mI8=; b=FX0cx/WdOx5p2dWDvBFG9R2ewARxwaAbY724q4tzznCx9XnoOkQGbCFKtdckxaj3Lo R18Ydu2E7/bhkssbj5bNoXr1hm9Jc4NC2QfVYmVcS/aBr+rOouahGFAMu5vHqMBG/dT9 Kv8eX2qUVTWk/xMwiIdKvwLLhB1qISSXm4Ce0ziAvoNvh7mMua9qWQk5y2kgYEORl+3i i5qnGDrrRrk6mJG6kP10GaFhXdUFn9YbK0iVKTikI2eOKYpKr6O49cKXCvp6qb4RL6Re cJZP4/5JjXPBG2Ids6NHgTIPT5LS3jftExOr+MkRRF2ci1WtSWL1p2v7G9/oLjmSO6n5 lG6g== X-Gm-Message-State: AOJu0YxB27k64/TC66V3GsZv4IL1ELTOqvdXCnqsdwcQVNIoKZMhIKF1 eoITQIB12m5Qpzvxmtjh8WS1bSetO8m660f88Sk= X-Received: by 2002:a05:600c:468e:b0:409:78e:1c42 with SMTP id p14-20020a05600c468e00b00409078e1c42mr4793100wmo.22.1698504870911; Sat, 28 Oct 2023 07:54:30 -0700 (PDT) Received: from gerrit.openvpn.in (ec2-18-159-0-78.eu-central-1.compute.amazonaws.com. [18.159.0.78]) by smtp.gmail.com with ESMTPSA id v10-20020a05600c444a00b00401d8181f8bsm7667687wmn.25.2023.10.28.07.54.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Oct 2023 07:54:30 -0700 (PDT) From: "plaisthos (Code Review)" X-Google-Original-From: "plaisthos (Code Review)" X-Gerrit-PatchSet: 1 Date: Sat, 28 Oct 2023 14:54:29 +0000 To: flichtenheld Auto-Submitted: auto-generated X-Gerrit-MessageType: newchange X-Gerrit-Change-Id: I7fd9e730e87210d2b7d090c8f9c7c6734bd7374e X-Gerrit-Change-Number: 377 X-Gerrit-Project: openvpn X-Gerrit-ChangeURL: X-Gerrit-Commit: 80946dffa6ce8803563b4a20539246c7b7d1e244 References: Message-ID: MIME-Version: 1.0 User-Agent: Gerrit/3.8.2 X-Spam-Score: -0.2 (/) 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: Attention is currently required from: flichtenheld. Hello flichtenheld, I'd like you to do a code review. Please visit Content analysis details: (-0.2 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.128.48 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.128.48 listed in wl.mailspike.net] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 WEIRD_PORT URI: Uses non-standard port number for HTTP 0.0 HTML_MESSAGE BODY: HTML included in message -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 0.0 T_KAM_HTML_FONT_INVALID Test for Invalidly Named or Formatted Colors in HTML X-Headers-End: 1qwkhx-00CUvN-Ph Subject: [Openvpn-devel] [S] Change in openvpn[master]: Fix building with cmake and mbed TLS 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: , Reply-To: arne-openvpn@rfc2549.org, openvpn-devel@lists.sourceforge.net, frank@lichtenheld.com Cc: openvpn-devel Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1781011515135633006?= X-GMAIL-MSGID: =?utf-8?q?1781011515135633006?= X-getmail-filter-classifier: gerrit message type newchange Attention is currently required from: flichtenheld. Hello flichtenheld, I'd like you to do a code review. Please visit http://gerrit.openvpn.net/c/openvpn/+/377?usp=email to review the following change. Change subject: Fix building with cmake and mbed TLS ...................................................................... Fix building with cmake and mbed TLS Change-Id: I7fd9e730e87210d2b7d090c8f9c7c6734bd7374e --- M CMakeLists.txt M config.h.cmake.in 2 files changed, 19 insertions(+), 3 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/77/377/1 diff --git a/CMakeLists.txt b/CMakeLists.txt index 376a060..2f57771 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,6 +32,8 @@ endif () option(MBED "BUILD with mbed" OFF) +set(MBED_INCLUDE_PATH "" CACHE STRING "Path to mbed TLS include directory") +set(MBED_LIBRARY_PATH "" CACHE STRING "Path to mbed library directory") option(WOLFSSL "BUILD with wolfSSL" OFF) option(ENABLE_LZ4 "BUILD with lz4" ON) option(ENABLE_LZO "BUILD with lzo" ON) @@ -219,6 +221,13 @@ check_type_size("struct msghdr" MSGHDR) set(CMAKE_EXTRA_INCLUDE_FILES) +if (${MBED}) + check_symbol_exists(mbedtls_ctr_drbg_update_ret mbedtls/ctr_drbg.h HAVE_CTR_DRBG_UPDATE_RET) + check_symbol_exists(mbedtls_ssl_conf_export_keys_ext_cb mbedtls/ssl.h HAVE_EXPORT_KEYING_MATERIAL) +else () + set (HAVE_EXPORT_KEYING_MATERIAL TRUE) +endif () + find_program(IFCONFIG_PATH ifconfig) find_program(IPROUTE_PATH ip) find_program(ROUTE_PATH route) @@ -237,7 +246,14 @@ function(add_library_deps target) if (${MBED}) - target_link_libraries(${target} -lmbedtls -lmbedx509 -lmbedcrypto) + if (NOT (MBED_INCLUDE_PATH STREQUAL "") ) + target_include_directories(${target} PRIVATE ${MBED_INCLUDE_PATH}) + endif () + if(NOT (MBED_LIBRARY_PATH STREQUAL "")) + target_link_directories(${target} PRIVATE ${MBED_LIBRARY_PATH}) + endif () + + target_link_libraries(${target} PRIVATE -lmbedtls -lmbedx509 -lmbedcrypto) elseif (${WOLFSSL}) pkg_search_module(wolfssl wolfssl REQUIRED) target_link_libraries(${target} PUBLIC ${wolfssl_LINK_LIBRARIES}) diff --git a/config.h.cmake.in b/config.h.cmake.in index f2cdd39..633dfd6 100644 --- a/config.h.cmake.in +++ b/config.h.cmake.in @@ -118,7 +118,7 @@ #cmakedefine HAVE_ERR_H /* Crypto library supports keying material exporter */ -#define HAVE_EXPORT_KEYING_MATERIAL 1 +#cmakedefine HAVE_EXPORT_KEYING_MATERIAL 1 /* Define to 1 if you have the header file. */ #cmakedefine HAVE_FCNTL_H @@ -387,7 +387,7 @@ #undef HAVE_VSNPRINTF /* we always assume a recent mbed TLS version */ -#define HAVE_CTR_DRBG_UPDATE_RET 1 +#cmakedefine HAVE_CTR_DRBG_UPDATE_RET /* Path to ifconfig tool */ #define IFCONFIG_PATH "@IFCONFIG_PATH@"