summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbeck <>2022-11-12 13:16:10 +0000
committerbeck <>2022-11-12 13:16:10 +0000
commit70ab1d8e94bd3980047d58c783b898276a0faa90 (patch)
treea76738290dfec55de731944109fadcfacf100efc
parent3b3bd87c8ba6eed119f57fda3b29fee076d34d15 (diff)
downloadopenbsd-70ab1d8e94bd3980047d58c783b898276a0faa90.tar.gz
openbsd-70ab1d8e94bd3980047d58c783b898276a0faa90.tar.bz2
openbsd-70ab1d8e94bd3980047d58c783b898276a0faa90.zip
Hide symbols in libcrypto/ui
ok jsing@
-rw-r--r--src/lib/libcrypto/Symbols.namespace52
-rw-r--r--src/lib/libcrypto/hidden/openssl/ui.h78
-rw-r--r--src/lib/libcrypto/ui/ui_err.c3
-rw-r--r--src/lib/libcrypto/ui/ui_lib.c51
-rw-r--r--src/lib/libcrypto/ui/ui_openssl.c3
-rw-r--r--src/lib/libcrypto/ui/ui_util.c4
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
24LCRYPTO_USED(UI_new);
25LCRYPTO_USED(UI_new_method);
26LCRYPTO_USED(UI_free);
27LCRYPTO_USED(UI_add_input_string);
28LCRYPTO_USED(UI_dup_input_string);
29LCRYPTO_USED(UI_add_verify_string);
30LCRYPTO_USED(UI_dup_verify_string);
31LCRYPTO_USED(UI_add_input_boolean);
32LCRYPTO_USED(UI_dup_input_boolean);
33LCRYPTO_USED(UI_add_info_string);
34LCRYPTO_USED(UI_dup_info_string);
35LCRYPTO_USED(UI_add_error_string);
36LCRYPTO_USED(UI_dup_error_string);
37LCRYPTO_USED(UI_construct_prompt);
38LCRYPTO_USED(UI_add_user_data);
39LCRYPTO_USED(UI_get0_user_data);
40LCRYPTO_USED(UI_get0_result);
41LCRYPTO_USED(UI_process);
42LCRYPTO_USED(UI_ctrl);
43LCRYPTO_USED(UI_get_ex_new_index);
44LCRYPTO_USED(UI_set_ex_data);
45LCRYPTO_USED(UI_get_ex_data);
46LCRYPTO_USED(UI_set_default_method);
47LCRYPTO_USED(UI_get_default_method);
48LCRYPTO_USED(UI_get_method);
49LCRYPTO_USED(UI_set_method);
50LCRYPTO_USED(UI_OpenSSL);
51LCRYPTO_USED(UI_create_method);
52LCRYPTO_USED(UI_destroy_method);
53LCRYPTO_USED(UI_method_set_opener);
54LCRYPTO_USED(UI_method_set_writer);
55LCRYPTO_USED(UI_method_set_flusher);
56LCRYPTO_USED(UI_method_set_reader);
57LCRYPTO_USED(UI_method_set_closer);
58LCRYPTO_USED(UI_method_set_prompt_constructor);
59LCRYPTO_USED(UI_method_get_opener);
60LCRYPTO_USED(UI_method_get_writer);
61LCRYPTO_USED(UI_method_get_flusher);
62LCRYPTO_USED(UI_method_get_reader);
63LCRYPTO_USED(UI_method_get_closer);
64LCRYPTO_USED(UI_get_string_type);
65LCRYPTO_USED(UI_get_input_flags);
66LCRYPTO_USED(UI_get0_output_string);
67LCRYPTO_USED(UI_get0_action_string);
68LCRYPTO_USED(UI_get0_result_string);
69LCRYPTO_USED(UI_get0_test_string);
70LCRYPTO_USED(UI_get_result_minsize);
71LCRYPTO_USED(UI_get_result_maxsize);
72LCRYPTO_USED(UI_set_result);
73LCRYPTO_USED(UI_UTIL_read_pw_string);
74LCRYPTO_USED(UI_UTIL_read_pw);
75LCRYPTO_USED(ERR_load_UI_strings);
76LCRYPTO_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}
96LCRYPTO_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}
76LCRYPTO_ALIAS(UI_new)
76 77
77UI * 78UI *
78UI_new_method(const UI_METHOD *method) 79UI_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}
93LCRYPTO_ALIAS(UI_new_method)
92 94
93static void 95static void
94free_string(UI_STRING *uis) 96free_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}
124LCRYPTO_ALIAS(UI_free)
122 125
123static int 126static int
124allocate_string_stack(UI *ui) 127allocate_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}
271LCRYPTO_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. */
270int 274int
@@ -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}
281LCRYPTO_ALIAS(UI_dup_input_string)
277 282
278int 283int
279UI_add_verify_string(UI *ui, const char *prompt, int flags, char *result_buf, 284UI_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}
290LCRYPTO_ALIAS(UI_add_verify_string)
285 291
286int 292int
287UI_dup_verify_string(UI *ui, const char *prompt, int flags, 293UI_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}
299LCRYPTO_ALIAS(UI_dup_verify_string)
293 300
294int 301int
295UI_add_input_boolean(UI *ui, const char *prompt, const char *action_desc, 302UI_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}
308LCRYPTO_ALIAS(UI_add_input_boolean)
301 309
302int 310int
303UI_dup_input_boolean(UI *ui, const char *prompt, const char *action_desc, 311UI_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}
317LCRYPTO_ALIAS(UI_dup_input_boolean)
309 318
310int 319int
311UI_add_info_string(UI *ui, const char *text) 320UI_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}
325LCRYPTO_ALIAS(UI_add_info_string)
316 326
317int 327int
318UI_dup_info_string(UI *ui, const char *text) 328UI_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}
333LCRYPTO_ALIAS(UI_dup_info_string)
323 334
324int 335int
325UI_add_error_string(UI *ui, const char *text) 336UI_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}
341LCRYPTO_ALIAS(UI_add_error_string)
330 342
331int 343int
332UI_dup_error_string(UI *ui, const char *text) 344UI_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}
349LCRYPTO_ALIAS(UI_dup_error_string)
337 350
338char * 351char *
339UI_construct_prompt(UI *ui, const char *object_desc, const char *object_name) 352UI_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}
374LCRYPTO_ALIAS(UI_construct_prompt)
361 375
362void * 376void *
363UI_add_user_data(UI *ui, void *user_data) 377UI_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}
384LCRYPTO_ALIAS(UI_add_user_data)
370 385
371void * 386void *
372UI_get0_user_data(UI *ui) 387UI_get0_user_data(UI *ui)
373{ 388{
374 return ui->user_data; 389 return ui->user_data;
375} 390}
391LCRYPTO_ALIAS(UI_get0_user_data)
376 392
377const char * 393const char *
378UI_get0_result(UI *ui, int i) 394UI_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}
406LCRYPTO_ALIAS(UI_get0_result)
390 407
391static int 408static int
392print_error(const char *str, size_t len, void *arg) 409print_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}
480LCRYPTO_ALIAS(UI_process)
463 481
464int 482int
465UI_ctrl(UI *ui, int cmd, long i, void *p, void (*f) (void)) 483UI_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}
507LCRYPTO_ALIAS(UI_ctrl)
489 508
490int 509int
491UI_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func, 510UI_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}
516LCRYPTO_ALIAS(UI_get_ex_new_index)
497 517
498int 518int
499UI_set_ex_data(UI *r, int idx, void *arg) 519UI_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}
523LCRYPTO_ALIAS(UI_set_ex_data)
503 524
504void * 525void *
505UI_get_ex_data(UI *r, int idx) 526UI_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}
530LCRYPTO_ALIAS(UI_get_ex_data)
509 531
510void 532void
511UI_set_default_method(const UI_METHOD *meth) 533UI_set_default_method(const UI_METHOD *meth)
512{ 534{
513 default_UI_meth = meth; 535 default_UI_meth = meth;
514} 536}
537LCRYPTO_ALIAS(UI_set_default_method)
515 538
516const UI_METHOD * 539const UI_METHOD *
517UI_get_default_method(void) 540UI_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}
547LCRYPTO_ALIAS(UI_get_default_method)
524 548
525const UI_METHOD * 549const UI_METHOD *
526UI_get_method(UI *ui) 550UI_get_method(UI *ui)
527{ 551{
528 return ui->meth; 552 return ui->meth;
529} 553}
554LCRYPTO_ALIAS(UI_get_method)
530 555
531const UI_METHOD * 556const UI_METHOD *
532UI_set_method(UI *ui, const UI_METHOD *meth) 557UI_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}
562LCRYPTO_ALIAS(UI_set_method)
537 563
538 564
539UI_METHOD * 565UI_METHOD *
@@ -546,6 +572,7 @@ UI_create_method(const char *name)
546 572
547 return ui_method; 573 return ui_method;
548} 574}
575LCRYPTO_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}
589LCRYPTO_ALIAS(UI_destroy_method)
562 590
563int 591int
564UI_method_set_opener(UI_METHOD *method, int (*opener)(UI *ui)) 592UI_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}
600LCRYPTO_ALIAS(UI_method_set_opener)
572 601
573int 602int
574UI_method_set_writer(UI_METHOD *method, int (*writer)(UI *ui, UI_STRING *uis)) 603UI_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}
611LCRYPTO_ALIAS(UI_method_set_writer)
582 612
583int 613int
584UI_method_set_flusher(UI_METHOD *method, int (*flusher)(UI *ui)) 614UI_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}
622LCRYPTO_ALIAS(UI_method_set_flusher)
592 623
593int 624int
594UI_method_set_reader(UI_METHOD *method, int (*reader)(UI *ui, UI_STRING *uis)) 625UI_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}
633LCRYPTO_ALIAS(UI_method_set_reader)
602 634
603int 635int
604UI_method_set_closer(UI_METHOD *method, int (*closer)(UI *ui)) 636UI_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}
644LCRYPTO_ALIAS(UI_method_set_closer)
612 645
613int 646int
614UI_method_set_prompt_constructor(UI_METHOD *method, 647UI_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}
657LCRYPTO_ALIAS(UI_method_set_prompt_constructor)
624 658
625int 659int
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}
666LCRYPTO_ALIAS(UI_method_get_opener)
632 667
633int 668int
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}
675LCRYPTO_ALIAS(UI_method_get_writer)
640 676
641int 677int
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}
684LCRYPTO_ALIAS(UI_method_get_flusher)
648 685
649int 686int
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}
693LCRYPTO_ALIAS(UI_method_get_reader)
656 694
657int 695int
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}
702LCRYPTO_ALIAS(UI_method_get_closer)
664 703
665char * 704char *
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}
712LCRYPTO_ALIAS(UI_method_get_prompt_constructor)
673 713
674enum UI_string_types 714enum UI_string_types
675UI_get_string_type(UI_STRING *uis) 715UI_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}
721LCRYPTO_ALIAS(UI_get_string_type)
681 722
682int 723int
683UI_get_input_flags(UI_STRING *uis) 724UI_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}
730LCRYPTO_ALIAS(UI_get_input_flags)
689 731
690const char * 732const char *
691UI_get0_output_string(UI_STRING *uis) 733UI_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}
739LCRYPTO_ALIAS(UI_get0_output_string)
697 740
698const char * 741const char *
699UI_get0_action_string(UI_STRING *uis) 742UI_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}
754LCRYPTO_ALIAS(UI_get0_action_string)
711 755
712const char * 756const char *
713UI_get0_result_string(UI_STRING *uis) 757UI_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}
769LCRYPTO_ALIAS(UI_get0_result_string)
725 770
726const char * 771const char *
727UI_get0_test_string(UI_STRING *uis) 772UI_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}
783LCRYPTO_ALIAS(UI_get0_test_string)
738 784
739int 785int
740UI_get_result_minsize(UI_STRING *uis) 786UI_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}
798LCRYPTO_ALIAS(UI_get_result_minsize)
752 799
753int 800int
754UI_get_result_maxsize(UI_STRING *uis) 801UI_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}
813LCRYPTO_ALIAS(UI_get_result_maxsize)
766 814
767int 815int
768UI_set_result(UI *ui, UI_STRING *uis, const char *result) 816UI_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}
876LCRYPTO_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}
170LCRYPTO_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}
73LCRYPTO_ALIAS(UI_UTIL_read_pw_string)
73 74
74int 75int
75UI_UTIL_read_pw(char *buf, char *buff, int size, const char *prompt, int verify) 76UI_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}
98LCRYPTO_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.