From 4be9abdad504b60f419fe458db7bb576badcba1d Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Fri, 16 Jun 2023 13:04:53 +0800 Subject: sbsigntool-native: upgrade to 0.9.5 Signed-off-by: Anuj Mittal --- .../sbsigntool/sbsigntool-native_git.bb | 6 ++-- .../sbsigntool/0002-fix-openssl-3-0.patch | 32 ---------------------- 2 files changed, 3 insertions(+), 35 deletions(-) delete mode 100644 recipes-support/sbsigntool/sbsigntool/0002-fix-openssl-3-0.patch (limited to 'recipes-support/sbsigntool') diff --git a/recipes-support/sbsigntool/sbsigntool-native_git.bb b/recipes-support/sbsigntool/sbsigntool-native_git.bb index a45a3dea..ba84ff4a 100644 --- a/recipes-support/sbsigntool/sbsigntool-native_git.bb +++ b/recipes-support/sbsigntool/sbsigntool-native_git.bb @@ -17,13 +17,13 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPLv3;md5=9eef91148a9b14ec7f9df333daebc746 \ file://lib/ccan.git/ccan/time/LICENSE;md5=838c366f69b72c5df05c96dff79b35f2 \ " +SRCREV = "9cfca9fe7aa7a8e29b92fe33ce8433e212c9a8ba" # The original upstream is git://kernel.ubuntu.com/jk/sbsigntool but it has # not been maintained and many patches have been backported in this repo. SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/jejb/sbsigntools.git;protocol=https;name=sbsigntools;branch=master \ git://github.com/rustyrussell/ccan.git;protocol=https;destsuffix=git/lib/ccan.git;name=ccan;branch=master \ file://0001-configure-Fixup-build-dependencies-for-cross-compili.patch \ - file://0002-fix-openssl-3-0.patch \ - " + " SRCREV_sbsigntools ?= "f12484869c9590682ac3253d583bf59b890bb826" SRCREV_ccan ?= "b1f28e17227f2320d07fe052a8a48942fe17caa5" @@ -31,7 +31,7 @@ SRCREV_FORMAT = "sbsigntools_ccan" DEPENDS = "binutils-native gnu-efi-native help2man-native openssl-native util-linux-native" -PV = "0.9.4-git${SRCPV}" +PV = "0.9.5" S = "${WORKDIR}/git" diff --git a/recipes-support/sbsigntool/sbsigntool/0002-fix-openssl-3-0.patch b/recipes-support/sbsigntool/sbsigntool/0002-fix-openssl-3-0.patch deleted file mode 100644 index 8a277947..00000000 --- a/recipes-support/sbsigntool/sbsigntool/0002-fix-openssl-3-0.patch +++ /dev/null @@ -1,32 +0,0 @@ -Use ASN1_ITEM_rptr() instead of taking the address of IDC_PEID_it. - -openssl-3.0 changed the type of TYPE_it from `const ASN1_ITEM TYPE_it` to -`const ASN1_ITEM *TYPE_it(void)`. This was previously hidden behind -OPENSSL_EXPORT_VAR_AS_FUNCTION but in 3.0 only the function version is -available. This change should have been transparent to the application, but -only if the `ASN1_ITEM_rptr()` macro is used. - -This change passes `make check` with both openssl 1.1 and 3.0. - -Signed-off-by: Jeremi Piotrowski -Upstream-status: Submited [https://groups.io/g/sbsigntools/topic/patch_fix_openssl_3_0_issue/85903418] ---- - src/idc.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/idc.c b/src/idc.c -index 6d87bd4..0a82218 100644 ---- a/src/idc.c -+++ b/src/idc.c -@@ -189,7 +189,7 @@ int IDC_set(PKCS7 *p7, PKCS7_SIGNER_INFO *si, struct image *image) - - idc->data->type = OBJ_nid2obj(peid_nid); - idc->data->value = ASN1_TYPE_new(); -- type_set_sequence(image, idc->data->value, peid, &IDC_PEID_it); -+ type_set_sequence(image, idc->data->value, peid, ASN1_ITEM_rptr(IDC_PEID)); - - idc->digest->alg->parameter = ASN1_TYPE_new(); - idc->digest->alg->algorithm = OBJ_nid2obj(NID_sha256); --- -2.25.1 - -- cgit v1.2.3-54-g00ecf