1 |
commit: 303ab7ace0acadc65d7749fc441b35f76899639f |
2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
3 |
AuthorDate: Thu Nov 25 16:51:43 2021 +0000 |
4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Dec 5 21:45:13 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=303ab7ac |
7 |
|
8 |
app-crypt/sbsigntools: remove unused patch(es) |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/23081 |
11 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
12 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
13 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
14 |
|
15 |
.../sbsigntools-0.9.1-openssl-1.1.0-compat.patch | 152 --------------------- |
16 |
1 file changed, 152 deletions(-) |
17 |
|
18 |
diff --git a/app-crypt/sbsigntools/files/sbsigntools-0.9.1-openssl-1.1.0-compat.patch b/app-crypt/sbsigntools/files/sbsigntools-0.9.1-openssl-1.1.0-compat.patch |
19 |
deleted file mode 100644 |
20 |
index 2f9364f246ee..000000000000 |
21 |
--- a/app-crypt/sbsigntools/files/sbsigntools-0.9.1-openssl-1.1.0-compat.patch |
22 |
+++ /dev/null |
23 |
@@ -1,152 +0,0 @@ |
24 |
-diff --git a/src/fileio.c b/src/fileio.c |
25 |
-index 032eb1e..09bc3aa 100644 |
26 |
---- a/src/fileio.c |
27 |
-+++ b/src/fileio.c |
28 |
-@@ -40,6 +40,7 @@ |
29 |
- #include <openssl/pem.h> |
30 |
- #include <openssl/err.h> |
31 |
- #include <openssl/engine.h> |
32 |
-+#include <openssl/ui.h> |
33 |
- |
34 |
- #include <ccan/talloc/talloc.h> |
35 |
- #include <ccan/read_write_all/read_write_all.h> |
36 |
-diff --git a/src/idc.c b/src/idc.c |
37 |
-index 236cefd..6d87bd4 100644 |
38 |
---- a/src/idc.c |
39 |
-+++ b/src/idc.c |
40 |
-@@ -238,7 +238,11 @@ struct idc *IDC_get(PKCS7 *p7, BIO *bio) |
41 |
- |
42 |
- /* extract the idc from the signed PKCS7 'other' data */ |
43 |
- str = p7->d.sign->contents->d.other->value.asn1_string; |
44 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L |
45 |
- idcbuf = buf = ASN1_STRING_data(str); |
46 |
-+#else |
47 |
-+ idcbuf = buf = ASN1_STRING_get0_data(str); |
48 |
-+#endif |
49 |
- idc = d2i_IDC(NULL, &buf, ASN1_STRING_length(str)); |
50 |
- |
51 |
- /* If we were passed a BIO, write the idc data, minus type and length, |
52 |
-@@ -289,7 +293,11 @@ int IDC_check_hash(struct idc *idc, struct image *image) |
53 |
- } |
54 |
- |
55 |
- /* check hash against the one we calculated from the image */ |
56 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L |
57 |
- buf = ASN1_STRING_data(str); |
58 |
-+#else |
59 |
-+ buf = ASN1_STRING_get0_data(str); |
60 |
-+#endif |
61 |
- if (memcmp(buf, sha, sizeof(sha))) { |
62 |
- fprintf(stderr, "Hash doesn't match image\n"); |
63 |
- fprintf(stderr, " got: %s\n", sha256_str(buf)); |
64 |
-diff --git a/src/sbattach.c b/src/sbattach.c |
65 |
-index a0c01b8..e89a23e 100644 |
66 |
---- a/src/sbattach.c |
67 |
-+++ b/src/sbattach.c |
68 |
-@@ -231,6 +231,7 @@ int main(int argc, char **argv) |
69 |
- return EXIT_FAILURE; |
70 |
- } |
71 |
- |
72 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L |
73 |
- ERR_load_crypto_strings(); |
74 |
- OpenSSL_add_all_digests(); |
75 |
- OPENSSL_config(NULL); |
76 |
-@@ -239,6 +240,7 @@ int main(int argc, char **argv) |
77 |
- * module isn't present). In either case ignore the errors |
78 |
- * (malloc will cause other failures out lower down */ |
79 |
- ERR_clear_error(); |
80 |
-+#endif |
81 |
- |
82 |
- image = image_load(image_filename); |
83 |
- if (!image) { |
84 |
-diff --git a/src/sbkeysync.c b/src/sbkeysync.c |
85 |
-index 7b17f40..419b1e7 100644 |
86 |
---- a/src/sbkeysync.c |
87 |
-+++ b/src/sbkeysync.c |
88 |
-@@ -208,7 +208,11 @@ static int x509_key_parse(struct key *key, uint8_t *data, size_t len) |
89 |
- goto out; |
90 |
- |
91 |
- key->id_len = ASN1_STRING_length(serial); |
92 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L |
93 |
- key->id = talloc_memdup(key, ASN1_STRING_data(serial), key->id_len); |
94 |
-+#else |
95 |
-+ key->id = talloc_memdup(key, ASN1_STRING_get0_data(serial), key->id_len); |
96 |
-+#endif |
97 |
- |
98 |
- key->description = talloc_array(key, char, description_len); |
99 |
- X509_NAME_oneline(X509_get_subject_name(x509), |
100 |
-@@ -927,6 +931,7 @@ int main(int argc, char **argv) |
101 |
- return EXIT_FAILURE; |
102 |
- } |
103 |
- |
104 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L |
105 |
- ERR_load_crypto_strings(); |
106 |
- OpenSSL_add_all_digests(); |
107 |
- OpenSSL_add_all_ciphers(); |
108 |
-@@ -936,6 +941,7 @@ int main(int argc, char **argv) |
109 |
- * module isn't present). In either case ignore the errors |
110 |
- * (malloc will cause other failures out lower down */ |
111 |
- ERR_clear_error(); |
112 |
-+#endif |
113 |
- |
114 |
- ctx->filesystem_keys = init_keyset(ctx); |
115 |
- ctx->firmware_keys = init_keyset(ctx); |
116 |
-diff --git a/src/sbsign.c b/src/sbsign.c |
117 |
-index ff1fdfd..78d8d64 100644 |
118 |
---- a/src/sbsign.c |
119 |
-+++ b/src/sbsign.c |
120 |
-@@ -188,6 +188,7 @@ int main(int argc, char **argv) |
121 |
- |
122 |
- talloc_steal(ctx, ctx->image); |
123 |
- |
124 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L |
125 |
- ERR_load_crypto_strings(); |
126 |
- OpenSSL_add_all_digests(); |
127 |
- OpenSSL_add_all_ciphers(); |
128 |
-@@ -197,6 +198,7 @@ int main(int argc, char **argv) |
129 |
- * module isn't present). In either case ignore the errors |
130 |
- * (malloc will cause other failures out lower down */ |
131 |
- ERR_clear_error(); |
132 |
-+#endif |
133 |
- if (engine) |
134 |
- pkey = fileio_read_engine_key(engine, keyfilename); |
135 |
- else |
136 |
-diff --git a/src/sbvarsign.c b/src/sbvarsign.c |
137 |
-index 7dcbe51..9319c8b 100644 |
138 |
---- a/src/sbvarsign.c |
139 |
-+++ b/src/sbvarsign.c |
140 |
-@@ -509,6 +509,7 @@ int main(int argc, char **argv) |
141 |
- return EXIT_FAILURE; |
142 |
- } |
143 |
- |
144 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L |
145 |
- /* initialise openssl */ |
146 |
- OpenSSL_add_all_digests(); |
147 |
- OpenSSL_add_all_ciphers(); |
148 |
-@@ -519,6 +520,7 @@ int main(int argc, char **argv) |
149 |
- * module isn't present). In either case ignore the errors |
150 |
- * (malloc will cause other failures out lower down */ |
151 |
- ERR_clear_error(); |
152 |
-+#endif |
153 |
- |
154 |
- /* set up the variable signing context */ |
155 |
- varname = argv[optind]; |
156 |
-diff --git a/src/sbverify.c b/src/sbverify.c |
157 |
-index 3920d91..d0b203a 100644 |
158 |
---- a/src/sbverify.c |
159 |
-+++ b/src/sbverify.c |
160 |
-@@ -250,6 +250,7 @@ int main(int argc, char **argv) |
161 |
- verbose = false; |
162 |
- detached_sig_filename = NULL; |
163 |
- |
164 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L |
165 |
- OpenSSL_add_all_digests(); |
166 |
- ERR_load_crypto_strings(); |
167 |
- OPENSSL_config(NULL); |
168 |
-@@ -258,6 +259,7 @@ int main(int argc, char **argv) |
169 |
- * module isn't present). In either case ignore the errors |
170 |
- * (malloc will cause other failures out lower down */ |
171 |
- ERR_clear_error(); |
172 |
-+#endif |
173 |
- |
174 |
- for (;;) { |
175 |
- int idx; |