From patchwork Fri Oct 5 03:58:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steffan Karger X-Patchwork-Id: 488 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director10.mail.ord1d.rsapps.net ([172.27.255.7]) by backend30.mail.ord1d.rsapps.net with LMTP id wOdZF2Rut1vSUAAAIUCqbw for ; Fri, 05 Oct 2018 10:00:04 -0400 Received: from proxy4.mail.iad3a.rsapps.net ([172.27.255.7]) by director10.mail.ord1d.rsapps.net with LMTP id ICV0FGRut1tqFwAApN4f7A ; Fri, 05 Oct 2018 10:00:04 -0400 Received: from smtp35.gate.iad3a ([172.27.255.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy4.mail.iad3a.rsapps.net with LMTP id 8BM6DWRut1vBVQAA8Zvu4w ; Fri, 05 Oct 2018 10:00:04 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.105.38.7] Authentication-Results: smtp35.gate.iad3a.rsapps.net; iprev=pass policy.iprev="216.105.38.7"; spf=pass smtp.mailfrom="openvpn-devel-bounces@lists.sourceforge.net" smtp.helo="lists.sourceforge.net"; dkim=fail (signature verification failed) header.d=sourceforge.net; dkim=fail (signature verification failed) header.d=sf.net; dkim=fail (signature verification failed) header.d=karger-me.20150623.gappssmtp.com; dmarc=none (p=nil; dis=none) header.from=karger.me X-Suspicious-Flag: YES X-Classification-ID: f4937814-c8a6-11e8-81f3-52540083445f-1-1 Received: from [216.105.38.7] ([216.105.38.7:14023] helo=lists.sourceforge.net) by smtp35.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id A6/E8-04002-36E67BB5; Fri, 05 Oct 2018 10:00:03 -0400 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.90_1) (envelope-from ) id 1g8QdM-0006Sr-At; Fri, 05 Oct 2018 13:59:12 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1g8QdL-0006Sg-P6 for openvpn-devel@lists.sourceforge.net; Fri, 05 Oct 2018 13:59:11 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: MIME-Version:Content-Type:Content-Transfer-Encoding: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=jlUYVL7AQRPLtVkR5sPKr8coPp/aJduO+O1uaj1oa8k=; b=NVIaidRfFm8bAY9YkzCwSsInMM 9a2bOaUkqrMt8e3vGYiHPMtLhd9SPBxO1VJzvnN1cynTQGrn9HDjVZ1KHTAqVw2jUJv/qpvBu2zKI vrK/QWzacFswlnRXXhPd4ICEHc8b55PBTv2629p8AW36/+SVVBXgjqpC24bbGgQtlQa8=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version: Content-Type:Content-Transfer-Encoding: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=jlUYVL7AQRPLtVkR5sPKr8coPp/aJduO+O1uaj1oa8k=; b=PJbSoGtHp55TiMQHsMWvQAPrFO 80QTuUxza0jr+pf62dumkzKOOqdU4sQLAyhmjayTHwbWKBdKym8qpp1ocAYYCZc2ecBssaHPe04s0 xpRFECObb9kkCWjvVawsoQbdrJMjHMhBAS4ZR+v5i0v8E+GSRtwkLuvgEG75RVRAzGYg=; Received: from mail-ed1-f41.google.com ([209.85.208.41]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.90_1) id 1g8QdD-0019LY-2y for openvpn-devel@lists.sourceforge.net; Fri, 05 Oct 2018 13:59:11 +0000 Received: by mail-ed1-f41.google.com with SMTP id q19-v6so11773831edr.1 for ; Fri, 05 Oct 2018 06:59:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=karger-me.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=jlUYVL7AQRPLtVkR5sPKr8coPp/aJduO+O1uaj1oa8k=; b=Bqpzc1S8yMrSuxDpfmdNDT7PeSCuRpojqT7IAgSd+RxAasDUrTetjHQIzmUG4ypztF 5KojYfcciITpPisQPWVVdRrmpc329sq5oQdrejwRUr61wcZ1Du+zJF/PYguAyOHruuF1 ArRuvXW43xNYqJagGhTbZY6Rh9p4W51g4WbYKwC2vxFurwePaMyUm/ksZwF+sJIZSUjw fQR46Fz0p4VeQj148d3wEzUaXVvJiEsedEvaLYOSexTfimhuiSXU7Mu9PQM0R6gjZP85 2//EFQj3JPvfi9z8nrvO2cfG/mWfP3lfmteORqxkabxr9XJYssPQDSVWh0v5kiE5tdS9 fPzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=jlUYVL7AQRPLtVkR5sPKr8coPp/aJduO+O1uaj1oa8k=; b=ND+GBrBXqD9D5TvepeuIRcpCtvdWBdfDX+P2WZhTWohzGZSdC3EAwvL2UJWrmuXrAm N552LHKXidZnHjPZXKQuZyWYYhTJpY8t/Pfba+kFkqXT7yBaBv/QKTsWDBuJyvDmOdVs KbpkQA0FYNRM9OsBKCOJDP+Fj7+nqjC8zyFLMoS4UePiclNWSsOQqkZTAgsvFfJPPtbk UhfRKErkcWB3x2Ei1Pm3O2AZV9c4vswznHadYDvQXDBrADNRL4tADv6ia3T0zxGbAQQk DJL26yeDWs+mkoY2Dmi7qFAcG/1HQk04iWo4oTlHmVOepUUl4J5KBkQW9aZpBko/9SkX nS+Q== X-Gm-Message-State: ABuFfogzgDqcnfTZma+iF+MrRQonVQP9fifdMQGZHRRW2nRTByKCL7bG DH1E6BhfjSy7gCUbmCjt04fU1StXCE7a+w== X-Google-Smtp-Source: ACcGV61IpPpA9tSuw8Oadb5qN/eEgJKVChYOlZoSUXeknNZ31hU1Vm4YVkTCxnemvaIaHBpMznAUSw== X-Received: by 2002:aa7:d4c7:: with SMTP id t7-v6mr13952239edr.256.1538747936097; Fri, 05 Oct 2018 06:58:56 -0700 (PDT) Received: from localhost.localdomain ([2001:985:e54:1050::1000]) by smtp.gmail.com with ESMTPSA id b9-v6sm2594969edk.62.2018.10.05.06.58.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Oct 2018 06:58:55 -0700 (PDT) From: Steffan Karger To: openvpn-devel@lists.sourceforge.net Date: Fri, 5 Oct 2018 15:58:49 +0200 Message-Id: <20181005135849.28718-1-steffan@karger.me> X-Mailer: git-send-email 2.17.1 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.208.41 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [209.85.208.41 listed in list.dnswl.org] -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 DKIMWL_WL_MED DKIMwl.org - Whitelisted Medium sender 0.0 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1g8QdD-0019LY-2y Subject: [Openvpn-devel] [PATCH (2.4)] Fix --disable-crypto build 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: , MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox Commit d2ff5164 was fine for the master branch, but broke the 2.4 build if the --disable-crypto configure options was used (which is removed in the master branch). Signed-off-by: Steffan Karger Acked-by: Gert Doering Signed-off-by: Steffan Karger <steffan@karger.me>
--- src/openvpn/init.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/openvpn/init.c b/src/openvpn/init.c index 0950f07e..2d201c44 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -621,9 +621,11 @@ uninit_proxy(struct context *c) static void do_set_ncp_options(struct context *c) { +#ifdef ENABLE_CRYPTO c->c1.ciphername = c->options.ciphername; c->c1.authname = c->options.authname; c->c1.keysize = c->options.keysize; +#endif ENABLE_CRYPTO } /* @@ -635,9 +637,11 @@ do_set_ncp_options(struct context *c) static void do_unset_ncp_options(struct context *c) { +#ifdef ENABLE_CRYPTO c->options.ciphername = c->c1.ciphername; c->options.authname = c->c1.authname; c->options.keysize = c->c1.keysize; +#endif ENABLE_CRYPTO } void