diff options
author | beck <> | 2022-11-12 13:16:10 +0000 |
---|---|---|
committer | beck <> | 2022-11-12 13:16:10 +0000 |
commit | 70ab1d8e94bd3980047d58c783b898276a0faa90 (patch) | |
tree | a76738290dfec55de731944109fadcfacf100efc | |
parent | 3b3bd87c8ba6eed119f57fda3b29fee076d34d15 (diff) | |
download | openbsd-70ab1d8e94bd3980047d58c783b898276a0faa90.tar.gz openbsd-70ab1d8e94bd3980047d58c783b898276a0faa90.tar.bz2 openbsd-70ab1d8e94bd3980047d58c783b898276a0faa90.zip |
Hide symbols in libcrypto/ui
ok jsing@
-rw-r--r-- | src/lib/libcrypto/Symbols.namespace | 52 | ||||
-rw-r--r-- | src/lib/libcrypto/hidden/openssl/ui.h | 78 | ||||
-rw-r--r-- | src/lib/libcrypto/ui/ui_err.c | 3 | ||||
-rw-r--r-- | src/lib/libcrypto/ui/ui_lib.c | 51 | ||||
-rw-r--r-- | src/lib/libcrypto/ui/ui_openssl.c | 3 | ||||
-rw-r--r-- | src/lib/libcrypto/ui/ui_util.c | 4 |
6 files changed, 187 insertions, 4 deletions
diff --git a/src/lib/libcrypto/Symbols.namespace b/src/lib/libcrypto/Symbols.namespace index 0d524d4732..270be2262a 100644 --- a/src/lib/libcrypto/Symbols.namespace +++ b/src/lib/libcrypto/Symbols.namespace | |||
@@ -205,3 +205,55 @@ _libre_d2i_PKCS12_bio | |||
205 | _libre_d2i_PKCS12_fp | 205 | _libre_d2i_PKCS12_fp |
206 | _libre_PKCS12_newpass | 206 | _libre_PKCS12_newpass |
207 | _libre_ERR_load_PKCS12_strings | 207 | _libre_ERR_load_PKCS12_strings |
208 | _libre_UI_new | ||
209 | _libre_UI_new_method | ||
210 | _libre_UI_free | ||
211 | _libre_UI_add_input_string | ||
212 | _libre_UI_dup_input_string | ||
213 | _libre_UI_add_verify_string | ||
214 | _libre_UI_dup_verify_string | ||
215 | _libre_UI_add_input_boolean | ||
216 | _libre_UI_dup_input_boolean | ||
217 | _libre_UI_add_info_string | ||
218 | _libre_UI_dup_info_string | ||
219 | _libre_UI_add_error_string | ||
220 | _libre_UI_dup_error_string | ||
221 | _libre_UI_construct_prompt | ||
222 | _libre_UI_add_user_data | ||
223 | _libre_UI_get0_user_data | ||
224 | _libre_UI_get0_result | ||
225 | _libre_UI_process | ||
226 | _libre_UI_ctrl | ||
227 | _libre_UI_get_ex_new_index | ||
228 | _libre_UI_set_ex_data | ||
229 | _libre_UI_get_ex_data | ||
230 | _libre_UI_set_default_method | ||
231 | _libre_UI_get_default_method | ||
232 | _libre_UI_get_method | ||
233 | _libre_UI_set_method | ||
234 | _libre_UI_OpenSSL | ||
235 | _libre_UI_create_method | ||
236 | _libre_UI_destroy_method | ||
237 | _libre_UI_method_set_opener | ||
238 | _libre_UI_method_set_writer | ||
239 | _libre_UI_method_set_flusher | ||
240 | _libre_UI_method_set_reader | ||
241 | _libre_UI_method_set_closer | ||
242 | _libre_UI_method_set_prompt_constructor | ||
243 | _libre_UI_method_get_opener | ||
244 | _libre_UI_method_get_writer | ||
245 | _libre_UI_method_get_flusher | ||
246 | _libre_UI_method_get_reader | ||
247 | _libre_UI_method_get_closer | ||
248 | _libre_UI_get_string_type | ||
249 | _libre_UI_get_input_flags | ||
250 | _libre_UI_get0_output_string | ||
251 | _libre_UI_get0_action_string | ||
252 | _libre_UI_get0_result_string | ||
253 | _libre_UI_get0_test_string | ||
254 | _libre_UI_get_result_minsize | ||
255 | _libre_UI_get_result_maxsize | ||
256 | _libre_UI_set_result | ||
257 | _libre_UI_UTIL_read_pw_string | ||
258 | _libre_UI_UTIL_read_pw | ||
259 | _libre_ERR_load_UI_strings | ||
diff --git a/src/lib/libcrypto/hidden/openssl/ui.h b/src/lib/libcrypto/hidden/openssl/ui.h new file mode 100644 index 0000000000..7ad9ca0285 --- /dev/null +++ b/src/lib/libcrypto/hidden/openssl/ui.h | |||
@@ -0,0 +1,78 @@ | |||
1 | /* $OpenBSD: ui.h,v 1.1 2022/11/12 13:16:10 beck Exp $ */ | ||
2 | /* | ||
3 | * Copyright (c) 2022 Bob Beck <beck@openbsd.org> | ||
4 | * | ||
5 | * Permission to use, copy, modify, and distribute this software for any | ||
6 | * purpose with or without fee is hereby granted, provided that the above | ||
7 | * copyright notice and this permission notice appear in all copies. | ||
8 | * | ||
9 | * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES | ||
10 | * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF | ||
11 | * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR | ||
12 | * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES | ||
13 | * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN | ||
14 | * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF | ||
15 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | ||
16 | */ | ||
17 | |||
18 | #ifndef _LIBCRYPTO_UI_H | ||
19 | #define _LIBCRYPTO_UI_H | ||
20 | |||
21 | #include_next <openssl/ui.h> | ||
22 | #include "crypto_namespace.h" | ||
23 | |||
24 | LCRYPTO_USED(UI_new); | ||
25 | LCRYPTO_USED(UI_new_method); | ||
26 | LCRYPTO_USED(UI_free); | ||
27 | LCRYPTO_USED(UI_add_input_string); | ||
28 | LCRYPTO_USED(UI_dup_input_string); | ||
29 | LCRYPTO_USED(UI_add_verify_string); | ||
30 | LCRYPTO_USED(UI_dup_verify_string); | ||
31 | LCRYPTO_USED(UI_add_input_boolean); | ||
32 | LCRYPTO_USED(UI_dup_input_boolean); | ||
33 | LCRYPTO_USED(UI_add_info_string); | ||
34 | LCRYPTO_USED(UI_dup_info_string); | ||
35 | LCRYPTO_USED(UI_add_error_string); | ||
36 | LCRYPTO_USED(UI_dup_error_string); | ||
37 | LCRYPTO_USED(UI_construct_prompt); | ||
38 | LCRYPTO_USED(UI_add_user_data); | ||
39 | LCRYPTO_USED(UI_get0_user_data); | ||
40 | LCRYPTO_USED(UI_get0_result); | ||
41 | LCRYPTO_USED(UI_process); | ||
42 | LCRYPTO_USED(UI_ctrl); | ||
43 | LCRYPTO_USED(UI_get_ex_new_index); | ||
44 | LCRYPTO_USED(UI_set_ex_data); | ||
45 | LCRYPTO_USED(UI_get_ex_data); | ||
46 | LCRYPTO_USED(UI_set_default_method); | ||
47 | LCRYPTO_USED(UI_get_default_method); | ||
48 | LCRYPTO_USED(UI_get_method); | ||
49 | LCRYPTO_USED(UI_set_method); | ||
50 | LCRYPTO_USED(UI_OpenSSL); | ||
51 | LCRYPTO_USED(UI_create_method); | ||
52 | LCRYPTO_USED(UI_destroy_method); | ||
53 | LCRYPTO_USED(UI_method_set_opener); | ||
54 | LCRYPTO_USED(UI_method_set_writer); | ||
55 | LCRYPTO_USED(UI_method_set_flusher); | ||
56 | LCRYPTO_USED(UI_method_set_reader); | ||
57 | LCRYPTO_USED(UI_method_set_closer); | ||
58 | LCRYPTO_USED(UI_method_set_prompt_constructor); | ||
59 | LCRYPTO_USED(UI_method_get_opener); | ||
60 | LCRYPTO_USED(UI_method_get_writer); | ||
61 | LCRYPTO_USED(UI_method_get_flusher); | ||
62 | LCRYPTO_USED(UI_method_get_reader); | ||
63 | LCRYPTO_USED(UI_method_get_closer); | ||
64 | LCRYPTO_USED(UI_get_string_type); | ||
65 | LCRYPTO_USED(UI_get_input_flags); | ||
66 | LCRYPTO_USED(UI_get0_output_string); | ||
67 | LCRYPTO_USED(UI_get0_action_string); | ||
68 | LCRYPTO_USED(UI_get0_result_string); | ||
69 | LCRYPTO_USED(UI_get0_test_string); | ||
70 | LCRYPTO_USED(UI_get_result_minsize); | ||
71 | LCRYPTO_USED(UI_get_result_maxsize); | ||
72 | LCRYPTO_USED(UI_set_result); | ||
73 | LCRYPTO_USED(UI_UTIL_read_pw_string); | ||
74 | LCRYPTO_USED(UI_UTIL_read_pw); | ||
75 | LCRYPTO_USED(ERR_load_UI_strings); | ||
76 | LCRYPTO_USED(UI_method_get_prompt_constructor); | ||
77 | |||
78 | #endif /* _LIBCRYPTO_UI_H */ | ||
diff --git a/src/lib/libcrypto/ui/ui_err.c b/src/lib/libcrypto/ui/ui_err.c index 691403aff6..a1207fb0c3 100644 --- a/src/lib/libcrypto/ui/ui_err.c +++ b/src/lib/libcrypto/ui/ui_err.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ui_err.c,v 1.10 2022/07/12 14:42:50 kn Exp $ */ | 1 | /* $OpenBSD: ui_err.c,v 1.11 2022/11/12 13:16:10 beck Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 1999-2006 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1999-2006 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -93,3 +93,4 @@ ERR_load_UI_strings(void) | |||
93 | } | 93 | } |
94 | #endif | 94 | #endif |
95 | } | 95 | } |
96 | LCRYPTO_ALIAS(ERR_load_UI_strings) | ||
diff --git a/src/lib/libcrypto/ui/ui_lib.c b/src/lib/libcrypto/ui/ui_lib.c index 09522e716c..0a0e11784d 100644 --- a/src/lib/libcrypto/ui/ui_lib.c +++ b/src/lib/libcrypto/ui/ui_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ui_lib.c,v 1.44 2020/09/25 11:25:31 tb Exp $ */ | 1 | /* $OpenBSD: ui_lib.c,v 1.45 2022/11/12 13:16:10 beck Exp $ */ |
2 | /* Written by Richard Levitte (richard@levitte.org) for the OpenSSL | 2 | /* Written by Richard Levitte (richard@levitte.org) for the OpenSSL |
3 | * project 2001. | 3 | * project 2001. |
4 | */ | 4 | */ |
@@ -73,6 +73,7 @@ UI_new(void) | |||
73 | { | 73 | { |
74 | return (UI_new_method(NULL)); | 74 | return (UI_new_method(NULL)); |
75 | } | 75 | } |
76 | LCRYPTO_ALIAS(UI_new) | ||
76 | 77 | ||
77 | UI * | 78 | UI * |
78 | UI_new_method(const UI_METHOD *method) | 79 | UI_new_method(const UI_METHOD *method) |
@@ -89,6 +90,7 @@ UI_new_method(const UI_METHOD *method) | |||
89 | 90 | ||
90 | return ret; | 91 | return ret; |
91 | } | 92 | } |
93 | LCRYPTO_ALIAS(UI_new_method) | ||
92 | 94 | ||
93 | static void | 95 | static void |
94 | free_string(UI_STRING *uis) | 96 | free_string(UI_STRING *uis) |
@@ -119,6 +121,7 @@ UI_free(UI *ui) | |||
119 | CRYPTO_free_ex_data(CRYPTO_EX_INDEX_UI, ui, &ui->ex_data); | 121 | CRYPTO_free_ex_data(CRYPTO_EX_INDEX_UI, ui, &ui->ex_data); |
120 | free(ui); | 122 | free(ui); |
121 | } | 123 | } |
124 | LCRYPTO_ALIAS(UI_free) | ||
122 | 125 | ||
123 | static int | 126 | static int |
124 | allocate_string_stack(UI *ui) | 127 | allocate_string_stack(UI *ui) |
@@ -265,6 +268,7 @@ UI_add_input_string(UI *ui, const char *prompt, int flags, char *result_buf, | |||
265 | return general_allocate_string(ui, prompt, 0, UIT_PROMPT, flags, | 268 | return general_allocate_string(ui, prompt, 0, UIT_PROMPT, flags, |
266 | result_buf, minsize, maxsize, NULL); | 269 | result_buf, minsize, maxsize, NULL); |
267 | } | 270 | } |
271 | LCRYPTO_ALIAS(UI_add_input_string) | ||
268 | 272 | ||
269 | /* Same as UI_add_input_string(), excepts it takes a copy of the prompt. */ | 273 | /* Same as UI_add_input_string(), excepts it takes a copy of the prompt. */ |
270 | int | 274 | int |
@@ -274,6 +278,7 @@ UI_dup_input_string(UI *ui, const char *prompt, int flags, char *result_buf, | |||
274 | return general_allocate_string(ui, prompt, 1, UIT_PROMPT, flags, | 278 | return general_allocate_string(ui, prompt, 1, UIT_PROMPT, flags, |
275 | result_buf, minsize, maxsize, NULL); | 279 | result_buf, minsize, maxsize, NULL); |
276 | } | 280 | } |
281 | LCRYPTO_ALIAS(UI_dup_input_string) | ||
277 | 282 | ||
278 | int | 283 | int |
279 | UI_add_verify_string(UI *ui, const char *prompt, int flags, char *result_buf, | 284 | UI_add_verify_string(UI *ui, const char *prompt, int flags, char *result_buf, |
@@ -282,6 +287,7 @@ UI_add_verify_string(UI *ui, const char *prompt, int flags, char *result_buf, | |||
282 | return general_allocate_string(ui, prompt, 0, UIT_VERIFY, flags, | 287 | return general_allocate_string(ui, prompt, 0, UIT_VERIFY, flags, |
283 | result_buf, minsize, maxsize, test_buf); | 288 | result_buf, minsize, maxsize, test_buf); |
284 | } | 289 | } |
290 | LCRYPTO_ALIAS(UI_add_verify_string) | ||
285 | 291 | ||
286 | int | 292 | int |
287 | UI_dup_verify_string(UI *ui, const char *prompt, int flags, | 293 | UI_dup_verify_string(UI *ui, const char *prompt, int flags, |
@@ -290,6 +296,7 @@ UI_dup_verify_string(UI *ui, const char *prompt, int flags, | |||
290 | return general_allocate_string(ui, prompt, 1, UIT_VERIFY, flags, | 296 | return general_allocate_string(ui, prompt, 1, UIT_VERIFY, flags, |
291 | result_buf, minsize, maxsize, test_buf); | 297 | result_buf, minsize, maxsize, test_buf); |
292 | } | 298 | } |
299 | LCRYPTO_ALIAS(UI_dup_verify_string) | ||
293 | 300 | ||
294 | int | 301 | int |
295 | UI_add_input_boolean(UI *ui, const char *prompt, const char *action_desc, | 302 | UI_add_input_boolean(UI *ui, const char *prompt, const char *action_desc, |
@@ -298,6 +305,7 @@ UI_add_input_boolean(UI *ui, const char *prompt, const char *action_desc, | |||
298 | return general_allocate_boolean(ui, prompt, action_desc, ok_chars, | 305 | return general_allocate_boolean(ui, prompt, action_desc, ok_chars, |
299 | cancel_chars, 0, UIT_BOOLEAN, flags, result_buf); | 306 | cancel_chars, 0, UIT_BOOLEAN, flags, result_buf); |
300 | } | 307 | } |
308 | LCRYPTO_ALIAS(UI_add_input_boolean) | ||
301 | 309 | ||
302 | int | 310 | int |
303 | UI_dup_input_boolean(UI *ui, const char *prompt, const char *action_desc, | 311 | UI_dup_input_boolean(UI *ui, const char *prompt, const char *action_desc, |
@@ -306,6 +314,7 @@ UI_dup_input_boolean(UI *ui, const char *prompt, const char *action_desc, | |||
306 | return general_allocate_boolean(ui, prompt, action_desc, ok_chars, | 314 | return general_allocate_boolean(ui, prompt, action_desc, ok_chars, |
307 | cancel_chars, 1, UIT_BOOLEAN, flags, result_buf); | 315 | cancel_chars, 1, UIT_BOOLEAN, flags, result_buf); |
308 | } | 316 | } |
317 | LCRYPTO_ALIAS(UI_dup_input_boolean) | ||
309 | 318 | ||
310 | int | 319 | int |
311 | UI_add_info_string(UI *ui, const char *text) | 320 | UI_add_info_string(UI *ui, const char *text) |
@@ -313,6 +322,7 @@ UI_add_info_string(UI *ui, const char *text) | |||
313 | return general_allocate_string(ui, text, 0, UIT_INFO, 0, NULL, 0, 0, | 322 | return general_allocate_string(ui, text, 0, UIT_INFO, 0, NULL, 0, 0, |
314 | NULL); | 323 | NULL); |
315 | } | 324 | } |
325 | LCRYPTO_ALIAS(UI_add_info_string) | ||
316 | 326 | ||
317 | int | 327 | int |
318 | UI_dup_info_string(UI *ui, const char *text) | 328 | UI_dup_info_string(UI *ui, const char *text) |
@@ -320,6 +330,7 @@ UI_dup_info_string(UI *ui, const char *text) | |||
320 | return general_allocate_string(ui, text, 1, UIT_INFO, 0, NULL, 0, 0, | 330 | return general_allocate_string(ui, text, 1, UIT_INFO, 0, NULL, 0, 0, |
321 | NULL); | 331 | NULL); |
322 | } | 332 | } |
333 | LCRYPTO_ALIAS(UI_dup_info_string) | ||
323 | 334 | ||
324 | int | 335 | int |
325 | UI_add_error_string(UI *ui, const char *text) | 336 | UI_add_error_string(UI *ui, const char *text) |
@@ -327,6 +338,7 @@ UI_add_error_string(UI *ui, const char *text) | |||
327 | return general_allocate_string(ui, text, 0, UIT_ERROR, 0, NULL, 0, 0, | 338 | return general_allocate_string(ui, text, 0, UIT_ERROR, 0, NULL, 0, 0, |
328 | NULL); | 339 | NULL); |
329 | } | 340 | } |
341 | LCRYPTO_ALIAS(UI_add_error_string) | ||
330 | 342 | ||
331 | int | 343 | int |
332 | UI_dup_error_string(UI *ui, const char *text) | 344 | UI_dup_error_string(UI *ui, const char *text) |
@@ -334,6 +346,7 @@ UI_dup_error_string(UI *ui, const char *text) | |||
334 | return general_allocate_string(ui, text, 1, UIT_ERROR, 0, NULL, 0, 0, | 346 | return general_allocate_string(ui, text, 1, UIT_ERROR, 0, NULL, 0, 0, |
335 | NULL); | 347 | NULL); |
336 | } | 348 | } |
349 | LCRYPTO_ALIAS(UI_dup_error_string) | ||
337 | 350 | ||
338 | char * | 351 | char * |
339 | UI_construct_prompt(UI *ui, const char *object_desc, const char *object_name) | 352 | UI_construct_prompt(UI *ui, const char *object_desc, const char *object_name) |
@@ -358,6 +371,7 @@ UI_construct_prompt(UI *ui, const char *object_desc, const char *object_name) | |||
358 | 371 | ||
359 | return prompt; | 372 | return prompt; |
360 | } | 373 | } |
374 | LCRYPTO_ALIAS(UI_construct_prompt) | ||
361 | 375 | ||
362 | void * | 376 | void * |
363 | UI_add_user_data(UI *ui, void *user_data) | 377 | UI_add_user_data(UI *ui, void *user_data) |
@@ -367,12 +381,14 @@ UI_add_user_data(UI *ui, void *user_data) | |||
367 | ui->user_data = user_data; | 381 | ui->user_data = user_data; |
368 | return old_data; | 382 | return old_data; |
369 | } | 383 | } |
384 | LCRYPTO_ALIAS(UI_add_user_data) | ||
370 | 385 | ||
371 | void * | 386 | void * |
372 | UI_get0_user_data(UI *ui) | 387 | UI_get0_user_data(UI *ui) |
373 | { | 388 | { |
374 | return ui->user_data; | 389 | return ui->user_data; |
375 | } | 390 | } |
391 | LCRYPTO_ALIAS(UI_get0_user_data) | ||
376 | 392 | ||
377 | const char * | 393 | const char * |
378 | UI_get0_result(UI *ui, int i) | 394 | UI_get0_result(UI *ui, int i) |
@@ -387,6 +403,7 @@ UI_get0_result(UI *ui, int i) | |||
387 | } | 403 | } |
388 | return UI_get0_result_string(sk_UI_STRING_value(ui->strings, i)); | 404 | return UI_get0_result_string(sk_UI_STRING_value(ui->strings, i)); |
389 | } | 405 | } |
406 | LCRYPTO_ALIAS(UI_get0_result) | ||
390 | 407 | ||
391 | static int | 408 | static int |
392 | print_error(const char *str, size_t len, void *arg) | 409 | print_error(const char *str, size_t len, void *arg) |
@@ -460,6 +477,7 @@ UI_process(UI *ui) | |||
460 | return -1; | 477 | return -1; |
461 | return ok; | 478 | return ok; |
462 | } | 479 | } |
480 | LCRYPTO_ALIAS(UI_process) | ||
463 | 481 | ||
464 | int | 482 | int |
465 | UI_ctrl(UI *ui, int cmd, long i, void *p, void (*f) (void)) | 483 | UI_ctrl(UI *ui, int cmd, long i, void *p, void (*f) (void)) |
@@ -486,6 +504,7 @@ UI_ctrl(UI *ui, int cmd, long i, void *p, void (*f) (void)) | |||
486 | UIerror(UI_R_UNKNOWN_CONTROL_COMMAND); | 504 | UIerror(UI_R_UNKNOWN_CONTROL_COMMAND); |
487 | return -1; | 505 | return -1; |
488 | } | 506 | } |
507 | LCRYPTO_ALIAS(UI_ctrl) | ||
489 | 508 | ||
490 | int | 509 | int |
491 | UI_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func, | 510 | UI_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func, |
@@ -494,24 +513,28 @@ UI_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func, | |||
494 | return CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_UI, argl, argp, | 513 | return CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_UI, argl, argp, |
495 | new_func, dup_func, free_func); | 514 | new_func, dup_func, free_func); |
496 | } | 515 | } |
516 | LCRYPTO_ALIAS(UI_get_ex_new_index) | ||
497 | 517 | ||
498 | int | 518 | int |
499 | UI_set_ex_data(UI *r, int idx, void *arg) | 519 | UI_set_ex_data(UI *r, int idx, void *arg) |
500 | { | 520 | { |
501 | return (CRYPTO_set_ex_data(&r->ex_data, idx, arg)); | 521 | return (CRYPTO_set_ex_data(&r->ex_data, idx, arg)); |
502 | } | 522 | } |
523 | LCRYPTO_ALIAS(UI_set_ex_data) | ||
503 | 524 | ||
504 | void * | 525 | void * |
505 | UI_get_ex_data(UI *r, int idx) | 526 | UI_get_ex_data(UI *r, int idx) |
506 | { | 527 | { |
507 | return (CRYPTO_get_ex_data(&r->ex_data, idx)); | 528 | return (CRYPTO_get_ex_data(&r->ex_data, idx)); |
508 | } | 529 | } |
530 | LCRYPTO_ALIAS(UI_get_ex_data) | ||
509 | 531 | ||
510 | void | 532 | void |
511 | UI_set_default_method(const UI_METHOD *meth) | 533 | UI_set_default_method(const UI_METHOD *meth) |
512 | { | 534 | { |
513 | default_UI_meth = meth; | 535 | default_UI_meth = meth; |
514 | } | 536 | } |
537 | LCRYPTO_ALIAS(UI_set_default_method) | ||
515 | 538 | ||
516 | const UI_METHOD * | 539 | const UI_METHOD * |
517 | UI_get_default_method(void) | 540 | UI_get_default_method(void) |
@@ -521,12 +544,14 @@ UI_get_default_method(void) | |||
521 | } | 544 | } |
522 | return default_UI_meth; | 545 | return default_UI_meth; |
523 | } | 546 | } |
547 | LCRYPTO_ALIAS(UI_get_default_method) | ||
524 | 548 | ||
525 | const UI_METHOD * | 549 | const UI_METHOD * |
526 | UI_get_method(UI *ui) | 550 | UI_get_method(UI *ui) |
527 | { | 551 | { |
528 | return ui->meth; | 552 | return ui->meth; |
529 | } | 553 | } |
554 | LCRYPTO_ALIAS(UI_get_method) | ||
530 | 555 | ||
531 | const UI_METHOD * | 556 | const UI_METHOD * |
532 | UI_set_method(UI *ui, const UI_METHOD *meth) | 557 | UI_set_method(UI *ui, const UI_METHOD *meth) |
@@ -534,6 +559,7 @@ UI_set_method(UI *ui, const UI_METHOD *meth) | |||
534 | ui->meth = meth; | 559 | ui->meth = meth; |
535 | return ui->meth; | 560 | return ui->meth; |
536 | } | 561 | } |
562 | LCRYPTO_ALIAS(UI_set_method) | ||
537 | 563 | ||
538 | 564 | ||
539 | UI_METHOD * | 565 | UI_METHOD * |
@@ -546,6 +572,7 @@ UI_create_method(const char *name) | |||
546 | 572 | ||
547 | return ui_method; | 573 | return ui_method; |
548 | } | 574 | } |
575 | LCRYPTO_ALIAS(UI_create_method) | ||
549 | 576 | ||
550 | /* | 577 | /* |
551 | * BIG FSCKING WARNING!!!! If you use this on a statically allocated method | 578 | * BIG FSCKING WARNING!!!! If you use this on a statically allocated method |
@@ -559,6 +586,7 @@ UI_destroy_method(UI_METHOD *ui_method) | |||
559 | ui_method->name = NULL; | 586 | ui_method->name = NULL; |
560 | free(ui_method); | 587 | free(ui_method); |
561 | } | 588 | } |
589 | LCRYPTO_ALIAS(UI_destroy_method) | ||
562 | 590 | ||
563 | int | 591 | int |
564 | UI_method_set_opener(UI_METHOD *method, int (*opener)(UI *ui)) | 592 | UI_method_set_opener(UI_METHOD *method, int (*opener)(UI *ui)) |
@@ -569,6 +597,7 @@ UI_method_set_opener(UI_METHOD *method, int (*opener)(UI *ui)) | |||
569 | } | 597 | } |
570 | return -1; | 598 | return -1; |
571 | } | 599 | } |
600 | LCRYPTO_ALIAS(UI_method_set_opener) | ||
572 | 601 | ||
573 | int | 602 | int |
574 | UI_method_set_writer(UI_METHOD *method, int (*writer)(UI *ui, UI_STRING *uis)) | 603 | UI_method_set_writer(UI_METHOD *method, int (*writer)(UI *ui, UI_STRING *uis)) |
@@ -579,6 +608,7 @@ UI_method_set_writer(UI_METHOD *method, int (*writer)(UI *ui, UI_STRING *uis)) | |||
579 | } | 608 | } |
580 | return -1; | 609 | return -1; |
581 | } | 610 | } |
611 | LCRYPTO_ALIAS(UI_method_set_writer) | ||
582 | 612 | ||
583 | int | 613 | int |
584 | UI_method_set_flusher(UI_METHOD *method, int (*flusher)(UI *ui)) | 614 | UI_method_set_flusher(UI_METHOD *method, int (*flusher)(UI *ui)) |
@@ -589,6 +619,7 @@ UI_method_set_flusher(UI_METHOD *method, int (*flusher)(UI *ui)) | |||
589 | } | 619 | } |
590 | return -1; | 620 | return -1; |
591 | } | 621 | } |
622 | LCRYPTO_ALIAS(UI_method_set_flusher) | ||
592 | 623 | ||
593 | int | 624 | int |
594 | UI_method_set_reader(UI_METHOD *method, int (*reader)(UI *ui, UI_STRING *uis)) | 625 | UI_method_set_reader(UI_METHOD *method, int (*reader)(UI *ui, UI_STRING *uis)) |
@@ -599,6 +630,7 @@ UI_method_set_reader(UI_METHOD *method, int (*reader)(UI *ui, UI_STRING *uis)) | |||
599 | } | 630 | } |
600 | return -1; | 631 | return -1; |
601 | } | 632 | } |
633 | LCRYPTO_ALIAS(UI_method_set_reader) | ||
602 | 634 | ||
603 | int | 635 | int |
604 | UI_method_set_closer(UI_METHOD *method, int (*closer)(UI *ui)) | 636 | UI_method_set_closer(UI_METHOD *method, int (*closer)(UI *ui)) |
@@ -609,6 +641,7 @@ UI_method_set_closer(UI_METHOD *method, int (*closer)(UI *ui)) | |||
609 | } | 641 | } |
610 | return -1; | 642 | return -1; |
611 | } | 643 | } |
644 | LCRYPTO_ALIAS(UI_method_set_closer) | ||
612 | 645 | ||
613 | int | 646 | int |
614 | UI_method_set_prompt_constructor(UI_METHOD *method, | 647 | UI_method_set_prompt_constructor(UI_METHOD *method, |
@@ -621,6 +654,7 @@ UI_method_set_prompt_constructor(UI_METHOD *method, | |||
621 | } | 654 | } |
622 | return -1; | 655 | return -1; |
623 | } | 656 | } |
657 | LCRYPTO_ALIAS(UI_method_set_prompt_constructor) | ||
624 | 658 | ||
625 | int | 659 | int |
626 | (*UI_method_get_opener(const UI_METHOD * method))(UI *) | 660 | (*UI_method_get_opener(const UI_METHOD * method))(UI *) |
@@ -629,6 +663,7 @@ int | |||
629 | return method->ui_open_session; | 663 | return method->ui_open_session; |
630 | return NULL; | 664 | return NULL; |
631 | } | 665 | } |
666 | LCRYPTO_ALIAS(UI_method_get_opener) | ||
632 | 667 | ||
633 | int | 668 | int |
634 | (*UI_method_get_writer(const UI_METHOD *method))(UI *, UI_STRING *) | 669 | (*UI_method_get_writer(const UI_METHOD *method))(UI *, UI_STRING *) |
@@ -637,6 +672,7 @@ int | |||
637 | return method->ui_write_string; | 672 | return method->ui_write_string; |
638 | return NULL; | 673 | return NULL; |
639 | } | 674 | } |
675 | LCRYPTO_ALIAS(UI_method_get_writer) | ||
640 | 676 | ||
641 | int | 677 | int |
642 | (*UI_method_get_flusher(const UI_METHOD *method)) (UI *) | 678 | (*UI_method_get_flusher(const UI_METHOD *method)) (UI *) |
@@ -645,6 +681,7 @@ int | |||
645 | return method->ui_flush; | 681 | return method->ui_flush; |
646 | return NULL; | 682 | return NULL; |
647 | } | 683 | } |
684 | LCRYPTO_ALIAS(UI_method_get_flusher) | ||
648 | 685 | ||
649 | int | 686 | int |
650 | (*UI_method_get_reader(const UI_METHOD *method))(UI *, UI_STRING *) | 687 | (*UI_method_get_reader(const UI_METHOD *method))(UI *, UI_STRING *) |
@@ -653,6 +690,7 @@ int | |||
653 | return method->ui_read_string; | 690 | return method->ui_read_string; |
654 | return NULL; | 691 | return NULL; |
655 | } | 692 | } |
693 | LCRYPTO_ALIAS(UI_method_get_reader) | ||
656 | 694 | ||
657 | int | 695 | int |
658 | (*UI_method_get_closer(const UI_METHOD *method))(UI *) | 696 | (*UI_method_get_closer(const UI_METHOD *method))(UI *) |
@@ -661,6 +699,7 @@ int | |||
661 | return method->ui_close_session; | 699 | return method->ui_close_session; |
662 | return NULL; | 700 | return NULL; |
663 | } | 701 | } |
702 | LCRYPTO_ALIAS(UI_method_get_closer) | ||
664 | 703 | ||
665 | char * | 704 | char * |
666 | (*UI_method_get_prompt_constructor(const UI_METHOD *method))(UI *, const char *, | 705 | (*UI_method_get_prompt_constructor(const UI_METHOD *method))(UI *, const char *, |
@@ -670,6 +709,7 @@ char * | |||
670 | return method->ui_construct_prompt; | 709 | return method->ui_construct_prompt; |
671 | return NULL; | 710 | return NULL; |
672 | } | 711 | } |
712 | LCRYPTO_ALIAS(UI_method_get_prompt_constructor) | ||
673 | 713 | ||
674 | enum UI_string_types | 714 | enum UI_string_types |
675 | UI_get_string_type(UI_STRING *uis) | 715 | UI_get_string_type(UI_STRING *uis) |
@@ -678,6 +718,7 @@ UI_get_string_type(UI_STRING *uis) | |||
678 | return UIT_NONE; | 718 | return UIT_NONE; |
679 | return uis->type; | 719 | return uis->type; |
680 | } | 720 | } |
721 | LCRYPTO_ALIAS(UI_get_string_type) | ||
681 | 722 | ||
682 | int | 723 | int |
683 | UI_get_input_flags(UI_STRING *uis) | 724 | UI_get_input_flags(UI_STRING *uis) |
@@ -686,6 +727,7 @@ UI_get_input_flags(UI_STRING *uis) | |||
686 | return 0; | 727 | return 0; |
687 | return uis->input_flags; | 728 | return uis->input_flags; |
688 | } | 729 | } |
730 | LCRYPTO_ALIAS(UI_get_input_flags) | ||
689 | 731 | ||
690 | const char * | 732 | const char * |
691 | UI_get0_output_string(UI_STRING *uis) | 733 | UI_get0_output_string(UI_STRING *uis) |
@@ -694,6 +736,7 @@ UI_get0_output_string(UI_STRING *uis) | |||
694 | return NULL; | 736 | return NULL; |
695 | return uis->out_string; | 737 | return uis->out_string; |
696 | } | 738 | } |
739 | LCRYPTO_ALIAS(UI_get0_output_string) | ||
697 | 740 | ||
698 | const char * | 741 | const char * |
699 | UI_get0_action_string(UI_STRING *uis) | 742 | UI_get0_action_string(UI_STRING *uis) |
@@ -708,6 +751,7 @@ UI_get0_action_string(UI_STRING *uis) | |||
708 | return NULL; | 751 | return NULL; |
709 | } | 752 | } |
710 | } | 753 | } |
754 | LCRYPTO_ALIAS(UI_get0_action_string) | ||
711 | 755 | ||
712 | const char * | 756 | const char * |
713 | UI_get0_result_string(UI_STRING *uis) | 757 | UI_get0_result_string(UI_STRING *uis) |
@@ -722,6 +766,7 @@ UI_get0_result_string(UI_STRING *uis) | |||
722 | return NULL; | 766 | return NULL; |
723 | } | 767 | } |
724 | } | 768 | } |
769 | LCRYPTO_ALIAS(UI_get0_result_string) | ||
725 | 770 | ||
726 | const char * | 771 | const char * |
727 | UI_get0_test_string(UI_STRING *uis) | 772 | UI_get0_test_string(UI_STRING *uis) |
@@ -735,6 +780,7 @@ UI_get0_test_string(UI_STRING *uis) | |||
735 | return NULL; | 780 | return NULL; |
736 | } | 781 | } |
737 | } | 782 | } |
783 | LCRYPTO_ALIAS(UI_get0_test_string) | ||
738 | 784 | ||
739 | int | 785 | int |
740 | UI_get_result_minsize(UI_STRING *uis) | 786 | UI_get_result_minsize(UI_STRING *uis) |
@@ -749,6 +795,7 @@ UI_get_result_minsize(UI_STRING *uis) | |||
749 | return -1; | 795 | return -1; |
750 | } | 796 | } |
751 | } | 797 | } |
798 | LCRYPTO_ALIAS(UI_get_result_minsize) | ||
752 | 799 | ||
753 | int | 800 | int |
754 | UI_get_result_maxsize(UI_STRING *uis) | 801 | UI_get_result_maxsize(UI_STRING *uis) |
@@ -763,6 +810,7 @@ UI_get_result_maxsize(UI_STRING *uis) | |||
763 | return -1; | 810 | return -1; |
764 | } | 811 | } |
765 | } | 812 | } |
813 | LCRYPTO_ALIAS(UI_get_result_maxsize) | ||
766 | 814 | ||
767 | int | 815 | int |
768 | UI_set_result(UI *ui, UI_STRING *uis, const char *result) | 816 | UI_set_result(UI *ui, UI_STRING *uis, const char *result) |
@@ -825,3 +873,4 @@ UI_set_result(UI *ui, UI_STRING *uis, const char *result) | |||
825 | } | 873 | } |
826 | return 0; | 874 | return 0; |
827 | } | 875 | } |
876 | LCRYPTO_ALIAS(UI_set_result) | ||
diff --git a/src/lib/libcrypto/ui/ui_openssl.c b/src/lib/libcrypto/ui/ui_openssl.c index 9562c2c937..81d7b8de1c 100644 --- a/src/lib/libcrypto/ui/ui_openssl.c +++ b/src/lib/libcrypto/ui/ui_openssl.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ui_openssl.c,v 1.25 2015/09/10 15:56:26 jsing Exp $ */ | 1 | /* $OpenBSD: ui_openssl.c,v 1.26 2022/11/12 13:16:10 beck Exp $ */ |
2 | /* Written by Richard Levitte (richard@levitte.org) and others | 2 | /* Written by Richard Levitte (richard@levitte.org) and others |
3 | * for the OpenSSL project 2001. | 3 | * for the OpenSSL project 2001. |
4 | */ | 4 | */ |
@@ -167,6 +167,7 @@ UI_OpenSSL(void) | |||
167 | { | 167 | { |
168 | return &ui_openssl; | 168 | return &ui_openssl; |
169 | } | 169 | } |
170 | LCRYPTO_ALIAS(UI_OpenSSL) | ||
170 | 171 | ||
171 | /* The following function makes sure that info and error strings are printed | 172 | /* The following function makes sure that info and error strings are printed |
172 | before any prompt. */ | 173 | before any prompt. */ |
diff --git a/src/lib/libcrypto/ui/ui_util.c b/src/lib/libcrypto/ui/ui_util.c index d1040c9826..808b294d76 100644 --- a/src/lib/libcrypto/ui/ui_util.c +++ b/src/lib/libcrypto/ui/ui_util.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ui_util.c,v 1.10 2015/09/10 15:56:26 jsing Exp $ */ | 1 | /* $OpenBSD: ui_util.c,v 1.11 2022/11/12 13:16:10 beck Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 2001-2002 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 2001-2002 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -70,6 +70,7 @@ UI_UTIL_read_pw_string(char *buf, int length, const char *prompt, int verify) | |||
70 | explicit_bzero(buff, BUFSIZ); | 70 | explicit_bzero(buff, BUFSIZ); |
71 | return (ret); | 71 | return (ret); |
72 | } | 72 | } |
73 | LCRYPTO_ALIAS(UI_UTIL_read_pw_string) | ||
73 | 74 | ||
74 | int | 75 | int |
75 | UI_UTIL_read_pw(char *buf, char *buff, int size, const char *prompt, int verify) | 76 | UI_UTIL_read_pw(char *buf, char *buff, int size, const char *prompt, int verify) |
@@ -94,6 +95,7 @@ UI_UTIL_read_pw(char *buf, char *buff, int size, const char *prompt, int verify) | |||
94 | ok = 0; | 95 | ok = 0; |
95 | return (ok); | 96 | return (ok); |
96 | } | 97 | } |
98 | LCRYPTO_ALIAS(UI_UTIL_read_pw) | ||
97 | 99 | ||
98 | /* | 100 | /* |
99 | * Old compatibility glue - see comment in ui_compat.h. | 101 | * Old compatibility glue - see comment in ui_compat.h. |