Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 38255C6FA8F for ; Wed, 30 Aug 2023 08:00:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id D051C81DE3; Wed, 30 Aug 2023 08:00:25 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org D051C81DE3 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id F8NMfte6kuU2; Wed, 30 Aug 2023 08:00:25 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id 0896681EB7; Wed, 30 Aug 2023 08:00:24 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 0896681EB7 Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id D08211BF83A for ; Wed, 30 Aug 2023 08:00:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id A744941579 for ; Wed, 30 Aug 2023 08:00:21 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org A744941579 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id c_Q5L2YL4GHx for ; Wed, 30 Aug 2023 08:00:20 +0000 (UTC) Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by smtp2.osuosl.org (Postfix) with ESMTPS id 57A6141592 for ; Wed, 30 Aug 2023 08:00:20 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 57A6141592 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-401da71b85eso11124565e9.1 for ; Wed, 30 Aug 2023 01:00:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693382418; x=1693987218; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=1Ewp2IXLPZvFMP7e5RjBuUh9NcWaNSWucm5SlEWC66c=; b=Cd5/zoeu/rHdF0hCfuiHOTXdr5vh4OV3chPtkyAM8HHb2qwU2GiEykvOH/uvXhyxl1 pRbh9HwSnBb+yAV4TBKnghKmV1de0sZfbJiLUeQwu7/0f7cCTeekErojFwsBdDAs4CEp X71Ah+E3fq1yoUXeSXbrfeUp5w3wNxhmAyWqKqY4RlUoke9mK3xgJLV37R8z1LRFc83h S/fPHx0jNyZ//HQiWKhNXBwwQKXlkl77ZFVqjVH3pai/P4v7kVnq4xB4M3s5gG+lHbOj zloUYAjr0Y5WImqX0/LkSbavKVUbkY6wFKeUAznc9mM37iTKpk/7KWaX76BuP9pPufgC tMIQ== X-Gm-Message-State: AOJu0Ywnhm/yrOJWEX7KsNENZoy3GWKx976yD090iFez4a+yOgeXPrI2 UZnMUEoOezlMnnjOh1Ps2EY1AHUOcYoGiw== X-Google-Smtp-Source: AGHT+IF0AyPE3a4mEw5Ntq0HhkCFmuwOuFKWNNevGUDx/EUjWDNjUuBFNof4T8zxeCshh1887BhyQA== X-Received: by 2002:a05:600c:24d:b0:3f9:c82e:9d87 with SMTP id 13-20020a05600c024d00b003f9c82e9d87mr1296176wmj.13.1693382417597; Wed, 30 Aug 2023 01:00:17 -0700 (PDT) Received: from thomas-OptiPlex-7090.nmg.localnet (d528f5fc4.static.telenet.be. [82.143.95.196]) by smtp.gmail.com with ESMTPSA id 19-20020a05600c235300b003feea62440bsm1391698wmq.43.2023.08.30.01.00.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Aug 2023 01:00:17 -0700 (PDT) From: Thomas Devoogdt X-Google-Original-From: Thomas Devoogdt To: buildroot@buildroot.org Date: Wed, 30 Aug 2023 10:00:13 +0200 Message-ID: <20230830080013.1862029-1-thomas.devoogdt@barco.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693382418; x=1693987218; darn=buildroot.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=1Ewp2IXLPZvFMP7e5RjBuUh9NcWaNSWucm5SlEWC66c=; b=LTFrLf7pbdIVrfxBXbGhLG/R+1fl5+8ZFmYCuSX4tllDiIiL7VAFwLNAATWcMPY6Yk rUewKXQua+GChSOjkm5GVQAWwf8e36kT7IShHmhSmPiPdpnGyCCt/SUq2tcUHY33mN9K J4RTzNSnjKqp3reEYV5oTSLgmrSfgMmlB3jV29pYUlTfEElfVx4YXlfdVIGGgpjVe1Ie bkHF8mvjLh7Tw0QZwDENkOxEcYi2xPYbfDN6XGlvYQ3mcmEgF8lmxoZfFd02s7w6dM6n i5L3sZ0x+Pdq4XAvUP/WBkg3OIK0B7mOMQdjurb1IzQcqcvwvYdhiIlbGr0rqlhPBT77 xZZg== X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=LTFrLf7p Subject: [Buildroot] [PATCH v2] package/libsrtp: bump to version 2.5.0 X-BeenThere: buildroot@buildroot.org 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: Gregory Dymarek , Thomas Devoogdt Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" https://github.com/cisco/libsrtp/releases/tag/v2.5.0 See detailed change log: https://github.com/cisco/libsrtp/blob/v2.5.0/CHANGES#L3-L43 Dropped patch wich was already upstream. Signed-off-by: Thomas Devoogdt --- v2: update .checkpackageignore --- .checkpackageignore | 1 - ...legacy-OpenSSL-to-fix-LibreSSL-build.patch | 86 ------------------- package/libsrtp/libsrtp.hash | 2 +- package/libsrtp/libsrtp.mk | 2 +- 4 files changed, 2 insertions(+), 89 deletions(-) delete mode 100644 package/libsrtp/0001-Remove-compatibility-code-for-legacy-OpenSSL-to-fix-LibreSSL-build.patch diff --git a/.checkpackageignore b/.checkpackageignore index f943153de9..3e0aaaf253 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -788,7 +788,6 @@ package/libsoxr/0001-Add-Libs.private-for-static-linking.patch Upstream package/libspatialindex/0001-allow-building-static-libs.patch Upstream package/libspatialindex/0002-CMakeLists.txt-fix-CMAKE_BUILD_TYPE.patch Upstream package/libsquish/0001-Makefile-add-f-option-for-ln-to-remove-existing-dest.patch Upstream -package/libsrtp/0001-Remove-compatibility-code-for-legacy-OpenSSL-to-fix-LibreSSL-build.patch Upstream package/libsvg/0001-fix-expat-static-declaration.patch Upstream package/libsvg/0002-Fix-undefined-symbol-png_set_gray_1_2_4_to_8.patch Upstream package/libsvgtiny/0001-disable-debug-printfs.patch Upstream diff --git a/package/libsrtp/0001-Remove-compatibility-code-for-legacy-OpenSSL-to-fix-LibreSSL-build.patch b/package/libsrtp/0001-Remove-compatibility-code-for-legacy-OpenSSL-to-fix-LibreSSL-build.patch deleted file mode 100644 index 68bfb085f7..0000000000 --- a/package/libsrtp/0001-Remove-compatibility-code-for-legacy-OpenSSL-to-fix-LibreSSL-build.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 16483b18a9980575bee23898b2dbfbe2a4675d84 Mon Sep 17 00:00:00 2001 -From: Klemens Nanni -Date: Sat, 15 Jan 2022 23:19:35 +0300 -Subject: [PATCH] Remove compatibility code for legacy OpenSSL to fix LibreSSL - build - -In current LibreSSL, `HMAC_CTX` aka. `struct hmac_ctx_st` is an opaque -structure as of LibreSSL hmac.h revision 1.15 (14.01.2022) [0], thus -`sizeof(HMAC_CTX)` fails to compile. - -The non-legacy code path should compile with LibreSSL versions as old -as 2.7.0 (21.03.2018). - -Found while building https://github.com/desktop-app/tg_owt which bundles -libsrtp 2.2.0 [1] on OpenBSD 7.0 -CURRENT/with latest LibreSSL. - -Suggestion to remove the legacy code from Theo Buehler, thanks. - -0: http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/lib/libcrypto/hmac/hmac.h?rev=1.15&content-type=text/x-cvsweb-markup -1: https://github.com/desktop-app/tg_owt/blob/6708e0d31a73e64fe12f54829bf4060c41b2658e/src/third_party/libsrtp/crypto/hash/hmac_ossl.c#L85 - -[Retrieved from: -https://github.com/cisco/libsrtp/commit/16483b18a9980575bee23898b2dbfbe2a4675d84] -Signed-off-by: Fabrice Fontaine ---- - crypto/hash/hmac_ossl.c | 29 ----------------------------- - 1 file changed, 29 deletions(-) - -diff --git a/crypto/hash/hmac_ossl.c b/crypto/hash/hmac_ossl.c -index ee6b0b58..c23c7f21 100644 ---- a/crypto/hash/hmac_ossl.c -+++ b/crypto/hash/hmac_ossl.c -@@ -78,26 +78,6 @@ static srtp_err_status_t srtp_hmac_alloc(srtp_auth_t **a, - return srtp_err_status_bad_param; - } - --/* OpenSSL 1.1.0 made HMAC_CTX an opaque structure, which must be allocated -- using HMAC_CTX_new. But this function doesn't exist in OpenSSL 1.0.x. */ --#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER -- { -- /* allocate memory for auth and HMAC_CTX structures */ -- uint8_t *pointer; -- HMAC_CTX *new_hmac_ctx; -- pointer = (uint8_t *)srtp_crypto_alloc(sizeof(HMAC_CTX) + -- sizeof(srtp_auth_t)); -- if (pointer == NULL) { -- return srtp_err_status_alloc_fail; -- } -- *a = (srtp_auth_t *)pointer; -- (*a)->state = pointer + sizeof(srtp_auth_t); -- new_hmac_ctx = (HMAC_CTX *)((*a)->state); -- -- HMAC_CTX_init(new_hmac_ctx); -- } -- --#else - *a = (srtp_auth_t *)srtp_crypto_alloc(sizeof(srtp_auth_t)); - if (*a == NULL) { - return srtp_err_status_alloc_fail; -@@ -109,7 +89,6 @@ static srtp_err_status_t srtp_hmac_alloc(srtp_auth_t **a, - *a = NULL; - return srtp_err_status_alloc_fail; - } --#endif - - /* set pointers */ - (*a)->type = &srtp_hmac; -@@ -126,18 +105,10 @@ static srtp_err_status_t srtp_hmac_dealloc(srtp_auth_t *a) - - hmac_ctx = (HMAC_CTX *)a->state; - --#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER -- HMAC_CTX_cleanup(hmac_ctx); -- -- /* zeroize entire state*/ -- octet_string_set_to_zero(a, sizeof(HMAC_CTX) + sizeof(srtp_auth_t)); -- --#else - HMAC_CTX_free(hmac_ctx); - - /* zeroize entire state*/ - octet_string_set_to_zero(a, sizeof(srtp_auth_t)); --#endif - - /* free memory */ - srtp_crypto_free(a); diff --git a/package/libsrtp/libsrtp.hash b/package/libsrtp/libsrtp.hash index 8e51e68ac2..f95dc2e7b0 100644 --- a/package/libsrtp/libsrtp.hash +++ b/package/libsrtp/libsrtp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3b1bcb14ebda572b04b9bdf07574a449c84cb924905414e4d94e62837d22b628 libsrtp-2.4.2.tar.gz +sha256 8a43ef8e9ae2b665292591af62aa1a4ae41e468b6d98d8258f91478735da4e09 libsrtp-2.5.0.tar.gz sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae LICENSE diff --git a/package/libsrtp/libsrtp.mk b/package/libsrtp/libsrtp.mk index e7a771c6b2..0ffdd98283 100644 --- a/package/libsrtp/libsrtp.mk +++ b/package/libsrtp/libsrtp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSRTP_VERSION = 2.4.2 +LIBSRTP_VERSION = 2.5.0 LIBSRTP_SITE = $(call github,cisco,libsrtp,v$(LIBSRTP_VERSION)) LIBSRTP_INSTALL_STAGING = YES LIBSRTP_LICENSE = BSD-3-Clause -- 2.41.0 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot