From patchwork Wed Oct 13 12:04:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lev Stipakov X-Patchwork-Id: 1982 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director13.mail.ord1d.rsapps.net ([172.31.255.6]) by backend30.mail.ord1d.rsapps.net with LMTP id 1ONVO+zuZ2FpSgAAIUCqbw (envelope-from ) for ; Thu, 14 Oct 2021 04:48:44 -0400 Received: from proxy3.mail.iad3b.rsapps.net ([172.31.255.6]) by director13.mail.ord1d.rsapps.net with LMTP id 8EFIOuzuZ2EuJgAA91zNiA (envelope-from ) for ; Thu, 14 Oct 2021 04:48:44 -0400 Received: from smtp9.gate.iad3b ([172.31.255.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy3.mail.iad3b.rsapps.net with LMTPS id 0OucM+zuZ2FAPgAAM8Wetg (envelope-from ) for ; Thu, 14 Oct 2021 04:48: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: smtp9.gate.iad3b.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=gmail.com; dmarc=fail (p=none; dis=none) header.from=gmail.com X-Suspicious-Flag: YES X-Classification-ID: 88cb6e70-2ccb-11ec-b34c-525400f4d366-1-1 Received: from [216.105.38.7] ([216.105.38.7:58508] helo=lists.sourceforge.net) by smtp9.gate.iad3b.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 6C/D7-29784-BEEE7616; Thu, 14 Oct 2021 04:48:43 -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 1mawP8-0000Q2-3N; Thu, 14 Oct 2021 08:47: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 1mawP6-0000Pw-P8 for openvpn-devel@lists.sourceforge.net; Thu, 14 Oct 2021 08:47:56 +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=dg9F2lWLUYnzhZhgcN0VogO+SCDA3oI7eXTKm9Pn60Q=; b=Y5kYQNXvDudfsuxQPrBC+Ng+jR zSyaYXfZhmsgD3kgMFjpiD4BzGilHAwGjUqUHDVMTKBCf3obKpmOLV5EAubqVbV+pwX2iLLd+WJar kW7T/y8WApZUdWKTpHt81YntDyeoZtrfnMgnneOemWRu+btR9R6/q+lBwE6iDDfV+ayE=; 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=dg9F2lWLUYnzhZhgcN0VogO+SCDA3oI7eXTKm9Pn60Q=; b=ALpesGhZr1e/2nDz0wTIjVEKrj cGDaEe18dSFLMqqCVGFKm0nZRShaOOMz+DCyFHKraNCmuohcruVis616bwMI5EmP0J+elEtauTcnq q1CSorzLH80LbWe9qhiwzKtSVp7nNGeay2fVnQlihvUWguKDVEJEN7YcwjE1geqvtPSM=; Received: from mail-lf1-f50.google.com ([209.85.167.50]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92.3) id 1mawP2-0003WZ-Cf for openvpn-devel@lists.sourceforge.net; Thu, 14 Oct 2021 08:47:56 +0000 Received: by mail-lf1-f50.google.com with SMTP id j21so24071057lfe.0 for ; Thu, 14 Oct 2021 01:47:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id; bh=dg9F2lWLUYnzhZhgcN0VogO+SCDA3oI7eXTKm9Pn60Q=; b=XtVLCerdaX5CGPW6qmb0Xi8BlRn40lI+7qJw6BKM6ZT6sL3Ds40PeqxavQ9s3lm4BM O2bh66hM6siTc2QnwsD2yP8T5pk3pj0OgQJnBZHwfuttLmuzqke5l/ox82HSIbzPYPQb 3SLTVxf6qgP+ZcZZ6RbMQEWWdb29evtbUIFc8JRVfAM6gVm2778k8lfyiHfQ2Iyd8nNL ZsS+f/mAolvWbZj+IK0HtiN9uzzUh/Cso0XCJOJ0bSVi5VI/baMBPsxL9pVZgCILEcba RMJHeqxdO+5j2S/Jm65pWniRNMcmXpw/WhD3iJdW3XjEQRaAAk7cyFB0Pk3yqYNGKs9W P1Rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=dg9F2lWLUYnzhZhgcN0VogO+SCDA3oI7eXTKm9Pn60Q=; b=kD26i4tFmNImO3hUyinHc4/32gAYi89Bvb1crcqNIsxOoreocXxskLntLHdvGesyQg pZNIbl8dwBc8+VGvT3i9G8wvNIB2VWUK3SnUyfBVPFfPW03n7s9fzJnhsvDMt1gqPkp5 euuntzgHe2CTym53TjIgKu3eDpNC2rt3dHz7//HgyHqMfgx+R28eZlD6V8xFfA6OpmJB 9KmJZzuTzKqiP4c6Wn6lDtkT16pyqUExphXSNIQf9Z34duaBmL/SKjTw4mLApPB5FjQW +RWvorTQgQyRh5Yr+tIv1GxJodXuhsIpPF32r5cTMMfKtYfebgaomtl+Rpsx8MDUHH5i 2MiA== X-Gm-Message-State: AOAM532qZTRy+TrmMB4Hp2l1py4i8CkWHYstANR8oL7UXKRibEEoQxel EyExyDA/0wYH6+nPB5uzvzys6bSRh98= X-Google-Smtp-Source: ABdhPJzrkfN0OCuAyl3f/JL5jdVNKAD3GPW7huQ2QNMAA9L8bEGixHuE86+VrfcZvAwmcG3qG3La4Q== X-Received: by 2002:a19:4891:: with SMTP id v139mr3918947lfa.435.1634201265672; Thu, 14 Oct 2021 01:47:45 -0700 (PDT) Received: from LAPTOP-4L3N7KFS.localdomain (37-33-133-156.bb.dnainternet.fi. [37.33.133.156]) by smtp.gmail.com with ESMTPSA id p18sm200619ljc.114.2021.10.14.01.47.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Oct 2021 01:47:45 -0700 (PDT) From: Lev Stipakov To: openvpn-devel@lists.sourceforge.net Date: Thu, 14 Oct 2021 02:04:42 +0300 Message-Id: <20211013230442.305-1-lstipakov@gmail.com> X-Mailer: git-send-email 2.17.1 X-Spam-Report: Spam detection software, running on the system "util-spamd-1.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: Lev Stipakov Commit 2778443 ("msvc: OpenSSL 1.1.x support") added OpenSSL-related defines to config-msvc.h, which in Linux/MinGW are set during configure step. Turns out that OPENSSL_NO_EC was added by mistake - it breaks loading EC keys. Also few others were missing. Content analysis details: (0.9 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.167.50 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [lstipakov[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 1.1 DATE_IN_PAST_06_12 Date: is 6 to 12 hours before Received: date -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_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 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.167.50 listed in wl.mailspike.net] X-Headers-End: 1mawP2-0003WZ-Cf Subject: [Openvpn-devel] [PATCH 3/3] config-msvc.h: fix OpenSSL-related defines 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: , Cc: Lev Stipakov MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox From: Lev Stipakov Commit 2778443 ("msvc: OpenSSL 1.1.x support") added OpenSSL-related defines to config-msvc.h, which in Linux/MinGW are set during configure step. Turns out that OPENSSL_NO_EC was added by mistake - it breaks loading EC keys. Also few others were missing. Compare with MinGW-generated config.h, which uses the same OpenSSL version. Remove unneeded defines and add missing ones. Signed-off-by: Lev Stipakov Acked-by: Gert Doering --- config-msvc.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/config-msvc.h b/config-msvc.h index f199bb2c..a39eeed8 100644 --- a/config-msvc.h +++ b/config-msvc.h @@ -84,13 +84,16 @@ #define HAVE_HMAC_CTX_NEW 1 #define HAVE_SSL_CTX_GET_DEFAULT_PASSWD_CB_USERDATA 1 #define HAVE_SSL_CTX_GET_DEFAULT_PASSWD_CB 1 +#define HAVE_SSL_CTX_NEW 1 +#define HAVE_SSL_CTX_SET_SECURITY_LEVEL 1 #define HAVE_X509_GET0_PUBKEY 1 #define HAVE_X509_STORE_GET0_OBJECTS 1 #define HAVE_X509_OBJECT_FREE 1 #define HAVE_X509_OBJECT_GET_TYPE 1 +#define HAVE_X509_GET0_NOTAFTER 1 +#define HAVE_X509_GET0_NOTBEFORE 1 #define HAVE_EVP_PKEY_GET0_RSA 1 #define HAVE_EVP_PKEY_GET0_EC_KEY 1 -#define HAVE_EVP_PKEY_ID 1 #define HAVE_EVP_PKEY_GET0_DSA 1 #define HAVE_RSA_SET_FLAGS 1 #define HAVE_RSA_GET0_KEY 1 @@ -110,8 +113,8 @@ #define HAVE_RSA_METH_SET0_APP_DATA 1 #define HAVE_RSA_METH_GET0_APP_DATA 1 #define HAVE_EC_GROUP_ORDER_BITS 1 -#define OPENSSL_NO_EC 1 #define HAVE_EVP_CIPHER_CTX_RESET 1 + #define HAVE_DIINSTALLDEVICE 1 #define PATH_SEPARATOR '\\'