1 |
commit: b0c21fbbcd45cea8afada073831869d39e152fa8 |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Thu Oct 1 18:23:49 2020 +0000 |
4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Oct 9 13:44:27 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0c21fbb |
7 |
|
8 |
app-crypt/sbsigntools: remove unused patches |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/17740 |
11 |
Package-Manager: Portage-3.0.8, Repoman-3.0.1 |
12 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
13 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
14 |
|
15 |
.../files/0002-image.c-clear-image-variable.patch | 29 ---------------- |
16 |
.../files/0003-Fix-for-multi-sign.patch | 39 ---------------------- |
17 |
2 files changed, 68 deletions(-) |
18 |
|
19 |
diff --git a/app-crypt/sbsigntools/files/0002-image.c-clear-image-variable.patch b/app-crypt/sbsigntools/files/0002-image.c-clear-image-variable.patch |
20 |
deleted file mode 100644 |
21 |
index dfe183e66cd..00000000000 |
22 |
--- a/app-crypt/sbsigntools/files/0002-image.c-clear-image-variable.patch |
23 |
+++ /dev/null |
24 |
@@ -1,29 +0,0 @@ |
25 |
-From 21e984fa9d93a760cc03f5d9d13d023809227df2 Mon Sep 17 00:00:00 2001 |
26 |
-From: James Bottomley <JBottomley@×××××××××.com> |
27 |
-Date: Thu, 11 Apr 2013 21:12:17 -0700 |
28 |
-Subject: image.c: clear image variable |
29 |
- |
30 |
-Not zeroing the image after talloc occasionally leads to a segfault because |
31 |
-the programme thinks it has a signature when in reality it just has a junk |
32 |
-pointer and segfaults. |
33 |
- |
34 |
-Signed-off-by: James Bottomley <JBottomley@×××××××××.com> |
35 |
---- |
36 |
- src/image.c | 1 + |
37 |
- 1 file changed, 1 insertion(+) |
38 |
- |
39 |
-diff --git a/src/image.c b/src/image.c |
40 |
-index cc55791..10eba0e 100644 |
41 |
---- a/src/image.c |
42 |
-+++ b/src/image.c |
43 |
-@@ -401,6 +401,7 @@ struct image *image_load(const char *filename) |
44 |
- return NULL; |
45 |
- } |
46 |
- |
47 |
-+ memset(image, 0, sizeof(*image)); |
48 |
- rc = fileio_read_file(image, filename, &image->buf, &image->size); |
49 |
- if (rc) |
50 |
- goto err; |
51 |
--- |
52 |
-1.8.2.1 |
53 |
- |
54 |
|
55 |
diff --git a/app-crypt/sbsigntools/files/0003-Fix-for-multi-sign.patch b/app-crypt/sbsigntools/files/0003-Fix-for-multi-sign.patch |
56 |
deleted file mode 100644 |
57 |
index f42c69616d1..00000000000 |
58 |
--- a/app-crypt/sbsigntools/files/0003-Fix-for-multi-sign.patch |
59 |
+++ /dev/null |
60 |
@@ -1,39 +0,0 @@ |
61 |
-From e58a528ef57e53008222f238cce7c326a14572e2 Mon Sep 17 00:00:00 2001 |
62 |
-From: James Bottomley <JBottomley@×××××××××.com> |
63 |
-Date: Mon, 30 Sep 2013 19:25:37 -0700 |
64 |
-Subject: [PATCH 4/4] Fix for multi-sign |
65 |
- |
66 |
-The new Tianocore multi-sign code fails now for images signed with |
67 |
-sbsigntools. The reason is that we don't actually align the signature table, |
68 |
-we just slap it straight after the binary data. Unfortunately, the new |
69 |
-multi-signature code checks that our alignment offsets are correct and fails |
70 |
-the signature for this reason. Fix by adding junk to the end of the image to |
71 |
-align the signature section. |
72 |
- |
73 |
-Signed-off-by: James Bottomley <JBottomley@×××××××××.com> |
74 |
---- |
75 |
- src/image.c | 8 +++++++- |
76 |
- 1 file changed, 7 insertions(+), 1 deletion(-) |
77 |
- |
78 |
-diff --git a/src/image.c b/src/image.c |
79 |
-index 10eba0e..519e288 100644 |
80 |
---- a/src/image.c |
81 |
-+++ b/src/image.c |
82 |
-@@ -385,7 +385,13 @@ static int image_find_regions(struct image *image) |
83 |
- |
84 |
- /* record the size of non-signature data */ |
85 |
- r = &image->checksum_regions[image->n_checksum_regions - 1]; |
86 |
-- image->data_size = (r->data - (void *)image->buf) + r->size; |
87 |
-+ /* |
88 |
-+ * The new Tianocore multisign does a stricter check of the signatures |
89 |
-+ * in particular, the signature table must start at an aligned offset |
90 |
-+ * fix this by adding bytes to the end of the text section (which must |
91 |
-+ * be included in the hash) |
92 |
-+ */ |
93 |
-+ image->data_size = align_up((r->data - (void *)image->buf) + r->size, 8); |
94 |
- |
95 |
- return 0; |
96 |
- } |
97 |
--- |
98 |
-1.8.4 |
99 |
- |