From patchwork Tue Oct 15 20:56:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 3896 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:8059:b0:5b9:581e:f939 with SMTP id m25csp147476maf; Tue, 15 Oct 2024 13:57:07 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWTBJXCaCQkjiIZjFOl/e9BzLmdsMZBmt8Rv4k2XTUBLaX5LfgVArgeHAOk1mci1uOnqQknsCJ+yoI=@openvpn.net X-Google-Smtp-Source: AGHT+IGOGAS3UNkHtdhWKJ3MWBZv1rt0r936x/hFbVSSMmRCXF3EzmCV12WlBicMzzJFCurbRpVT X-Received: by 2002:a05:6820:1ac1:b0:5e1:eba9:8fe7 with SMTP id 006d021491bc7-5eb1a1a9932mr9059359eaf.3.1729025827708; Tue, 15 Oct 2024 13:57:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1729025827; cv=none; d=google.com; s=arc-20240605; b=dL3cTMnusvHPvs7low3gI10IVc6PILqZq6qAOsdCK3gQtYhD2jn2nuJkxzNZf/pQ3N sZff5uVIS4Mou8SqVkUpHYJuWc3v/NfizH5MhLGSkAZaKxvG2E/llsR42woJrZj7Yqwy w5C5NnUy3Y59xIJij9H5ueAITbdsMR6UmAXvGyb6TBFXy9BDzXjK82ahEMIvnbU0aJFw LYV+/LOuvpyf9Z+0OCZFy/S38OlbKtUhSxi7XmQnJG5HbjAeS+smoK5we/zQxWmX7q3r qwjpSDul9L5YpFdBmAm/9hguh75aPknRNzsFHmRtDayFeICHHCVs829HOGh6GCiclMAl Y0QA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:dkim-signature; bh=cDxtqawe41xu4na5JTFg8Wcn18u5MhUEF60Swb6cZgY=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=fHqiPFkyXkhYlGLCZzglgDug0EOaywIbB4qbmWEK2xEl61xTKI36K4KPY9Y1fAcJvj 1kR7+YzdwI+qkswbZMEyqgUn/pRwolTnJflYm1WmHuyFdz/nnxgPD5d95gpi+LWf+kPN H7XntR32yonvPAxJmr7B+Pb+ITLAPad9/WmherMfCarxTTKsREi+vcscfdCjZCjPlEPA XhkBPs98Qi5rIfWQ1xj0xPeiQX53f3AMSjviwGsWvhtOmbmtAAP4OxIJB718tcP8jXdz 982trLBCXV+FT0ooCUChnCXGgDyhd0LLShfhvYwqxrBWDJFFA2cGyaD8FrvdFH9vxevN qPIg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=kOKSraZE; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=D7yZcbvh; 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=muc.de Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id 006d021491bc7-5eb4ed03f2csi1112561eaf.9.2024.10.15.13.57.07 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Oct 2024 13:57:07 -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=kOKSraZE; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=D7yZcbvh; 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=muc.de Received: from [127.0.0.1] (helo=sfs-ml-3.v29.lw.sourceforge.com) by sfs-ml-3.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1t0obC-0007Y1-RO; Tue, 15 Oct 2024 20:56:58 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-3.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1t0obB-0007Xv-Eo for openvpn-devel@lists.sourceforge.net; Tue, 15 Oct 2024 20:56:56 +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:References: In-Reply-To:Message-ID:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=D8t9j9k5rYxmkqzjobdUhZWnxw8N6TiQOD+0mYDi8Zo=; b=kOKSraZEqf7255904/Q41Ldy/E bSr18qbwi9D5xj67QKy4GwPQSJDLBbqbKqh6OF2HrVIgnWjA85bqxJvoi1X5PVZ3I8sN5ANML1ovp vFJXVLWh3UagAtatmI63Kjnz5YYzEMh++kvCbEN7hXQuAQJOWHX6HPUpUbBKwA9I8Vrw=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID: Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=D8t9j9k5rYxmkqzjobdUhZWnxw8N6TiQOD+0mYDi8Zo=; b=D7yZcbvhCRHFVoeFVQI5gtBRO5 CCVjc0R57zsF3vNogbA6+AmFW54jKj/i99HHB8I2kUNs7EySu/hODffeiTOPv/CwObQW9WcD81Nac u0SQjSgdAvfXpPBFnzswJrFOd6bMD4zijcHsfH+dsArSuqmHbaSbdJU3YJipyenddkdY=; Received: from dhcp-174.greenie.muc.de ([193.149.48.174] helo=blue.greenie.muc.de) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1t0ob9-0007Vu-TA for openvpn-devel@lists.sourceforge.net; Tue, 15 Oct 2024 20:56:56 +0000 Received: from blue.greenie.muc.de (localhost [127.0.0.1]) by blue.greenie.muc.de (8.17.1.9/8.17.1.9) with ESMTP id 49FKuiS6025789 for ; Tue, 15 Oct 2024 22:56:44 +0200 Received: (from gert@localhost) by blue.greenie.muc.de (8.17.1.9/8.17.1.9/Submit) id 49FKui9P025788 for openvpn-devel@lists.sourceforge.net; Tue, 15 Oct 2024 22:56:44 +0200 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Tue, 15 Oct 2024 22:56:43 +0200 Message-ID: <20241015205643.25779-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: 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: From: Frank Lichtenheld Reduce redundant configuration. Change-Id: Ie922ce67685228eb7043749a7f1a61a33be678d2 Signed-off-by: Frank Lichtenheld Acked-by: Arne Schwabe Acked-by: Yuriy Darnobyt 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?1813014985931760500?= X-GMAIL-MSGID: =?utf-8?q?1813014985931760500?= From: Frank Lichtenheld Reduce redundant configuration. Change-Id: Ie922ce67685228eb7043749a7f1a61a33be678d2 Signed-off-by: Frank Lichtenheld Acked-by: Arne Schwabe Acked-by: Yuriy Darnobyt --- This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master. Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/781 This mail reflects revision 1 of this Change. Acked-by according to Gerrit (reflected above): Arne Schwabe Yuriy Darnobyt diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index fdd133e..3958ef0 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -211,18 +211,10 @@ strategy: fail-fast: false matrix: - ssllib: [ openssl11, openssl3, libressl] - build: [ normal, asan ] + ssllib: [openssl@1.1, openssl@3, libressl] + build: [normal, asan] os: [macos-13, macos-14, macos-15] include: - # macos14 and newer runners use ARM CPUs and homebrew uses /opt/homebrew/ - # on ARM instead of /usr/local/ - - os: macos-13 - homebrew: /usr/local/opt - - os: macos-14 - homebrew: /opt/homebrew/opt - - os: macos-15 - homebrew: /opt/homebrew/opt - build: asan cflags: "-fsanitize=address,undefined -fno-sanitize-recover=all -fno-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame-pointer -g -O1" ldflags: -fsanitize=address,undefined -fno-sanitize-recover=all @@ -232,35 +224,30 @@ cflags: "-O2 -g" ldflags: "" configureflags: "" - - ssllib: openssl11 - libdir: openssl@1.1 - configuressllib: "" - - ssllib: openssl3 - libdir: openssl@3 - configuressllib: "" - - ssllib: libressl - libdir: libressl - configuressllib: "--with-openssl-engine=no" runs-on: ${{matrix.os}} - name: "${{matrix.os}} - ${{matrix.libdir}} - ${{matrix.build}}" + name: "${{matrix.os}} - ${{matrix.ssllib}} - ${{matrix.build}}" env: CFLAGS: ${{ matrix.cflags }} LDFLAGS: ${{ matrix.ldflags }} - OPENSSL_CFLAGS: "-I${{matrix.homebrew}}/${{matrix.libdir}}/include" - OPENSSL_LIBS: "-L${{matrix.homebrew}}/${{matrix.libdir}}/lib -lcrypto -lssl" - LZO_CFLAGS: "-I${{matrix.homebrew}}/lzo/include" - LZO_LIBS: "-L${{matrix.homebrew}}/lzo/lib -llzo2" UBSAN_OPTIONS: print_stacktrace=1 steps: - name: Install dependencies - run: brew install openssl@1.1 openssl@3 lzo lz4 man2html cmocka libtool automake autoconf libressl + run: brew install ${{matrix.ssllib}} lzo lz4 man2html cmocka libtool automake autoconf - name: Checkout OpenVPN uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 + - name: Set environment + run: | + cat >>$GITHUB_ENV <