From 7ba512770e358b7017a254a0ab6b99bb53302530 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Wed, 22 Jun 2022 11:58:53 +0000 Subject: [PATCH] openssl: update to 3.0.4 --- packages/security/openssl/package.mk | 4 +- ...sues-in-test-v3ext-c-with-no-rfc3779.patch | 40 +++++++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 packages/security/openssl/patches/openssl-3-0-4-0001-fix-compile-issues-in-test-v3ext-c-with-no-rfc3779.patch diff --git a/packages/security/openssl/package.mk b/packages/security/openssl/package.mk index c1fe4ed851..d45461c807 100644 --- a/packages/security/openssl/package.mk +++ b/packages/security/openssl/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="openssl" -PKG_VERSION="3.0.3" -PKG_SHA256="ee0078adcef1de5f003c62c80cc96527721609c6f3bb42b7795df31f8b558c0b" +PKG_VERSION="3.0.4" +PKG_SHA256="2831843e9a668a0ab478e7020ad63d2d65e51f72977472dc73efcefbafc0c00f" PKG_LICENSE="Apache-2.0" PKG_SITE="https://www.openssl.org" PKG_URL="https://www.openssl.org/source/${PKG_NAME}-${PKG_VERSION}.tar.gz" diff --git a/packages/security/openssl/patches/openssl-3-0-4-0001-fix-compile-issues-in-test-v3ext-c-with-no-rfc3779.patch b/packages/security/openssl/patches/openssl-3-0-4-0001-fix-compile-issues-in-test-v3ext-c-with-no-rfc3779.patch new file mode 100644 index 0000000000..27186c7266 --- /dev/null +++ b/packages/security/openssl/patches/openssl-3-0-4-0001-fix-compile-issues-in-test-v3ext-c-with-no-rfc3779.patch @@ -0,0 +1,40 @@ +From 65d6793e240643116037b4bb758e40b7db5cc7ee Mon Sep 17 00:00:00 2001 +From: Bernd Edlinger +Date: Fri, 17 Jun 2022 10:25:24 +0200 +Subject: [PATCH] Fix compile issues in test/v3ext.c with no-rfc3779 + +There are no ASIdentifiers if OPENSSL_NO_RFC3779 is defined, +therefore the test cannot be compiled. +--- + test/v3ext.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/test/v3ext.c b/test/v3ext.c +index 0d371ec280f1..29e33d16a5fa 100644 +--- a/test/v3ext.c ++++ b/test/v3ext.c +@@ -37,6 +37,7 @@ static int test_pathlen(void) + return ret; + } + ++#ifndef OPENSSL_NO_RFC3779 + static int test_asid(void) + { + ASN1_INTEGER *val1 = NULL, *val2 = NULL; +@@ -113,6 +114,7 @@ static int test_asid(void) + ASIdentifiers_free(asid4); + return testresult; + } ++#endif /* OPENSSL_NO_RFC3779 */ + + OPT_TEST_DECLARE_USAGE("cert.pem\n") + +@@ -127,6 +129,8 @@ int setup_tests(void) + return 0; + + ADD_TEST(test_pathlen); ++#ifndef OPENSSL_NO_RFC3779 + ADD_TEST(test_asid); ++#endif /* OPENSSL_NO_RFC3779 */ + return 1; + }