From patchwork Sat Jun 16 01:40:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 930299 X-Patchwork-Delegate: nbd@openwrt.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="JQLDdbJD"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="nSvUnm4T"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4170SZ2P1hz9s2R for ; Sat, 16 Jun 2018 11:41:16 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:Message-Id:Date:To: From:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=J/oVSJMVpbI4mY0OhdU9i5Sn3FzHL89doCb/9aV+axs=; b=JQLDdbJD0dxukJ rWqJNJnUg0m/l3uwrEBX6xS24pfVHe9t8qjqkJG59PwYTJWjsh3VTu5cjTE2yVmOn2KbS4idLufol CKGdE7/rXc0HQThNPwwHX6ANXbkudLBGtbQVxfQfL84+ctLKWkdqV7IH7lIC+boIaVXqBvtk9motb EfUEiRD7J/4kOrIELP+kSgiEjiv12KQaU+QPbNDZ9iXRHI560TdHeacYTs0jRtbqoH85KOzSUrk4B 5Yxv/YWTmkefFPEMM6V0Ew6+xn2VyBoHbS8z5wRN8WLemg2S3pDczPTxMYuFjZzIVCukLVaJOTC83 Nhtgg6cIW75gFCESc2OA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fU0D2-0001Ks-7X; Sat, 16 Jun 2018 01:40:56 +0000 Received: from mail-pl0-x244.google.com ([2607:f8b0:400e:c01::244]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fU0Cz-0001J0-Nk for lede-dev@lists.infradead.org; Sat, 16 Jun 2018 01:40:55 +0000 Received: by mail-pl0-x244.google.com with SMTP id f1-v6so6184832plt.6 for ; Fri, 15 Jun 2018 18:40:41 -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=Ucpl0XhRwCFk5VTTMXRIGwg8o9y5TREjlJUbX/R8j5A=; b=nSvUnm4TZBq9PeuLaxHlqYo6vEriKK3N4OUmIwSmrN1nzMffKIZfvayePGMkweT13K QaGYekqG/nI0/oZ2lVFqie28VmKvbi03X6IvW9EbrQU1F/LmJ/gsEiykWzzY2JXNHCUn 0Adnh/oy6ZOmWvWtMsduFPbM1G9FOAPn6dbRyl+ywQuj7YV7QSeQ+Dy//KKvf6Bfieo2 OK/vaRWPLmWFFfkmoA5eB19sa6tTMV19GbWQMpAwKPXCMoVx80BMT0ZO5aATOXoxGV96 Pkclzgpyi13HBci/1+lhji9z/2IMM4dKXpC+bIVasAz7VFQX9NqS8sd9sjecTH6KBZBe +GHQ== 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=Ucpl0XhRwCFk5VTTMXRIGwg8o9y5TREjlJUbX/R8j5A=; b=ulkYHHFjsvxs2ItkfzoHUQql/gFD509Xkjw4E0Bts7BcfUW1uDopW+goM0e8V5YWUr tbnMoYE1lZVZNwy+OagmIp/zayw/AAWGVyj83zWj3WkhanyQkaM2DLeI7RaQ/nSQFhWO yy7pjjPtFPUZrq0KiY+NuahHLsNxI/ospAVNcb/d2/znqerxyypdqOMaPQKaHKVvZLO/ DCmk+A6BBXwaoJ1srDcilpxIcJXxot2zY1hCB52R1F6ZgI2iIpIxG3tN4/kosV9zlRsF aI9CVkJhbmPg6znGd7tKCR7YwBfPtsNpno949xunM+qICpYyBK+Jrpn3xhB7AJTF6jAJ uvkw== X-Gm-Message-State: APt69E0p7MaoC4TcGj9k1zPoUXtTI8T/L+P/CkJ1VUL6U1XsQZ1pXd33 efIyEiJZ+ecUCh3BcK3iGwQmMttt X-Google-Smtp-Source: ADUXVKJibCZbre7IjS4NPaDeSHNNIkYRoPIzOKkJhG2Xno+cZd+8aMJrqhyxWe9AZtDBCzoH9AxqLw== X-Received: by 2002:a17:902:343:: with SMTP id 61-v6mr4623912pld.344.1529113241086; Fri, 15 Jun 2018 18:40:41 -0700 (PDT) Received: from clevo-mangix.lan (astound-69-42-5-101.ca.astound.net. [69.42.5.101]) by smtp.gmail.com with ESMTPSA id v13-v6sm18160731pfa.131.2018.06.15.18.40.39 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 15 Jun 2018 18:40:40 -0700 (PDT) From: Rosen Penev To: openwrt-devel@lists.openwrt.org Date: Fri, 15 Jun 2018 18:40:39 -0700 Message-Id: <20180616014039.14842-1-rosenp@gmail.com> X-Mailer: git-send-email 2.17.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180615_184053_796994_64858B0F X-CRM114-Status: GOOD ( 11.85 ) X-Spam-Score: 1.3 (+) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (1.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2607:f8b0:400e:c01:0:0:0:244 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (rosenp[at]gmail.com) 0.0 DKIM_ADSP_CUSTOM_MED No valid author signature, adsp_override is CUSTOM_MED -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 0.0 T_DKIM_INVALID DKIM-Signature header exists but is not valid 1.2 NML_ADSP_CUSTOM_MED ADSP custom_med hit, and not from a mailing list Subject: [OpenWrt-Devel] [PATCH] hostapd: Fix compile with OpenSSL 1.1.0 + no deprecated APIs X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Signed-off-by: Rosen Penev --- .../hostapd/patches/500-fix-openssl-11.patch | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 package/network/services/hostapd/patches/500-fix-openssl-11.patch diff --git a/package/network/services/hostapd/patches/500-fix-openssl-11.patch b/package/network/services/hostapd/patches/500-fix-openssl-11.patch new file mode 100644 index 0000000000..918cab0899 --- /dev/null +++ b/package/network/services/hostapd/patches/500-fix-openssl-11.patch @@ -0,0 +1,40 @@ +From 672540d4ddbd24782b5c65b35d636bdfe8a90d0f Mon Sep 17 00:00:00 2001 +From: Rosen Penev +Date: Fri, 15 Jun 2018 18:35:30 -0700 +Subject: [PATCH] Fix compile with OpenSSL 1.1.0 and deprecated APIs + +SSL_session_reused is the same as SSL_cache_hit. The engine load stuff is +now handled by OPENSSL_init. + +Signed-off-by: Rosen Penev +--- + src/crypto/tls_openssl.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c +index b4bfc9b73..79ac909d0 100644 +--- a/src/crypto/tls_openssl.c ++++ b/src/crypto/tls_openssl.c +@@ -1024,8 +1024,10 @@ void * tls_init(const struct tls_config *conf) + + #ifndef OPENSSL_NO_ENGINE + wpa_printf(MSG_DEBUG, "ENGINE: Loading dynamic engine"); ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + ERR_load_ENGINE_strings(); + ENGINE_load_dynamic(); ++#endif /* OPENSSL_VERSION_NUMBER */ + + if (conf && + (conf->opensc_engine_path || conf->pkcs11_engine_path || +@@ -3874,7 +3876,7 @@ struct wpabuf * tls_connection_decrypt(void *tls_ctx, + + int tls_connection_resumed(void *ssl_ctx, struct tls_connection *conn) + { +- return conn ? SSL_cache_hit(conn->ssl) : 0; ++ return conn ? SSL_session_reused(conn->ssl) : 0; + } + + +-- +2.17.1 +