From 1d608a8560a4c827093e4dac9e8e1b7d80ba7497 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Tue, 28 Sep 2021 10:46:08 +0200 Subject: [PATCH] app-crypt/sbsigntools: add patch to support opensslv3 See also: https://groups.io/g/sbsigntools/topic/patch_fix_openssl_3_0_issue/85903418?p=,,,20,0,0,0::recentpostdate/sticky,,,20,2,0,85903418,previd=1632756467394580924,nextid=1591489833755102589&previd=1632756467394580924&nextid=1591489833755102589 Signed-off-by: Mathieu Tortuyaux --- .../sbsigntools/files/openssl-3-compat.patch | 15 +++++++++++++++ .../sbsigntools/sbsigntools-0.9.1-r1.ebuild | 1 + 2 files changed, 16 insertions(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntools/files/openssl-3-compat.patch diff --git a/sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntools/files/openssl-3-compat.patch b/sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntools/files/openssl-3-compat.patch new file mode 100644 index 0000000000..2304bd432a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntools/files/openssl-3-compat.patch @@ -0,0 +1,15 @@ +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 diff --git a/sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntools/sbsigntools-0.9.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntools/sbsigntools-0.9.1-r1.ebuild index dfa056c857..2038568d48 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntools/sbsigntools-0.9.1-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntools/sbsigntools-0.9.1-r1.ebuild @@ -28,6 +28,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}"/${P}-openssl-1.1.0-compat.patch + "${FILESDIR}"/openssl-3-compat.patch ) src_prepare() {