From patchwork Fri Jan 18 00:10:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vadym Kochan X-Patchwork-Id: 1027055 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="vYLUfxwf"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43gh2p6Tt0z9sCh for ; Fri, 18 Jan 2019 11:02:26 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5D11C85FD7; Fri, 18 Jan 2019 00:02:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pLhfkJBCTBwV; Fri, 18 Jan 2019 00:02:22 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 18FFC85FB4; Fri, 18 Jan 2019 00:02:22 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id E836E1BF834 for ; Fri, 18 Jan 2019 00:02:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id E5A84878FE for ; Fri, 18 Jan 2019 00:02:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id dWhWiEQWAx2s for ; Fri, 18 Jan 2019 00:02:20 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lf1-f66.google.com (mail-lf1-f66.google.com [209.85.167.66]) by hemlock.osuosl.org (Postfix) with ESMTPS id 12E0A878F0 for ; Fri, 18 Jan 2019 00:02:20 +0000 (UTC) Received: by mail-lf1-f66.google.com with SMTP id y14so9155958lfg.13 for ; Thu, 17 Jan 2019 16:02:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=lBSYcEXpf/L24f2DZbgd/7Lycw/y+3iDmrExkzw0Xto=; b=vYLUfxwfpm+EzgDR6YmifmRNyI92bfRjBKOOyvN28yO3e4An0DvFIVjtixroPvIoT6 o9nlQL5qH1fhUdXZFQnuCwWNBJ5EvBx4jHEJi1dZV8VSYokZdjTJm/7vTO0w2LL8+8ko dqulCCX+Hq1AxG6AxK09te+czsBRseajIYmvvpGrUu4iRsjpOPJqS1PeL0Yt33ksWs2+ A9/atzqYN9I0N1sIY3p7oKFZFdws5ozJi65XYYTVBv3LFvU1F7qsHsqR3+Eea8dYwLyu 2ASdovyLcvNQ/agJg5TwHs5JS2oCCWcuelJriDrhXiGSg2QlWg1UvW5h/GJTDbcYTyIR XqvA== 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=lBSYcEXpf/L24f2DZbgd/7Lycw/y+3iDmrExkzw0Xto=; b=VGou/fe1SIRJK7KeEDT1vYj14riNH/lxgBnBdmgpArS1t8Ivt/ZaVDgrgCDZQY5K8I TJDxGpxJX/uNtxzTWgy4d5H+s/Nku15dQe8CRQ4EzsxgxTKsG8X7rrAZPPxuShwbXX6w kq7xu8fdOCe/worC6dH7xh8V+Ekh4BS+LuP2knP4cokd6v6/IaAVKEffbeEOJzw5HwL4 GnSY9BpvI2RsGVLJMJ9LTLcV7APbtZZDNTYtw0MW0L9+Kgp1Zd9SNodqVMrHz3Y/oSIx KhVwpDaNLH8/bx/dmsjFXrwyocnfCsfLscTfKmTEhMlDqJQRMpwYBQOzuwr7H6kd3PRD el3Q== X-Gm-Message-State: AJcUukdz4lfytaUYWHRGv0jBCes8IvCylfrkgaQqxXeSIuwGzDhcupDS W3vUUwTcg6ffGHk5y8gauVBxMTrR X-Google-Smtp-Source: ALg8bN7Fm2lxC7VFqfT1WhYOWYRRQC34jo+UwPan2dVA/88XtjGXIeXezbuAf1MWilAVarGT5WiA5A== X-Received: by 2002:a19:24c6:: with SMTP id k189mr11667009lfk.77.1547769737661; Thu, 17 Jan 2019 16:02:17 -0800 (PST) Received: from vkochan-ThinkPad-T470p.lan ([213.109.80.185]) by smtp.gmail.com with ESMTPSA id q20sm518039lfj.20.2019.01.17.16.02.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Jan 2019 16:02:17 -0800 (PST) From: Vadim Kochan To: buildroot@buildroot.org Date: Fri, 18 Jan 2019 02:10:59 +0200 Message-Id: <20190118001059.6045-1-vadim4j@gmail.com> X-Mailer: git-send-email 2.14.1 Subject: [Buildroot] [PATCH 1/1] package/libshout: Add support for openssl 1.1.x X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bernd Kuhls , Peter Seiderer , Vadim Kochan , Ryan Coe MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Added patch from Debian: https://sources.debian.org/data/main/libs/libshout/2.4.1-2/debian/patches/01-libshout-tls-compile-with-OpenSSL-1.1.0.patch Signed-off-by: Vadim Kochan --- ...3-libshout-tls-compile-with-OpenSSL-1.1.0.patch | 58 ++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 package/libshout/0003-libshout-tls-compile-with-OpenSSL-1.1.0.patch diff --git a/package/libshout/0003-libshout-tls-compile-with-OpenSSL-1.1.0.patch b/package/libshout/0003-libshout-tls-compile-with-OpenSSL-1.1.0.patch new file mode 100644 index 0000000000..befd16e384 --- /dev/null +++ b/package/libshout/0003-libshout-tls-compile-with-OpenSSL-1.1.0.patch @@ -0,0 +1,58 @@ +From 01fafc449f0de56743d08e7976933c49e2915bfa Mon Sep 17 00:00:00 2001 +From: Sebastian Andrzej Siewior +Date: Wed, 15 Nov 2017 12:46:25 +0000 +Subject: [PATCH] tls: compile with OpenSSL 1.1.0 + +The init functions are not longer required in OpenSSL 1.1 so I dropped +them. + +TLSv1_client_method() should not be used because it enables only the +TLSv1.0 protocol. Better is to use SSLv23_client_method() which enable +all the protocols including TLSv1.2. With this functions SSLv2 and SSLv3 +is theoretically possible but as of today those protocols are usually +build-time disabled. +To avoid all this OpenSSL 1.1 provides TLS_client_method() which is aim +to provide to highest TLS protocol version (same as +SSLv23_client_method() but it is deprecated in 1.1). + +Signed-off-by: Sebastian Andrzej Siewior +--- + src/tls.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/src/tls.c b/src/tls.c +index 4562c7327077..e0e5c1a5f079 100644 +--- a/src/tls.c ++++ b/src/tls.c +@@ -24,6 +24,7 @@ + #endif + + #include ++#include + #include "shout_private.h" + + #ifndef XXX_HAVE_X509_check_host +@@ -61,14 +62,17 @@ shout_tls_t *shout_tls_new(shout_t *self, sock_t socket) + + static inline int tls_setup(shout_tls_t *tls) + { +- SSL_METHOD *meth; +- ++ const SSL_METHOD *meth; ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) + SSL_library_init(); + SSL_load_error_strings(); + SSLeay_add_all_algorithms(); +- SSLeay_add_ssl_algorithms(); ++ SSLeay_add_ssl_algorithms(); + +- meth = TLSv1_client_method(); ++ meth = SSLv23_client_method(); ++#else ++ meth = TLS_client_method(); ++#endif + if (!meth) + goto error; + +-- +2.15.0