diff options
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl')
7 files changed, 439 insertions, 129 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/0001-Added-handshake-history-reporting-when-test-fails.patch b/meta/recipes-connectivity/openssl/openssl/0001-Added-handshake-history-reporting-when-test-fails.patch new file mode 100644 index 0000000000..5b7365a353 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/0001-Added-handshake-history-reporting-when-test-fails.patch | |||
@@ -0,0 +1,367 @@ | |||
1 | From 5ba65051fea0513db0d997f0ab7cafb9826ed74a Mon Sep 17 00:00:00 2001 | ||
2 | From: William Lyu <William.Lyu@windriver.com> | ||
3 | Date: Fri, 20 Oct 2023 16:22:37 -0400 | ||
4 | Subject: [PATCH] Added handshake history reporting when test fails | ||
5 | |||
6 | Upstream-Status: Submitted [https://github.com/openssl/openssl/pull/22481] | ||
7 | |||
8 | Signed-off-by: William Lyu <William.Lyu@windriver.com> | ||
9 | --- | ||
10 | test/helpers/handshake.c | 137 +++++++++++++++++++++++++++++---------- | ||
11 | test/helpers/handshake.h | 70 +++++++++++++++++++- | ||
12 | test/ssl_test.c | 44 +++++++++++++ | ||
13 | 3 files changed, 217 insertions(+), 34 deletions(-) | ||
14 | |||
15 | diff --git a/test/helpers/handshake.c b/test/helpers/handshake.c | ||
16 | index f611b3a..5703b48 100644 | ||
17 | --- a/test/helpers/handshake.c | ||
18 | +++ b/test/helpers/handshake.c | ||
19 | @@ -25,6 +25,102 @@ | ||
20 | #include <netinet/sctp.h> | ||
21 | #endif | ||
22 | |||
23 | +/* Shamelessly copied from test/helpers/ssl_test_ctx.c */ | ||
24 | +/* Maps string names to various enumeration type */ | ||
25 | +typedef struct { | ||
26 | + const char *name; | ||
27 | + int value; | ||
28 | +} enum_name_map; | ||
29 | + | ||
30 | +static const enum_name_map connect_phase_names[] = { | ||
31 | + {"Handshake", HANDSHAKE}, | ||
32 | + {"RenegAppData", RENEG_APPLICATION_DATA}, | ||
33 | + {"RenegSetup", RENEG_SETUP}, | ||
34 | + {"RenegHandshake", RENEG_HANDSHAKE}, | ||
35 | + {"AppData", APPLICATION_DATA}, | ||
36 | + {"Shutdown", SHUTDOWN}, | ||
37 | + {"ConnectionDone", CONNECTION_DONE} | ||
38 | +}; | ||
39 | + | ||
40 | +static const enum_name_map peer_status_names[] = { | ||
41 | + {"PeerSuccess", PEER_SUCCESS}, | ||
42 | + {"PeerRetry", PEER_RETRY}, | ||
43 | + {"PeerError", PEER_ERROR}, | ||
44 | + {"PeerWaiting", PEER_WAITING}, | ||
45 | + {"PeerTestFail", PEER_TEST_FAILURE} | ||
46 | +}; | ||
47 | + | ||
48 | +static const enum_name_map handshake_status_names[] = { | ||
49 | + {"HandshakeSuccess", HANDSHAKE_SUCCESS}, | ||
50 | + {"ClientError", CLIENT_ERROR}, | ||
51 | + {"ServerError", SERVER_ERROR}, | ||
52 | + {"InternalError", INTERNAL_ERROR}, | ||
53 | + {"HandshakeRetry", HANDSHAKE_RETRY} | ||
54 | +}; | ||
55 | + | ||
56 | +/* Shamelessly copied from test/helpers/ssl_test_ctx.c */ | ||
57 | +static const char *enum_name(const enum_name_map *enums, size_t num_enums, | ||
58 | + int value) | ||
59 | +{ | ||
60 | + size_t i; | ||
61 | + for (i = 0; i < num_enums; i++) { | ||
62 | + if (enums[i].value == value) { | ||
63 | + return enums[i].name; | ||
64 | + } | ||
65 | + } | ||
66 | + return "InvalidValue"; | ||
67 | +} | ||
68 | + | ||
69 | +const char *handshake_connect_phase_name(connect_phase_t phase) | ||
70 | +{ | ||
71 | + return enum_name(connect_phase_names, OSSL_NELEM(connect_phase_names), | ||
72 | + (int)phase); | ||
73 | +} | ||
74 | + | ||
75 | +const char *handshake_status_name(handshake_status_t handshake_status) | ||
76 | +{ | ||
77 | + return enum_name(handshake_status_names, OSSL_NELEM(handshake_status_names), | ||
78 | + (int)handshake_status); | ||
79 | +} | ||
80 | + | ||
81 | +const char *handshake_peer_status_name(peer_status_t peer_status) | ||
82 | +{ | ||
83 | + return enum_name(peer_status_names, OSSL_NELEM(peer_status_names), | ||
84 | + (int)peer_status); | ||
85 | +} | ||
86 | + | ||
87 | +static void save_loop_history(HANDSHAKE_HISTORY *history, | ||
88 | + connect_phase_t phase, | ||
89 | + handshake_status_t handshake_status, | ||
90 | + peer_status_t server_status, | ||
91 | + peer_status_t client_status, | ||
92 | + int client_turn_count, | ||
93 | + int is_client_turn) | ||
94 | +{ | ||
95 | + HANDSHAKE_HISTORY_ENTRY *new_entry = NULL; | ||
96 | + | ||
97 | + /* | ||
98 | + * Create a new history entry for a handshake loop with statuses given in | ||
99 | + * the arguments. Potentially evicting the oldest entry when the | ||
100 | + * ring buffer is full. | ||
101 | + */ | ||
102 | + ++(history->last_idx); | ||
103 | + history->last_idx &= MAX_HANDSHAKE_HISTORY_ENTRY_IDX_MASK; | ||
104 | + | ||
105 | + new_entry = &((history->entries)[history->last_idx]); | ||
106 | + new_entry->phase = phase; | ||
107 | + new_entry->handshake_status = handshake_status; | ||
108 | + new_entry->server_status = server_status; | ||
109 | + new_entry->client_status = client_status; | ||
110 | + new_entry->client_turn_count = client_turn_count; | ||
111 | + new_entry->is_client_turn = is_client_turn; | ||
112 | + | ||
113 | + /* Evict the oldest handshake loop entry when the ring buffer is full. */ | ||
114 | + if (history->entry_count < MAX_HANDSHAKE_HISTORY_ENTRY) { | ||
115 | + ++(history->entry_count); | ||
116 | + } | ||
117 | +} | ||
118 | + | ||
119 | HANDSHAKE_RESULT *HANDSHAKE_RESULT_new(void) | ||
120 | { | ||
121 | HANDSHAKE_RESULT *ret; | ||
122 | @@ -726,15 +822,6 @@ static void configure_handshake_ssl(SSL *server, SSL *client, | ||
123 | SSL_set_post_handshake_auth(client, 1); | ||
124 | } | ||
125 | |||
126 | -/* The status for each connection phase. */ | ||
127 | -typedef enum { | ||
128 | - PEER_SUCCESS, | ||
129 | - PEER_RETRY, | ||
130 | - PEER_ERROR, | ||
131 | - PEER_WAITING, | ||
132 | - PEER_TEST_FAILURE | ||
133 | -} peer_status_t; | ||
134 | - | ||
135 | /* An SSL object and associated read-write buffers. */ | ||
136 | typedef struct peer_st { | ||
137 | SSL *ssl; | ||
138 | @@ -1081,17 +1168,6 @@ static void do_shutdown_step(PEER *peer) | ||
139 | } | ||
140 | } | ||
141 | |||
142 | -typedef enum { | ||
143 | - HANDSHAKE, | ||
144 | - RENEG_APPLICATION_DATA, | ||
145 | - RENEG_SETUP, | ||
146 | - RENEG_HANDSHAKE, | ||
147 | - APPLICATION_DATA, | ||
148 | - SHUTDOWN, | ||
149 | - CONNECTION_DONE | ||
150 | -} connect_phase_t; | ||
151 | - | ||
152 | - | ||
153 | static int renegotiate_op(const SSL_TEST_CTX *test_ctx) | ||
154 | { | ||
155 | switch (test_ctx->handshake_mode) { | ||
156 | @@ -1169,19 +1245,6 @@ static void do_connect_step(const SSL_TEST_CTX *test_ctx, PEER *peer, | ||
157 | } | ||
158 | } | ||
159 | |||
160 | -typedef enum { | ||
161 | - /* Both parties succeeded. */ | ||
162 | - HANDSHAKE_SUCCESS, | ||
163 | - /* Client errored. */ | ||
164 | - CLIENT_ERROR, | ||
165 | - /* Server errored. */ | ||
166 | - SERVER_ERROR, | ||
167 | - /* Peers are in inconsistent state. */ | ||
168 | - INTERNAL_ERROR, | ||
169 | - /* One or both peers not done. */ | ||
170 | - HANDSHAKE_RETRY | ||
171 | -} handshake_status_t; | ||
172 | - | ||
173 | /* | ||
174 | * Determine the handshake outcome. | ||
175 | * last_status: the status of the peer to have acted last. | ||
176 | @@ -1546,6 +1609,10 @@ static HANDSHAKE_RESULT *do_handshake_internal( | ||
177 | |||
178 | start = time(NULL); | ||
179 | |||
180 | + save_loop_history(&(ret->history), | ||
181 | + phase, status, server.status, client.status, | ||
182 | + client_turn_count, client_turn); | ||
183 | + | ||
184 | /* | ||
185 | * Half-duplex handshake loop. | ||
186 | * Client and server speak to each other synchronously in the same process. | ||
187 | @@ -1567,6 +1634,10 @@ static HANDSHAKE_RESULT *do_handshake_internal( | ||
188 | 0 /* server went last */); | ||
189 | } | ||
190 | |||
191 | + save_loop_history(&(ret->history), | ||
192 | + phase, status, server.status, client.status, | ||
193 | + client_turn_count, client_turn); | ||
194 | + | ||
195 | switch (status) { | ||
196 | case HANDSHAKE_SUCCESS: | ||
197 | client_turn_count = 0; | ||
198 | diff --git a/test/helpers/handshake.h b/test/helpers/handshake.h | ||
199 | index 78b03f9..b9967c2 100644 | ||
200 | --- a/test/helpers/handshake.h | ||
201 | +++ b/test/helpers/handshake.h | ||
202 | @@ -1,5 +1,5 @@ | ||
203 | /* | ||
204 | - * Copyright 2016-2021 The OpenSSL Project Authors. All Rights Reserved. | ||
205 | + * Copyright 2016-2023 The OpenSSL Project Authors. All Rights Reserved. | ||
206 | * | ||
207 | * Licensed under the Apache License 2.0 (the "License"). You may not use | ||
208 | * this file except in compliance with the License. You can obtain a copy | ||
209 | @@ -12,6 +12,11 @@ | ||
210 | |||
211 | #include "ssl_test_ctx.h" | ||
212 | |||
213 | +#define MAX_HANDSHAKE_HISTORY_ENTRY_BIT 4 | ||
214 | +#define MAX_HANDSHAKE_HISTORY_ENTRY (1 << MAX_HANDSHAKE_HISTORY_ENTRY_BIT) | ||
215 | +#define MAX_HANDSHAKE_HISTORY_ENTRY_IDX_MASK \ | ||
216 | + ((1 << MAX_HANDSHAKE_HISTORY_ENTRY_BIT) - 1) | ||
217 | + | ||
218 | typedef struct ctx_data_st { | ||
219 | unsigned char *npn_protocols; | ||
220 | size_t npn_protocols_len; | ||
221 | @@ -22,6 +27,63 @@ typedef struct ctx_data_st { | ||
222 | char *session_ticket_app_data; | ||
223 | } CTX_DATA; | ||
224 | |||
225 | +typedef enum { | ||
226 | + HANDSHAKE, | ||
227 | + RENEG_APPLICATION_DATA, | ||
228 | + RENEG_SETUP, | ||
229 | + RENEG_HANDSHAKE, | ||
230 | + APPLICATION_DATA, | ||
231 | + SHUTDOWN, | ||
232 | + CONNECTION_DONE | ||
233 | +} connect_phase_t; | ||
234 | + | ||
235 | +/* The status for each connection phase. */ | ||
236 | +typedef enum { | ||
237 | + PEER_SUCCESS, | ||
238 | + PEER_RETRY, | ||
239 | + PEER_ERROR, | ||
240 | + PEER_WAITING, | ||
241 | + PEER_TEST_FAILURE | ||
242 | +} peer_status_t; | ||
243 | + | ||
244 | +typedef enum { | ||
245 | + /* Both parties succeeded. */ | ||
246 | + HANDSHAKE_SUCCESS, | ||
247 | + /* Client errored. */ | ||
248 | + CLIENT_ERROR, | ||
249 | + /* Server errored. */ | ||
250 | + SERVER_ERROR, | ||
251 | + /* Peers are in inconsistent state. */ | ||
252 | + INTERNAL_ERROR, | ||
253 | + /* One or both peers not done. */ | ||
254 | + HANDSHAKE_RETRY | ||
255 | +} handshake_status_t; | ||
256 | + | ||
257 | +/* Stores the various status information in a handshake loop. */ | ||
258 | +typedef struct handshake_history_entry_st { | ||
259 | + connect_phase_t phase; | ||
260 | + handshake_status_t handshake_status; | ||
261 | + peer_status_t server_status; | ||
262 | + peer_status_t client_status; | ||
263 | + int client_turn_count; | ||
264 | + int is_client_turn; | ||
265 | +} HANDSHAKE_HISTORY_ENTRY; | ||
266 | + | ||
267 | +typedef struct handshake_history_st { | ||
268 | + /* Implemented using ring buffer. */ | ||
269 | + /* | ||
270 | + * The valid entries are |entries[last_idx]|, |entries[last_idx-1]|, | ||
271 | + * ..., etc., going up to |entry_count| number of entries. Note that when | ||
272 | + * the index into the array |entries| becomes < 0, we wrap around to | ||
273 | + * the end of |entries|. | ||
274 | + */ | ||
275 | + HANDSHAKE_HISTORY_ENTRY entries[MAX_HANDSHAKE_HISTORY_ENTRY]; | ||
276 | + /* The number of valid entries in |entries| array. */ | ||
277 | + size_t entry_count; | ||
278 | + /* The index of the last valid entry in the |entries| array. */ | ||
279 | + size_t last_idx; | ||
280 | +} HANDSHAKE_HISTORY; | ||
281 | + | ||
282 | typedef struct handshake_result { | ||
283 | ssl_test_result_t result; | ||
284 | /* These alerts are in the 2-byte format returned by the info_callback. */ | ||
285 | @@ -77,6 +139,8 @@ typedef struct handshake_result { | ||
286 | char *cipher; | ||
287 | /* session ticket application data */ | ||
288 | char *result_session_ticket_app_data; | ||
289 | + /* handshake loop history */ | ||
290 | + HANDSHAKE_HISTORY history; | ||
291 | } HANDSHAKE_RESULT; | ||
292 | |||
293 | HANDSHAKE_RESULT *HANDSHAKE_RESULT_new(void); | ||
294 | @@ -95,4 +159,8 @@ int configure_handshake_ctx_for_srp(SSL_CTX *server_ctx, SSL_CTX *server2_ctx, | ||
295 | CTX_DATA *server2_ctx_data, | ||
296 | CTX_DATA *client_ctx_data); | ||
297 | |||
298 | +const char *handshake_connect_phase_name(connect_phase_t phase); | ||
299 | +const char *handshake_status_name(handshake_status_t handshake_status); | ||
300 | +const char *handshake_peer_status_name(peer_status_t peer_status); | ||
301 | + | ||
302 | #endif /* OSSL_TEST_HANDSHAKE_HELPER_H */ | ||
303 | diff --git a/test/ssl_test.c b/test/ssl_test.c | ||
304 | index ea60851..9d6b093 100644 | ||
305 | --- a/test/ssl_test.c | ||
306 | +++ b/test/ssl_test.c | ||
307 | @@ -26,6 +26,44 @@ static OSSL_LIB_CTX *libctx = NULL; | ||
308 | /* Currently the section names are of the form test-<number>, e.g. test-15. */ | ||
309 | #define MAX_TESTCASE_NAME_LENGTH 100 | ||
310 | |||
311 | +static void print_handshake_history(const HANDSHAKE_HISTORY *history) | ||
312 | +{ | ||
313 | + size_t first_idx; | ||
314 | + size_t i; | ||
315 | + size_t cur_idx; | ||
316 | + const HANDSHAKE_HISTORY_ENTRY *cur_entry; | ||
317 | + const char header_template[] = "|%14s|%16s|%16s|%16s|%17s|%14s|"; | ||
318 | + const char body_template[] = "|%14s|%16s|%16s|%16s|%17d|%14s|"; | ||
319 | + | ||
320 | + TEST_info("The following is the server/client state " | ||
321 | + "in the most recent %d handshake loops.", | ||
322 | + MAX_HANDSHAKE_HISTORY_ENTRY); | ||
323 | + | ||
324 | + TEST_note("==================================================" | ||
325 | + "=================================================="); | ||
326 | + TEST_note(header_template, | ||
327 | + "phase", "handshake status", "server status", | ||
328 | + "client status", "client turn count", "is client turn"); | ||
329 | + TEST_note("+--------------+----------------+----------------" | ||
330 | + "+----------------+-----------------+--------------+"); | ||
331 | + | ||
332 | + first_idx = (history->last_idx - history->entry_count + 1) & | ||
333 | + MAX_HANDSHAKE_HISTORY_ENTRY_IDX_MASK; | ||
334 | + for (i = 0; i < history->entry_count; ++i) { | ||
335 | + cur_idx = (first_idx + i) & MAX_HANDSHAKE_HISTORY_ENTRY_IDX_MASK; | ||
336 | + cur_entry = &(history->entries)[cur_idx]; | ||
337 | + TEST_note(body_template, | ||
338 | + handshake_connect_phase_name(cur_entry->phase), | ||
339 | + handshake_status_name(cur_entry->handshake_status), | ||
340 | + handshake_peer_status_name(cur_entry->server_status), | ||
341 | + handshake_peer_status_name(cur_entry->client_status), | ||
342 | + cur_entry->client_turn_count, | ||
343 | + cur_entry->is_client_turn ? "true" : "false"); | ||
344 | + } | ||
345 | + TEST_note("==================================================" | ||
346 | + "=================================================="); | ||
347 | +} | ||
348 | + | ||
349 | static const char *print_alert(int alert) | ||
350 | { | ||
351 | return alert ? SSL_alert_desc_string_long(alert) : "no alert"; | ||
352 | @@ -388,6 +426,12 @@ static int check_test(HANDSHAKE_RESULT *result, SSL_TEST_CTX *test_ctx) | ||
353 | ret &= check_client_sign_type(result, test_ctx); | ||
354 | ret &= check_client_ca_names(result, test_ctx); | ||
355 | } | ||
356 | + | ||
357 | + /* Print handshake loop history if any check fails. */ | ||
358 | + if (!ret) { | ||
359 | + print_handshake_history(&(result->history)); | ||
360 | + } | ||
361 | + | ||
362 | return ret; | ||
363 | } | ||
364 | |||
365 | -- | ||
366 | 2.25.1 | ||
367 | |||
diff --git a/meta/recipes-connectivity/openssl/openssl/0001-Configure-do-not-tweak-mips-cflags.patch b/meta/recipes-connectivity/openssl/openssl/0001-Configure-do-not-tweak-mips-cflags.patch new file mode 100644 index 0000000000..7043188973 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/0001-Configure-do-not-tweak-mips-cflags.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | From 0377f0d5b5c1079e3b9a80881f4dcc891cbe9f9a Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex@linutronix.de> | ||
3 | Date: Tue, 30 May 2023 09:11:27 -0700 | ||
4 | Subject: [PATCH] Configure: do not tweak mips cflags | ||
5 | |||
6 | This conflicts with mips machine definitons from yocto, | ||
7 | e.g. | ||
8 | | Error: -mips3 conflicts with the other architecture options, which imply -mips64r2 | ||
9 | |||
10 | Upstream-Status: Inappropriate [oe-core specific] | ||
11 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
12 | |||
13 | Refreshed for openssl-3.1.1 | ||
14 | Signed-off-by: Tim Orling <tim.orling@konsulko.com> | ||
15 | --- | ||
16 | Configure | 10 ---------- | ||
17 | 1 file changed, 10 deletions(-) | ||
18 | |||
19 | diff --git a/Configure b/Configure | ||
20 | index fff97bd..5ee54c1 100755 | ||
21 | --- a/Configure | ||
22 | +++ b/Configure | ||
23 | @@ -1551,16 +1551,6 @@ if ($target =~ /^mingw/ && `$config{CC} --target-help 2>&1` =~ m/-mno-cygwin/m) | ||
24 | push @{$config{shared_ldflag}}, "-mno-cygwin"; | ||
25 | } | ||
26 | |||
27 | -if ($target =~ /linux.*-mips/ && !$disabled{asm} | ||
28 | - && !grep { $_ =~ /-m(ips|arch=)/ } (@{$config{CFLAGS}})) { | ||
29 | - # minimally required architecture flags for assembly modules | ||
30 | - my $value; | ||
31 | - $value = '-mips2' if ($target =~ /mips32/); | ||
32 | - $value = '-mips3' if ($target =~ /mips64/); | ||
33 | - unshift @{$config{cflags}}, $value; | ||
34 | - unshift @{$config{cxxflags}}, $value if $config{CXX}; | ||
35 | -} | ||
36 | - | ||
37 | # If threads aren't disabled, check how possible they are | ||
38 | unless ($disabled{threads}) { | ||
39 | if ($auto_threads) { | ||
diff --git a/meta/recipes-connectivity/openssl/openssl/0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch b/meta/recipes-connectivity/openssl/openssl/0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch index 949c788344..687d682976 100644 --- a/meta/recipes-connectivity/openssl/openssl/0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch +++ b/meta/recipes-connectivity/openssl/openssl/0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 3e1d00481093e10775eaf69d619c45b32a4aa7dc Mon Sep 17 00:00:00 2001 | 1 | From 5985253f2c9025d7c127443a3a9938946f80c2a1 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Martin=20Hundeb=C3=B8ll?= <martin@geanix.com> | 2 | From: =?UTF-8?q?Martin=20Hundeb=C3=B8ll?= <martin@geanix.com> |
3 | Date: Tue, 6 Nov 2018 14:50:47 +0100 | 3 | Date: Tue, 6 Nov 2018 14:50:47 +0100 |
4 | Subject: [PATCH] buildinfo: strip sysroot and debug-prefix-map from compiler | 4 | Subject: [PATCH] buildinfo: strip sysroot and debug-prefix-map from compiler |
@@ -21,34 +21,43 @@ https://patchwork.openembedded.org/patch/147229/ | |||
21 | Upstream-Status: Inappropriate [OE specific] | 21 | Upstream-Status: Inappropriate [OE specific] |
22 | Signed-off-by: Martin Hundebøll <martin@geanix.com> | 22 | Signed-off-by: Martin Hundebøll <martin@geanix.com> |
23 | 23 | ||
24 | |||
25 | Update to fix buildpaths qa issue for '-fmacro-prefix-map'. | 24 | Update to fix buildpaths qa issue for '-fmacro-prefix-map'. |
26 | 25 | ||
27 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | 26 | Signed-off-by: Kai Kang <kai.kang@windriver.com> |
27 | |||
28 | Update to fix buildpaths qa issue for '-ffile-prefix-map'. | ||
29 | |||
30 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
31 | |||
28 | --- | 32 | --- |
29 | Configurations/unix-Makefile.tmpl | 10 +++++++++- | 33 | Configurations/unix-Makefile.tmpl | 16 +++++++++++++++- |
30 | crypto/build.info | 2 +- | 34 | crypto/build.info | 2 +- |
31 | 2 files changed, 10 insertions(+), 2 deletions(-) | 35 | 2 files changed, 16 insertions(+), 2 deletions(-) |
32 | 36 | ||
33 | diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl | 37 | diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl |
34 | index 16af4d2087..54c162784c 100644 | 38 | index 09303c4..011bda1 100644 |
35 | --- a/Configurations/unix-Makefile.tmpl | 39 | --- a/Configurations/unix-Makefile.tmpl |
36 | +++ b/Configurations/unix-Makefile.tmpl | 40 | +++ b/Configurations/unix-Makefile.tmpl |
37 | @@ -317,13 +317,22 @@ BIN_LDFLAGS={- join(' ', $target{bin_lflags} || (), | 41 | @@ -502,13 +502,27 @@ BIN_LDFLAGS={- join(' ', $target{bin_lflags} || (), |
38 | '$(CNF_LDFLAGS)', '$(LDFLAGS)') -} | 42 | '$(CNF_LDFLAGS)', '$(LDFLAGS)') -} |
39 | BIN_EX_LIBS=$(CNF_EX_LIBS) $(EX_LIBS) | 43 | BIN_EX_LIBS=$(CNF_EX_LIBS) $(EX_LIBS) |
40 | 44 | ||
41 | -# CPPFLAGS_Q is used for one thing only: to build up buildinf.h | 45 | -# CPPFLAGS_Q is used for one thing only: to build up buildinf.h |
42 | +# *_Q variables are used for one thing only: to build up buildinf.h | 46 | +# *_Q variables are used for one thing only: to build up buildinf.h |
43 | CPPFLAGS_Q={- $cppflags1 =~ s|([\\"])|\\$1|g; | 47 | CPPFLAGS_Q={- $cppflags1 =~ s|([\\"])|\\$1|g; |
48 | + $cppflags1 =~ s|-isystem/[^ ]+/usr/include||g; | ||
44 | $cppflags2 =~ s|([\\"])|\\$1|g; | 49 | $cppflags2 =~ s|([\\"])|\\$1|g; |
50 | + $cppflags2 =~ s|-isystem/[^ ]+/usr/include||g; | ||
45 | $lib_cppflags =~ s|([\\"])|\\$1|g; | 51 | $lib_cppflags =~ s|([\\"])|\\$1|g; |
52 | + $lib_cppflags =~ s|-isystem/[^ ]+/usr/include||g; | ||
46 | join(' ', $lib_cppflags || (), $cppflags2 || (), | 53 | join(' ', $lib_cppflags || (), $cppflags2 || (), |
47 | $cppflags1 || ()) -} | 54 | $cppflags1 || ()) -} |
48 | 55 | ||
49 | +CFLAGS_Q={- for (@{$config{CFLAGS}}) { | 56 | +CFLAGS_Q={- for (@{$config{CFLAGS}}) { |
50 | + s|-fdebug-prefix-map=[^ ]+|-fdebug-prefix-map=|g; | 57 | + s|-fdebug-prefix-map=[^ ]+|-fdebug-prefix-map=|g; |
51 | + s|-fmacro-prefix-map=[^ ]+|-fmacro-prefix-map=|g; | 58 | + s|-fmacro-prefix-map=[^ ]+|-fmacro-prefix-map=|g; |
59 | + s|-ffile-prefix-map=[^ ]+|-ffile-prefix-map=|g; | ||
60 | + s|-isystem/[^ ]+/usr/include ||g; | ||
52 | + } | 61 | + } |
53 | + join(' ', @{$config{CFLAGS}}) -} | 62 | + join(' ', @{$config{CFLAGS}}) -} |
54 | + | 63 | + |
@@ -59,18 +68,15 @@ index 16af4d2087..54c162784c 100644 | |||
59 | 68 | ||
60 | # For x86 assembler: Set PROCESSOR to 386 if you want to support | 69 | # For x86 assembler: Set PROCESSOR to 386 if you want to support |
61 | diff --git a/crypto/build.info b/crypto/build.info | 70 | diff --git a/crypto/build.info b/crypto/build.info |
62 | index b515b7318e..8c9cee2a09 100644 | 71 | index aee5c46..95c9577 100644 |
63 | --- a/crypto/build.info | 72 | --- a/crypto/build.info |
64 | +++ b/crypto/build.info | 73 | +++ b/crypto/build.info |
65 | @@ -10,7 +10,7 @@ EXTRA= ../ms/uplink-x86.pl ../ms/uplink.c ../ms/applink.c \ | 74 | @@ -115,7 +115,7 @@ DEFINE[../libcrypto]=$UPLINKDEF |
66 | ppccpuid.pl pariscid.pl alphacpuid.pl arm64cpuid.pl armv4cpuid.pl | ||
67 | 75 | ||
76 | DEPEND[info.o]=buildinf.h | ||
68 | DEPEND[cversion.o]=buildinf.h | 77 | DEPEND[cversion.o]=buildinf.h |
69 | -GENERATE[buildinf.h]=../util/mkbuildinf.pl "$(CC) $(LIB_CFLAGS) $(CPPFLAGS_Q)" "$(PLATFORM)" | 78 | -GENERATE[buildinf.h]=../util/mkbuildinf.pl "$(CC) $(LIB_CFLAGS) $(CPPFLAGS_Q)" "$(PLATFORM)" |
70 | +GENERATE[buildinf.h]=../util/mkbuildinf.pl "$(CC_Q) $(CFLAGS_Q) $(CPPFLAGS_Q)" "$(PLATFORM)" | 79 | +GENERATE[buildinf.h]=../util/mkbuildinf.pl "$(CC_Q) $(CFLAGS_Q) $(CPPFLAGS_Q)" "$(PLATFORM)" |
71 | DEPEND[buildinf.h]=../configdata.pm | ||
72 | 80 | ||
73 | GENERATE[uplink-x86.s]=../ms/uplink-x86.pl $(PERLASM_SCHEME) | 81 | GENERATE[uplink-x86.S]=../ms/uplink-x86.pl |
74 | -- | 82 | GENERATE[uplink-x86_64.s]=../ms/uplink-x86_64.pl |
75 | 2.19.1 | ||
76 | |||
diff --git a/meta/recipes-connectivity/openssl/openssl/0001-skip-test_symbol_presence.patch b/meta/recipes-connectivity/openssl/openssl/0001-skip-test_symbol_presence.patch deleted file mode 100644 index d8d9651b64..0000000000 --- a/meta/recipes-connectivity/openssl/openssl/0001-skip-test_symbol_presence.patch +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | From a9401b2289656c5a36dd1b0ecebf0d23e291ce70 Mon Sep 17 00:00:00 2001 | ||
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
3 | Date: Tue, 2 Oct 2018 23:58:24 +0800 | ||
4 | Subject: [PATCH] skip test_symbol_presence | ||
5 | |||
6 | We cannot skip `01-test_symbol_presence.t' by configuring option `no-shared' | ||
7 | as INSTALL told us the shared libraries will not be built. | ||
8 | |||
9 | [INSTALL snip] | ||
10 | Notes on shared libraries | ||
11 | ------------------------- | ||
12 | |||
13 | For most systems the OpenSSL Configure script knows what is needed to | ||
14 | build shared libraries for libcrypto and libssl. On these systems | ||
15 | the shared libraries will be created by default. This can be suppressed and | ||
16 | only static libraries created by using the "no-shared" option. On systems | ||
17 | where OpenSSL does not know how to build shared libraries the "no-shared" | ||
18 | option will be forced and only static libraries will be created. | ||
19 | [INSTALL snip] | ||
20 | |||
21 | Hence directly modification the case to skip it. | ||
22 | |||
23 | Upstream-Status: Inappropriate [OE Specific] | ||
24 | |||
25 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
26 | --- | ||
27 | test/recipes/01-test_symbol_presence.t | 3 +-- | ||
28 | 1 file changed, 1 insertion(+), 2 deletions(-) | ||
29 | |||
30 | diff --git a/test/recipes/01-test_symbol_presence.t b/test/recipes/01-test_symbol_presence.t | ||
31 | index 7f2a2d7..0b93745 100644 | ||
32 | --- a/test/recipes/01-test_symbol_presence.t | ||
33 | +++ b/test/recipes/01-test_symbol_presence.t | ||
34 | @@ -14,8 +14,7 @@ use OpenSSL::Test::Utils; | ||
35 | |||
36 | setup("test_symbol_presence"); | ||
37 | |||
38 | -plan skip_all => "Only useful when building shared libraries" | ||
39 | - if disabled("shared"); | ||
40 | +plan skip_all => "The case needs debug symbols then we just disable it"; | ||
41 | |||
42 | my @libnames = ("crypto", "ssl"); | ||
43 | my $testcount = scalar @libnames; | ||
44 | -- | ||
45 | 2.7.4 | ||
46 | |||
diff --git a/meta/recipes-connectivity/openssl/openssl/afalg.patch b/meta/recipes-connectivity/openssl/openssl/afalg.patch deleted file mode 100644 index b7c0e9697f..0000000000 --- a/meta/recipes-connectivity/openssl/openssl/afalg.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | Don't refuse to build afalgeng if cross-compiling or the host kernel is too old. | ||
2 | |||
3 | Upstream-Status: Submitted [hhttps://github.com/openssl/openssl/pull/7688] | ||
4 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
5 | |||
6 | diff --git a/Configure b/Configure | ||
7 | index 3baa8ce..9ef52ed 100755 | ||
8 | --- a/Configure | ||
9 | +++ b/Configure | ||
10 | @@ -1550,20 +1550,7 @@ unless ($disabled{"crypto-mdebug-backtrace"}) | ||
11 | unless ($disabled{afalgeng}) { | ||
12 | $config{afalgeng}=""; | ||
13 | if (grep { $_ eq 'afalgeng' } @{$target{enable}}) { | ||
14 | - my $minver = 4*10000 + 1*100 + 0; | ||
15 | - if ($config{CROSS_COMPILE} eq "") { | ||
16 | - my $verstr = `uname -r`; | ||
17 | - my ($ma, $mi1, $mi2) = split("\\.", $verstr); | ||
18 | - ($mi2) = $mi2 =~ /(\d+)/; | ||
19 | - my $ver = $ma*10000 + $mi1*100 + $mi2; | ||
20 | - if ($ver < $minver) { | ||
21 | - disable('too-old-kernel', 'afalgeng'); | ||
22 | - } else { | ||
23 | - push @{$config{engdirs}}, "afalg"; | ||
24 | - } | ||
25 | - } else { | ||
26 | - disable('cross-compiling', 'afalgeng'); | ||
27 | - } | ||
28 | + push @{$config{engdirs}}, "afalg"; | ||
29 | } else { | ||
30 | disable('not-linux', 'afalgeng'); | ||
31 | } | ||
diff --git a/meta/recipes-connectivity/openssl/openssl/reproducible.patch b/meta/recipes-connectivity/openssl/openssl/reproducible.patch deleted file mode 100644 index a24260c95d..0000000000 --- a/meta/recipes-connectivity/openssl/openssl/reproducible.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | The value for perl_archname can vary depending on the host, e.g. | ||
2 | x86_64-linux-gnu-thread-multi or x86_64-linux-thread-multi which | ||
3 | makes the ptest package non-reproducible. Its unused other than | ||
4 | these references so drop it. | ||
5 | |||
6 | RP 2020/2/6 | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
10 | |||
11 | Index: openssl-1.1.1d/Configure | ||
12 | =================================================================== | ||
13 | --- openssl-1.1.1d.orig/Configure | ||
14 | +++ openssl-1.1.1d/Configure | ||
15 | @@ -286,7 +286,7 @@ if (defined env($local_config_envname)) | ||
16 | # Save away perl command information | ||
17 | $config{perl_cmd} = $^X; | ||
18 | $config{perl_version} = $Config{version}; | ||
19 | -$config{perl_archname} = $Config{archname}; | ||
20 | +#$config{perl_archname} = $Config{archname}; | ||
21 | |||
22 | $config{prefix}=""; | ||
23 | $config{openssldir}=""; | ||
24 | @@ -2517,7 +2517,7 @@ _____ | ||
25 | @{$config{perlargv}}), "\n"; | ||
26 | print "\nPerl information:\n\n"; | ||
27 | print ' ',$config{perl_cmd},"\n"; | ||
28 | - print ' ',$config{perl_version},' for ',$config{perl_archname},"\n"; | ||
29 | + print ' ',$config{perl_version},"\n"; | ||
30 | } | ||
31 | if ($dump || $options) { | ||
32 | my $longest = 0; | ||
diff --git a/meta/recipes-connectivity/openssl/openssl/run-ptest b/meta/recipes-connectivity/openssl/openssl/run-ptest index 3fb22471f8..cd29bb1446 100644 --- a/meta/recipes-connectivity/openssl/openssl/run-ptest +++ b/meta/recipes-connectivity/openssl/openssl/run-ptest | |||
@@ -1,12 +1,19 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | ||
3 | set -e | 3 | set -eu |
4 | 4 | ||
5 | # Optional arguments are 'list' to lists all tests, or the test name (base name | 5 | # Optional arguments are 'list' to lists the tests, or the test name (base name |
6 | # ie test_evp, not 03_test_evp.t). | 6 | # ie test_evp, not 03_test_evp.t). Without any arguments we run all tests. |
7 | |||
8 | if test $# -gt 0; then | ||
9 | TESTS=$* | ||
10 | else | ||
11 | # Skip test_symbol_presence as this is for developers | ||
12 | TESTS="alltests -test_symbol_presence" | ||
13 | fi | ||
7 | 14 | ||
8 | export TOP=. | 15 | export TOP=. |
9 | # OPENSSL_ENGINES is relative from the test binaries | 16 | # Run four jobs in parallel |
10 | export OPENSSL_ENGINES=../engines | 17 | export HARNESS_JOBS=4 |
11 | 18 | ||
12 | perl ./test/run_tests.pl $* | perl -0pe 's#(.*) \.*.ok#PASS: \1#g; s#(.*) \.*.skipped: (.*)#SKIP: \1 (\2)#g; s#(.*) \.*.\nDubious#FAIL: \1#;' | 19 | { perl ./test/run_tests.pl $TESTS || echo "FAIL: openssl" ; } | sed -u -r -e '/(.*) \.*.ok/ s/^/PASS: /g' -r -e '/Dubious(.*)/ s/^/FAIL: /g' -e '/(.*) \.*.skipped: (.*)/ s/^/SKIP: /g' |