From patchwork Thu May 28 12:59:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Bottomley X-Patchwork-Id: 1127 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director9.mail.ord1d.rsapps.net ([172.27.255.59]) by backend30.mail.ord1d.rsapps.net with LMTP id yJGdOthC0F6yeAAAIUCqbw for ; Thu, 28 May 2020 19:01:45 -0400 Received: from proxy6.mail.iad3a.rsapps.net ([172.27.255.59]) by director9.mail.ord1d.rsapps.net with LMTP id aGNgONhC0F7UYgAAalYnBA ; Thu, 28 May 2020 19:01:45 -0400 Received: from smtp14.gate.iad3a ([172.27.255.59]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy6.mail.iad3a.rsapps.net with LMTP id qHx/M9hC0F6GIQAA8udqhg ; Thu, 28 May 2020 19:01:44 -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: smtp14.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=hansenpartnership.com; dmarc=fail (p=none; dis=none) header.from=hansenpartnership.com X-Suspicious-Flag: YES X-Classification-ID: 32f255ca-a137-11ea-a2f2-5254005d41e3-1-1 Received: from [216.105.38.7] ([216.105.38.7:52822] helo=lists.sourceforge.net) by smtp14.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 98/0A-20713-8D240DE5; Thu, 28 May 2020 19:01:44 -0400 Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1jeRWE-0002l6-AY; Thu, 28 May 2020 23:00:58 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jeRWD-0002l0-Gy for openvpn-devel@lists.sourceforge.net; Thu, 28 May 2020 23:00:57 +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=9J6953LBNtGhUg2eyEd11xAU0XhWcmBbZ/wcMzWQJ9E=; b=TSjOEkYbVervdP13HXXZIUQKDN bVm4ks9/1nBFOmWL2pSNvhWXjwcEknxJcCFhDLTjK78gcy1c9KVQDJTXw5j8zyJlSj/5u2DIGdkNX CxZeGICpw5yIelc6GYg5ThJuVPmmMd40TEhrrtcWo4dEdeG3VCKaYnNsn8aWk/vOpbxg=; 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=9J6953LBNtGhUg2eyEd11xAU0XhWcmBbZ/wcMzWQJ9E=; b=nBrpkGcsAp31bz5ygFjzGh7RH4 vO104+2cO3q40dDgzp801tI0Rj0mdxpD2fZbd1pUw4p6vDNfmYLH2ovSjwyescjLgmN4JtnCmxhoS GitDRKlqK1DtMTK4GPQDLd6HewpOolwb/zMkbVTJrsPxnF0Za7IDobsVLEieMCU99uo8=; Received: from bedivere.hansenpartnership.com ([66.63.167.143]) by sfi-mx-4.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.2) id 1jeRWC-0021Mr-I1 for openvpn-devel@lists.sourceforge.net; Thu, 28 May 2020 23:00:57 +0000 Received: from localhost (localhost [127.0.0.1]) by bedivere.hansenpartnership.com (Postfix) with ESMTP id 5A56B8EE10F for ; Thu, 28 May 2020 16:00:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=hansenpartnership.com; s=20151216; t=1590706851; bh=eYdNmcFGQze93gl5QT48HkmrpuHyoH01RQgY6v5u9aQ=; h=From:To:Subject:Date:In-Reply-To:References:From; b=o3d0wyXqgQOuUDU45ZYVafbBSMT54SHChzwCFxcd+usgqtwQHIi8vUF2qxRiVLuaY eu4gN/u807gn8cQ5IM3witjXAFAHbVscIjk3HFS6OtAoSSpq++K/FM2VjOrX8MVEqE 1ScAAI9XDCVv3DzlUnRb+JVhI+fV9gWMT4Ms5668= Received: from bedivere.hansenpartnership.com ([127.0.0.1]) by localhost (bedivere.hansenpartnership.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id aTJVohYtIC0t for ; Thu, 28 May 2020 16:00:51 -0700 (PDT) Received: from jarvis.lan (jarvis.ext.hansenpartnership.com [153.66.160.226]) by bedivere.hansenpartnership.com (Postfix) with ESMTP id 0CEB78EE0F8 for ; Thu, 28 May 2020 16:00:51 -0700 (PDT) From: James Bottomley To: openvpn-devel@lists.sourceforge.net Date: Thu, 28 May 2020 15:59:19 -0700 Message-Id: <20200528225920.6983-3-James.Bottomley@HansenPartnership.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200528225920.6983-1-James.Bottomley@HansenPartnership.com> References: <20200528225920.6983-1-James.Bottomley@HansenPartnership.com> MIME-Version: 1.0 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: hansenpartnership.com] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -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 X-Headers-End: 1jeRWC-0021Mr-I1 Subject: [Openvpn-devel] [PATCH v6 2/3] crypto_openssl: add initialization to pick up local configuration 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 The test programme for the new openssl engine code requires overriding the system default configuration file to point to the location of the test engine. Add an initialization stanza that makes this behaviour universal, so now anyone running openvpn configured with openssl can specify their own configuration file with the OPENSSL_CONF environment variable. Signed-off-by: James Bottomley Acked-By: Arne Schwabe Signed-off-by: James Bottomley Acked-By: Arne Schwabe Acked-By: Arne Schwabe <arne@rfc2549.org>
--- src/openvpn/crypto_openssl.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/openvpn/crypto_openssl.c b/src/openvpn/crypto_openssl.c index 4ac77fde..fd57edd2 100644 --- a/src/openvpn/crypto_openssl.c +++ b/src/openvpn/crypto_openssl.c @@ -149,6 +149,11 @@ crypto_init_lib_engine(const char *engine_name) void crypto_init_lib(void) { +#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) + OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG, NULL); +#else + OPENSSL_config(NULL); +#endif /* * If you build the OpenSSL library and OpenVPN with * CRYPTO_MDEBUG, you will get a listing of OpenSSL