diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2023-06-16 13:04:53 +0800 |
---|---|---|
committer | Anuj Mittal <anuj.mittal@intel.com> | 2023-06-16 13:33:56 +0800 |
commit | 4be9abdad504b60f419fe458db7bb576badcba1d (patch) | |
tree | d9f8a82a2925cfe110010adca89fef83dead88ad /recipes-support/sbsigntool | |
parent | 2249cab0209e81bde070e3b839caf85e44d47442 (diff) | |
download | meta-intel-4be9abdad504b60f419fe458db7bb576badcba1d.tar.gz |
sbsigntool-native: upgrade to 0.9.5
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Diffstat (limited to 'recipes-support/sbsigntool')
-rw-r--r-- | recipes-support/sbsigntool/sbsigntool-native_git.bb | 6 | ||||
-rw-r--r-- | recipes-support/sbsigntool/sbsigntool/0002-fix-openssl-3-0.patch | 32 |
2 files changed, 3 insertions, 35 deletions
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 \ | |||
17 | file://lib/ccan.git/ccan/time/LICENSE;md5=838c366f69b72c5df05c96dff79b35f2 \ | 17 | file://lib/ccan.git/ccan/time/LICENSE;md5=838c366f69b72c5df05c96dff79b35f2 \ |
18 | " | 18 | " |
19 | 19 | ||
20 | SRCREV = "9cfca9fe7aa7a8e29b92fe33ce8433e212c9a8ba" | ||
20 | # The original upstream is git://kernel.ubuntu.com/jk/sbsigntool but it has | 21 | # The original upstream is git://kernel.ubuntu.com/jk/sbsigntool but it has |
21 | # not been maintained and many patches have been backported in this repo. | 22 | # not been maintained and many patches have been backported in this repo. |
22 | SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/jejb/sbsigntools.git;protocol=https;name=sbsigntools;branch=master \ | 23 | SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/jejb/sbsigntools.git;protocol=https;name=sbsigntools;branch=master \ |
23 | git://github.com/rustyrussell/ccan.git;protocol=https;destsuffix=git/lib/ccan.git;name=ccan;branch=master \ | 24 | git://github.com/rustyrussell/ccan.git;protocol=https;destsuffix=git/lib/ccan.git;name=ccan;branch=master \ |
24 | file://0001-configure-Fixup-build-dependencies-for-cross-compili.patch \ | 25 | file://0001-configure-Fixup-build-dependencies-for-cross-compili.patch \ |
25 | file://0002-fix-openssl-3-0.patch \ | 26 | " |
26 | " | ||
27 | 27 | ||
28 | SRCREV_sbsigntools ?= "f12484869c9590682ac3253d583bf59b890bb826" | 28 | SRCREV_sbsigntools ?= "f12484869c9590682ac3253d583bf59b890bb826" |
29 | SRCREV_ccan ?= "b1f28e17227f2320d07fe052a8a48942fe17caa5" | 29 | SRCREV_ccan ?= "b1f28e17227f2320d07fe052a8a48942fe17caa5" |
@@ -31,7 +31,7 @@ SRCREV_FORMAT = "sbsigntools_ccan" | |||
31 | 31 | ||
32 | DEPENDS = "binutils-native gnu-efi-native help2man-native openssl-native util-linux-native" | 32 | DEPENDS = "binutils-native gnu-efi-native help2man-native openssl-native util-linux-native" |
33 | 33 | ||
34 | PV = "0.9.4-git${SRCPV}" | 34 | PV = "0.9.5" |
35 | 35 | ||
36 | S = "${WORKDIR}/git" | 36 | S = "${WORKDIR}/git" |
37 | 37 | ||
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 @@ | |||
1 | Use ASN1_ITEM_rptr() instead of taking the address of IDC_PEID_it. | ||
2 | |||
3 | openssl-3.0 changed the type of TYPE_it from `const ASN1_ITEM TYPE_it` to | ||
4 | `const ASN1_ITEM *TYPE_it(void)`. This was previously hidden behind | ||
5 | OPENSSL_EXPORT_VAR_AS_FUNCTION but in 3.0 only the function version is | ||
6 | available. This change should have been transparent to the application, but | ||
7 | only if the `ASN1_ITEM_rptr()` macro is used. | ||
8 | |||
9 | This change passes `make check` with both openssl 1.1 and 3.0. | ||
10 | |||
11 | Signed-off-by: Jeremi Piotrowski <jpiotrowski@microsoft.com> | ||
12 | Upstream-status: Submited [https://groups.io/g/sbsigntools/topic/patch_fix_openssl_3_0_issue/85903418] | ||
13 | --- | ||
14 | src/idc.c | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/src/idc.c b/src/idc.c | ||
18 | index 6d87bd4..0a82218 100644 | ||
19 | --- a/src/idc.c | ||
20 | +++ b/src/idc.c | ||
21 | @@ -189,7 +189,7 @@ int IDC_set(PKCS7 *p7, PKCS7_SIGNER_INFO *si, struct image *image) | ||
22 | |||
23 | idc->data->type = OBJ_nid2obj(peid_nid); | ||
24 | idc->data->value = ASN1_TYPE_new(); | ||
25 | - type_set_sequence(image, idc->data->value, peid, &IDC_PEID_it); | ||
26 | + type_set_sequence(image, idc->data->value, peid, ASN1_ITEM_rptr(IDC_PEID)); | ||
27 | |||
28 | idc->digest->alg->parameter = ASN1_TYPE_new(); | ||
29 | idc->digest->alg->algorithm = OBJ_nid2obj(NID_sha256); | ||
30 | -- | ||
31 | 2.25.1 | ||
32 | |||