From patchwork Wed Mar 27 10:56:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 705 X-Patchwork-Delegate: arne-openvpn@rfc2549.org Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director7.mail.ord1d.rsapps.net ([172.27.255.53]) by backend30.mail.ord1d.rsapps.net with LMTP id 8PThH+fxm1xdbAAAIUCqbw for ; Wed, 27 Mar 2019 17:57:59 -0400 Received: from proxy8.mail.iad3a.rsapps.net ([172.27.255.53]) by director7.mail.ord1d.rsapps.net with LMTP id kLqsHOfxm1yDcQAAovjBpQ ; Wed, 27 Mar 2019 17:57:59 -0400 Received: from smtp10.gate.iad3a ([172.27.255.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy8.mail.iad3a.rsapps.net with LMTP id sKLnFefxm1w4SAAAsBr/qg ; Wed, 27 Mar 2019 17:57:59 -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: smtp10.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=gmail.com; dmarc=fail (p=none; dis=none) header.from=gmail.com X-Suspicious-Flag: YES X-Classification-ID: 61ec6198-50db-11e9-8d6a-525400a8203f-1-1 Received: from [216.105.38.7] ([216.105.38.7:23726] helo=lists.sourceforge.net) by smtp10.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 98/BD-31883-6E1FB9C5; Wed, 27 Mar 2019 17:57:59 -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 1h9GXc-0004JB-5Z; Wed, 27 Mar 2019 21:57:00 +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 1h9GXb-0004J3-AS for openvpn-devel@lists.sourceforge.net; Wed, 27 Mar 2019 21:56:59 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc: 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=FYyR7iMW6cb4JxjheSpCVtKsPIIDuuysTksDspSm4IU=; b=Rv0gdAai62lsfs3FQJYK4DXwXb x2bjGir6gEBTQp4jadmdNrUPq4djwVxTbziZ0S6EMxMBPhALAr+0M0cpS02jwlRCHYaN4HzMosbhr FeO6skwgnibDBYkExvwUP9vSI9JmVMFCKXkSHkZZBqGz96uARgEPdLwKOiOJ1PAMqF7o=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc: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=FYyR7iMW6cb4JxjheSpCVtKsPIIDuuysTksDspSm4IU=; b=KnxeCm2z/biceSoTOyNoB09S/7 jy8YAT5T4gZAK3EziOFT6JjGU44f/XDr+1eJjqvGXriH/7V/MQbzWtWM3EX0Y6d8kDN9H80ATjBbm pmSs/Ih5Z7EMkBmx02b4O48eeIISquG/WmQt5cseUE2NBwGo+z3o4Iz8CNVy44vrE9E0=; Received: from mail-pg1-f194.google.com ([209.85.215.194]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.90_1) id 1h9GXH-00DHZT-NR for openvpn-devel@lists.sourceforge.net; Wed, 27 Mar 2019 21:56:49 +0000 Received: by mail-pg1-f194.google.com with SMTP id u9so10565718pgo.7 for ; Wed, 27 Mar 2019 14:56:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=FYyR7iMW6cb4JxjheSpCVtKsPIIDuuysTksDspSm4IU=; b=qI7LZ/jl11rPfrtSQ8/j7KCJeUqDm2SpW17Q1hEdFVqed5jCvw0+n1qTzBeaiyxY9g fXjuAB4m1zwyMoZcKJpRr+VLHCmgUZDeBKnOddw4w3kGd/91+n2xhLyRCJR+SycY7VRj 235hTHn8RdEkPwaZACSmuJgL5Ki/FjQlTYqXTCvfLOv33J2E8cmzSktR5l6PPWGVdfCM pJu17sr2bq8Ll5Qoiy2hYhscex4/7VPEJEnD7r6vo7X0RZrfJSHxArX59UuorZXMh1kG haI50rzNR/No2WSG10jk004GfTKx+6UNvJOoitb8PdLkhiT83V/RB+camOWZI3qpQ0zk Fytw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=FYyR7iMW6cb4JxjheSpCVtKsPIIDuuysTksDspSm4IU=; b=cbyv1QvhXsI0hbbV8gnytDgfPXVYUPRgmMEFschDPa2JPRo5H6+7ctS223cF9qvPUI +j+tId4cuJ8ef/PZypb+jy267875SR2cgIKEm8xdO2C4R2tZzaEgBt8zatGJU+J6JEVz acP442AiQIGubxLL9FPKps9Vam5wOmxdDCBl+5UvTMKz/e6fUegaoU8yl88IqrLR3Bcx mesb7DBJ07Ckb4Nh06gOmilC7bE0HA79bsf/QAh9eQnztERQzOIe8I1m488BKu84SyE0 INF1J++lTMZ2NwvQzSpDR9if3usWu6SBFJdcYerV9VsImAoR1xlkQAgjQUrvY35Zu3Yq 0Q9g== X-Gm-Message-State: APjAAAV2SkHY4A8EFKnk0duvpLMqIhmRd0o1DPk4nivqH1vvVQ2JEWw9 mDHyWyjXclAG03ApXhYZbZU+21AS4TY= X-Google-Smtp-Source: APXvYqyGR8Fg0BYd5wcpNJcWHuSJtsPobVTNy9ZJzAlKxOpPYfVJT8hC7biomZBJIfidGSuv3UUw8w== X-Received: by 2002:a63:ff1d:: with SMTP id k29mr37196583pgi.258.1553723788129; Wed, 27 Mar 2019 14:56:28 -0700 (PDT) Received: from mangix-pc.lan (astound-69-42-18-19.ca.astound.net. [69.42.18.19]) by smtp.gmail.com with ESMTPSA id e21sm20050395pfd.177.2019.03.27.14.56.27 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Mar 2019 14:56:27 -0700 (PDT) From: Rosen Penev To: openvpn-devel@lists.sourceforge.net Date: Wed, 27 Mar 2019 14:56:26 -0700 Message-Id: <20190327215626.23502-1-rosenp@gmail.com> 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_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.215.194 listed in list.dnswl.org] 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: configure.ac] 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.215.194 listed in wl.mailspike.net] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (rosenp[at]gmail.com) -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 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders -0.3 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1h9GXH-00DHZT-NR Subject: [Openvpn-devel] [PATCH] openssl: Replace not[Before/After] functions with get0 variants 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 Also removed initialization with OpenSSL 1.1 as it is no longer needed and causes compilation errors when disabling deprecated APIs. Same with SSL_CTX_set_ecdh_auto as it got removed. Signed-off-by: Rosen Penev --- configure.ac | 2 ++ src/openvpn/openssl_compat.h | 8 ++++++++ src/openvpn/ssl_openssl.c | 18 ++++++++++++------ 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index dfb268ca..2617f344 100644 --- a/configure.ac +++ b/configure.ac @@ -922,6 +922,8 @@ if test "${with_crypto_library}" = "openssl"; then SSL_CTX_get_default_passwd_cb \ SSL_CTX_get_default_passwd_cb_userdata \ SSL_CTX_set_security_level \ + X509_get0_notBefore \ + X509_get0_notAfter \ X509_get0_pubkey \ X509_STORE_get0_objects \ X509_OBJECT_free \ diff --git a/src/openvpn/openssl_compat.h b/src/openvpn/openssl_compat.h index a4072b9a..788843a2 100644 --- a/src/openvpn/openssl_compat.h +++ b/src/openvpn/openssl_compat.h @@ -89,6 +89,14 @@ EVP_MD_CTX_new(void) } #endif +#if !defined(HAVE_X509_GET0_NOTBEFORE) +#define X509_get0_notBefore X509_get_notBefore +#endif + +#if !defined(HAVE_X509_GET0_NOTAFTER) +#define X509_get0_notAfter X509_get_notAfter +#endif + #if !defined(HAVE_HMAC_CTX_RESET) /** * Reset a HMAC context diff --git a/src/openvpn/ssl_openssl.c b/src/openvpn/ssl_openssl.c index 8bcebac4..e41cafa5 100644 --- a/src/openvpn/ssl_openssl.c +++ b/src/openvpn/ssl_openssl.c @@ -76,12 +76,13 @@ int mydata_index; /* GLOBAL */ void tls_init_lib(void) { +#if (OPENSSL_VERSION_NUMBER < 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) SSL_library_init(); -#ifndef ENABLE_SMALL +# ifndef ENABLE_SMALL SSL_load_error_strings(); -#endif +# endif OpenSSL_add_all_algorithms(); - +#endif mydata_index = SSL_get_ex_new_index(0, "struct session *", NULL, NULL, NULL); ASSERT(mydata_index >= 0); } @@ -89,9 +90,11 @@ tls_init_lib(void) void tls_free_lib(void) { +#if (OPENSSL_VERSION_NUMBER < 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) EVP_cleanup(); -#ifndef ENABLE_SMALL +# ifndef ENABLE_SMALL ERR_free_strings(); +# endif #endif } @@ -541,7 +544,7 @@ tls_ctx_check_cert_time(const struct tls_root_ctx *ctx) goto cleanup; /* Nothing to check if there is no certificate */ } - ret = X509_cmp_time(X509_get_notBefore(cert), NULL); + ret = X509_cmp_time(X509_get0_notBefore(cert), NULL); if (ret == 0) { msg(D_TLS_DEBUG_MED, "Failed to read certificate notBefore field."); @@ -551,7 +554,7 @@ tls_ctx_check_cert_time(const struct tls_root_ctx *ctx) msg(M_WARN, "WARNING: Your certificate is not yet valid!"); } - ret = X509_cmp_time(X509_get_notAfter(cert), NULL); + ret = X509_cmp_time(X509_get0_notAfter(cert), NULL); if (ret == 0) { msg(D_TLS_DEBUG_MED, "Failed to read certificate notAfter field."); @@ -634,10 +637,13 @@ tls_ctx_load_ecdh_params(struct tls_root_ctx *ctx, const char *curve_name else { #if OPENSSL_VERSION_NUMBER >= 0x10002000L +#if (OPENSSL_VERSION_NUMBER < 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) + /* OpenSSL 1.0.2 and newer can automatically handle ECDH parameter * loading */ SSL_CTX_set_ecdh_auto(ctx->ctx, 1); return; +#endif #else /* For older OpenSSL we have to extract the curve from key on our own */ EC_KEY *eckey = NULL;