diff options
Diffstat (limited to 'recipes-support/sbsigntool/sbsigntool/0002-fix-openssl-3-0.patch')
-rw-r--r-- | recipes-support/sbsigntool/sbsigntool/0002-fix-openssl-3-0.patch | 32 |
1 files changed, 0 insertions, 32 deletions
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 | |||