diff options
author | tb <> | 2023-02-16 08:38:17 +0000 |
---|---|---|
committer | tb <> | 2023-02-16 08:38:17 +0000 |
commit | b1fbdd21532891fac5b0f128e57331894bd69d84 (patch) | |
tree | 689defafde66dbfa38a7854af566bd9a05f191b7 /src/lib/libcrypto/ui/ui_lib.c | |
parent | ee0f647faa09f91cb79b628dcb818adaa381af90 (diff) | |
download | openbsd-b1fbdd21532891fac5b0f128e57331894bd69d84.tar.gz openbsd-b1fbdd21532891fac5b0f128e57331894bd69d84.tar.bz2 openbsd-b1fbdd21532891fac5b0f128e57331894bd69d84.zip |
libressl *_namespace.h: adjust *_ALIAS() to require a semicolon
LCRYPTO_ALIAS() and LSSL_ALIAS() contained a trailing semicolon.
This does not conform to style(9), breaks editors and ctags and
(most importantly) my workflow. Fix this by neutering them with
asm("") so that -Wpedantic doesn't complain. There's precedent
in libc's namespace.h
fix suggested by & ok jsing
Diffstat (limited to 'src/lib/libcrypto/ui/ui_lib.c')
-rw-r--r-- | src/lib/libcrypto/ui/ui_lib.c | 100 |
1 files changed, 50 insertions, 50 deletions
diff --git a/src/lib/libcrypto/ui/ui_lib.c b/src/lib/libcrypto/ui/ui_lib.c index 546540ad83..73d899afcc 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.50 2022/12/23 02:31:56 jsing Exp $ */ | 1 | /* $OpenBSD: ui_lib.c,v 1.51 2023/02/16 08:38:17 tb 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,7 +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 | LCRYPTO_ALIAS(UI_new); |
77 | 77 | ||
78 | UI * | 78 | UI * |
79 | UI_new_method(const UI_METHOD *method) | 79 | UI_new_method(const UI_METHOD *method) |
@@ -90,7 +90,7 @@ UI_new_method(const UI_METHOD *method) | |||
90 | 90 | ||
91 | return ret; | 91 | return ret; |
92 | } | 92 | } |
93 | LCRYPTO_ALIAS(UI_new_method) | 93 | LCRYPTO_ALIAS(UI_new_method); |
94 | 94 | ||
95 | static void | 95 | static void |
96 | free_string(UI_STRING *uis) | 96 | free_string(UI_STRING *uis) |
@@ -122,7 +122,7 @@ UI_free(UI *ui) | |||
122 | CRYPTO_free_ex_data(CRYPTO_EX_INDEX_UI, ui, &ui->ex_data); | 122 | CRYPTO_free_ex_data(CRYPTO_EX_INDEX_UI, ui, &ui->ex_data); |
123 | free(ui); | 123 | free(ui); |
124 | } | 124 | } |
125 | LCRYPTO_ALIAS(UI_free) | 125 | LCRYPTO_ALIAS(UI_free); |
126 | 126 | ||
127 | static int | 127 | static int |
128 | allocate_string_stack(UI *ui) | 128 | allocate_string_stack(UI *ui) |
@@ -269,7 +269,7 @@ UI_add_input_string(UI *ui, const char *prompt, int flags, char *result_buf, | |||
269 | return general_allocate_string(ui, prompt, 0, UIT_PROMPT, flags, | 269 | return general_allocate_string(ui, prompt, 0, UIT_PROMPT, flags, |
270 | result_buf, minsize, maxsize, NULL); | 270 | result_buf, minsize, maxsize, NULL); |
271 | } | 271 | } |
272 | LCRYPTO_ALIAS(UI_add_input_string) | 272 | LCRYPTO_ALIAS(UI_add_input_string); |
273 | 273 | ||
274 | /* Same as UI_add_input_string(), excepts it takes a copy of the prompt. */ | 274 | /* Same as UI_add_input_string(), excepts it takes a copy of the prompt. */ |
275 | int | 275 | int |
@@ -279,7 +279,7 @@ UI_dup_input_string(UI *ui, const char *prompt, int flags, char *result_buf, | |||
279 | return general_allocate_string(ui, prompt, 1, UIT_PROMPT, flags, | 279 | return general_allocate_string(ui, prompt, 1, UIT_PROMPT, flags, |
280 | result_buf, minsize, maxsize, NULL); | 280 | result_buf, minsize, maxsize, NULL); |
281 | } | 281 | } |
282 | LCRYPTO_ALIAS(UI_dup_input_string) | 282 | LCRYPTO_ALIAS(UI_dup_input_string); |
283 | 283 | ||
284 | int | 284 | int |
285 | UI_add_verify_string(UI *ui, const char *prompt, int flags, char *result_buf, | 285 | UI_add_verify_string(UI *ui, const char *prompt, int flags, char *result_buf, |
@@ -288,7 +288,7 @@ UI_add_verify_string(UI *ui, const char *prompt, int flags, char *result_buf, | |||
288 | return general_allocate_string(ui, prompt, 0, UIT_VERIFY, flags, | 288 | return general_allocate_string(ui, prompt, 0, UIT_VERIFY, flags, |
289 | result_buf, minsize, maxsize, test_buf); | 289 | result_buf, minsize, maxsize, test_buf); |
290 | } | 290 | } |
291 | LCRYPTO_ALIAS(UI_add_verify_string) | 291 | LCRYPTO_ALIAS(UI_add_verify_string); |
292 | 292 | ||
293 | int | 293 | int |
294 | UI_dup_verify_string(UI *ui, const char *prompt, int flags, | 294 | UI_dup_verify_string(UI *ui, const char *prompt, int flags, |
@@ -297,7 +297,7 @@ UI_dup_verify_string(UI *ui, const char *prompt, int flags, | |||
297 | return general_allocate_string(ui, prompt, 1, UIT_VERIFY, flags, | 297 | return general_allocate_string(ui, prompt, 1, UIT_VERIFY, flags, |
298 | result_buf, minsize, maxsize, test_buf); | 298 | result_buf, minsize, maxsize, test_buf); |
299 | } | 299 | } |
300 | LCRYPTO_ALIAS(UI_dup_verify_string) | 300 | LCRYPTO_ALIAS(UI_dup_verify_string); |
301 | 301 | ||
302 | int | 302 | int |
303 | UI_add_input_boolean(UI *ui, const char *prompt, const char *action_desc, | 303 | UI_add_input_boolean(UI *ui, const char *prompt, const char *action_desc, |
@@ -306,7 +306,7 @@ UI_add_input_boolean(UI *ui, const char *prompt, const char *action_desc, | |||
306 | return general_allocate_boolean(ui, prompt, action_desc, ok_chars, | 306 | return general_allocate_boolean(ui, prompt, action_desc, ok_chars, |
307 | cancel_chars, 0, UIT_BOOLEAN, flags, result_buf); | 307 | cancel_chars, 0, UIT_BOOLEAN, flags, result_buf); |
308 | } | 308 | } |
309 | LCRYPTO_ALIAS(UI_add_input_boolean) | 309 | LCRYPTO_ALIAS(UI_add_input_boolean); |
310 | 310 | ||
311 | int | 311 | int |
312 | UI_dup_input_boolean(UI *ui, const char *prompt, const char *action_desc, | 312 | UI_dup_input_boolean(UI *ui, const char *prompt, const char *action_desc, |
@@ -315,7 +315,7 @@ UI_dup_input_boolean(UI *ui, const char *prompt, const char *action_desc, | |||
315 | return general_allocate_boolean(ui, prompt, action_desc, ok_chars, | 315 | return general_allocate_boolean(ui, prompt, action_desc, ok_chars, |
316 | cancel_chars, 1, UIT_BOOLEAN, flags, result_buf); | 316 | cancel_chars, 1, UIT_BOOLEAN, flags, result_buf); |
317 | } | 317 | } |
318 | LCRYPTO_ALIAS(UI_dup_input_boolean) | 318 | LCRYPTO_ALIAS(UI_dup_input_boolean); |
319 | 319 | ||
320 | int | 320 | int |
321 | UI_add_info_string(UI *ui, const char *text) | 321 | UI_add_info_string(UI *ui, const char *text) |
@@ -323,7 +323,7 @@ UI_add_info_string(UI *ui, const char *text) | |||
323 | return general_allocate_string(ui, text, 0, UIT_INFO, 0, NULL, 0, 0, | 323 | return general_allocate_string(ui, text, 0, UIT_INFO, 0, NULL, 0, 0, |
324 | NULL); | 324 | NULL); |
325 | } | 325 | } |
326 | LCRYPTO_ALIAS(UI_add_info_string) | 326 | LCRYPTO_ALIAS(UI_add_info_string); |
327 | 327 | ||
328 | int | 328 | int |
329 | UI_dup_info_string(UI *ui, const char *text) | 329 | UI_dup_info_string(UI *ui, const char *text) |
@@ -331,7 +331,7 @@ UI_dup_info_string(UI *ui, const char *text) | |||
331 | return general_allocate_string(ui, text, 1, UIT_INFO, 0, NULL, 0, 0, | 331 | return general_allocate_string(ui, text, 1, UIT_INFO, 0, NULL, 0, 0, |
332 | NULL); | 332 | NULL); |
333 | } | 333 | } |
334 | LCRYPTO_ALIAS(UI_dup_info_string) | 334 | LCRYPTO_ALIAS(UI_dup_info_string); |
335 | 335 | ||
336 | int | 336 | int |
337 | UI_add_error_string(UI *ui, const char *text) | 337 | UI_add_error_string(UI *ui, const char *text) |
@@ -339,7 +339,7 @@ UI_add_error_string(UI *ui, const char *text) | |||
339 | return general_allocate_string(ui, text, 0, UIT_ERROR, 0, NULL, 0, 0, | 339 | return general_allocate_string(ui, text, 0, UIT_ERROR, 0, NULL, 0, 0, |
340 | NULL); | 340 | NULL); |
341 | } | 341 | } |
342 | LCRYPTO_ALIAS(UI_add_error_string) | 342 | LCRYPTO_ALIAS(UI_add_error_string); |
343 | 343 | ||
344 | int | 344 | int |
345 | UI_dup_error_string(UI *ui, const char *text) | 345 | UI_dup_error_string(UI *ui, const char *text) |
@@ -347,7 +347,7 @@ UI_dup_error_string(UI *ui, const char *text) | |||
347 | return general_allocate_string(ui, text, 1, UIT_ERROR, 0, NULL, 0, 0, | 347 | return general_allocate_string(ui, text, 1, UIT_ERROR, 0, NULL, 0, 0, |
348 | NULL); | 348 | NULL); |
349 | } | 349 | } |
350 | LCRYPTO_ALIAS(UI_dup_error_string) | 350 | LCRYPTO_ALIAS(UI_dup_error_string); |
351 | 351 | ||
352 | char * | 352 | char * |
353 | UI_construct_prompt(UI *ui, const char *object_desc, const char *object_name) | 353 | UI_construct_prompt(UI *ui, const char *object_desc, const char *object_name) |
@@ -372,7 +372,7 @@ UI_construct_prompt(UI *ui, const char *object_desc, const char *object_name) | |||
372 | 372 | ||
373 | return prompt; | 373 | return prompt; |
374 | } | 374 | } |
375 | LCRYPTO_ALIAS(UI_construct_prompt) | 375 | LCRYPTO_ALIAS(UI_construct_prompt); |
376 | 376 | ||
377 | void * | 377 | void * |
378 | UI_add_user_data(UI *ui, void *user_data) | 378 | UI_add_user_data(UI *ui, void *user_data) |
@@ -383,14 +383,14 @@ UI_add_user_data(UI *ui, void *user_data) | |||
383 | 383 | ||
384 | return old_data; | 384 | return old_data; |
385 | } | 385 | } |
386 | LCRYPTO_ALIAS(UI_add_user_data) | 386 | LCRYPTO_ALIAS(UI_add_user_data); |
387 | 387 | ||
388 | void * | 388 | void * |
389 | UI_get0_user_data(UI *ui) | 389 | UI_get0_user_data(UI *ui) |
390 | { | 390 | { |
391 | return ui->user_data; | 391 | return ui->user_data; |
392 | } | 392 | } |
393 | LCRYPTO_ALIAS(UI_get0_user_data) | 393 | LCRYPTO_ALIAS(UI_get0_user_data); |
394 | 394 | ||
395 | const char * | 395 | const char * |
396 | UI_get0_result(UI *ui, int i) | 396 | UI_get0_result(UI *ui, int i) |
@@ -405,7 +405,7 @@ UI_get0_result(UI *ui, int i) | |||
405 | } | 405 | } |
406 | return UI_get0_result_string(sk_UI_STRING_value(ui->strings, i)); | 406 | return UI_get0_result_string(sk_UI_STRING_value(ui->strings, i)); |
407 | } | 407 | } |
408 | LCRYPTO_ALIAS(UI_get0_result) | 408 | LCRYPTO_ALIAS(UI_get0_result); |
409 | 409 | ||
410 | static int | 410 | static int |
411 | print_error(const char *str, size_t len, void *arg) | 411 | print_error(const char *str, size_t len, void *arg) |
@@ -479,7 +479,7 @@ UI_process(UI *ui) | |||
479 | return -1; | 479 | return -1; |
480 | return ok; | 480 | return ok; |
481 | } | 481 | } |
482 | LCRYPTO_ALIAS(UI_process) | 482 | LCRYPTO_ALIAS(UI_process); |
483 | 483 | ||
484 | int | 484 | int |
485 | UI_ctrl(UI *ui, int cmd, long i, void *p, void (*f) (void)) | 485 | UI_ctrl(UI *ui, int cmd, long i, void *p, void (*f) (void)) |
@@ -507,7 +507,7 @@ UI_ctrl(UI *ui, int cmd, long i, void *p, void (*f) (void)) | |||
507 | UIerror(UI_R_UNKNOWN_CONTROL_COMMAND); | 507 | UIerror(UI_R_UNKNOWN_CONTROL_COMMAND); |
508 | return -1; | 508 | return -1; |
509 | } | 509 | } |
510 | LCRYPTO_ALIAS(UI_ctrl) | 510 | LCRYPTO_ALIAS(UI_ctrl); |
511 | 511 | ||
512 | int | 512 | int |
513 | UI_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func, | 513 | UI_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func, |
@@ -516,28 +516,28 @@ UI_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func, | |||
516 | return CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_UI, argl, argp, | 516 | return CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_UI, argl, argp, |
517 | new_func, dup_func, free_func); | 517 | new_func, dup_func, free_func); |
518 | } | 518 | } |
519 | LCRYPTO_ALIAS(UI_get_ex_new_index) | 519 | LCRYPTO_ALIAS(UI_get_ex_new_index); |
520 | 520 | ||
521 | int | 521 | int |
522 | UI_set_ex_data(UI *r, int idx, void *arg) | 522 | UI_set_ex_data(UI *r, int idx, void *arg) |
523 | { | 523 | { |
524 | return (CRYPTO_set_ex_data(&r->ex_data, idx, arg)); | 524 | return (CRYPTO_set_ex_data(&r->ex_data, idx, arg)); |
525 | } | 525 | } |
526 | LCRYPTO_ALIAS(UI_set_ex_data) | 526 | LCRYPTO_ALIAS(UI_set_ex_data); |
527 | 527 | ||
528 | void * | 528 | void * |
529 | UI_get_ex_data(UI *r, int idx) | 529 | UI_get_ex_data(UI *r, int idx) |
530 | { | 530 | { |
531 | return (CRYPTO_get_ex_data(&r->ex_data, idx)); | 531 | return (CRYPTO_get_ex_data(&r->ex_data, idx)); |
532 | } | 532 | } |
533 | LCRYPTO_ALIAS(UI_get_ex_data) | 533 | LCRYPTO_ALIAS(UI_get_ex_data); |
534 | 534 | ||
535 | void | 535 | void |
536 | UI_set_default_method(const UI_METHOD *method) | 536 | UI_set_default_method(const UI_METHOD *method) |
537 | { | 537 | { |
538 | default_UI_meth = method; | 538 | default_UI_meth = method; |
539 | } | 539 | } |
540 | LCRYPTO_ALIAS(UI_set_default_method) | 540 | LCRYPTO_ALIAS(UI_set_default_method); |
541 | 541 | ||
542 | const UI_METHOD * | 542 | const UI_METHOD * |
543 | UI_get_default_method(void) | 543 | UI_get_default_method(void) |
@@ -547,14 +547,14 @@ UI_get_default_method(void) | |||
547 | 547 | ||
548 | return default_UI_meth; | 548 | return default_UI_meth; |
549 | } | 549 | } |
550 | LCRYPTO_ALIAS(UI_get_default_method) | 550 | LCRYPTO_ALIAS(UI_get_default_method); |
551 | 551 | ||
552 | const UI_METHOD * | 552 | const UI_METHOD * |
553 | UI_get_method(UI *ui) | 553 | UI_get_method(UI *ui) |
554 | { | 554 | { |
555 | return ui->meth; | 555 | return ui->meth; |
556 | } | 556 | } |
557 | LCRYPTO_ALIAS(UI_get_method) | 557 | LCRYPTO_ALIAS(UI_get_method); |
558 | 558 | ||
559 | const UI_METHOD * | 559 | const UI_METHOD * |
560 | UI_set_method(UI *ui, const UI_METHOD *method) | 560 | UI_set_method(UI *ui, const UI_METHOD *method) |
@@ -563,7 +563,7 @@ UI_set_method(UI *ui, const UI_METHOD *method) | |||
563 | 563 | ||
564 | return ui->meth; | 564 | return ui->meth; |
565 | } | 565 | } |
566 | LCRYPTO_ALIAS(UI_set_method) | 566 | LCRYPTO_ALIAS(UI_set_method); |
567 | 567 | ||
568 | UI_METHOD * | 568 | UI_METHOD * |
569 | UI_create_method(const char *name) | 569 | UI_create_method(const char *name) |
@@ -585,7 +585,7 @@ UI_create_method(const char *name) | |||
585 | 585 | ||
586 | return NULL; | 586 | return NULL; |
587 | } | 587 | } |
588 | LCRYPTO_ALIAS(UI_create_method) | 588 | LCRYPTO_ALIAS(UI_create_method); |
589 | 589 | ||
590 | void | 590 | void |
591 | UI_destroy_method(UI_METHOD *method) | 591 | UI_destroy_method(UI_METHOD *method) |
@@ -596,7 +596,7 @@ UI_destroy_method(UI_METHOD *method) | |||
596 | free(method->name); | 596 | free(method->name); |
597 | free(method); | 597 | free(method); |
598 | } | 598 | } |
599 | LCRYPTO_ALIAS(UI_destroy_method) | 599 | LCRYPTO_ALIAS(UI_destroy_method); |
600 | 600 | ||
601 | int | 601 | int |
602 | UI_method_set_opener(UI_METHOD *method, int (*opener)(UI *ui)) | 602 | UI_method_set_opener(UI_METHOD *method, int (*opener)(UI *ui)) |
@@ -608,7 +608,7 @@ UI_method_set_opener(UI_METHOD *method, int (*opener)(UI *ui)) | |||
608 | 608 | ||
609 | return 0; | 609 | return 0; |
610 | } | 610 | } |
611 | LCRYPTO_ALIAS(UI_method_set_opener) | 611 | LCRYPTO_ALIAS(UI_method_set_opener); |
612 | 612 | ||
613 | int | 613 | int |
614 | UI_method_set_writer(UI_METHOD *method, int (*writer)(UI *ui, UI_STRING *uis)) | 614 | UI_method_set_writer(UI_METHOD *method, int (*writer)(UI *ui, UI_STRING *uis)) |
@@ -620,7 +620,7 @@ UI_method_set_writer(UI_METHOD *method, int (*writer)(UI *ui, UI_STRING *uis)) | |||
620 | 620 | ||
621 | return 0; | 621 | return 0; |
622 | } | 622 | } |
623 | LCRYPTO_ALIAS(UI_method_set_writer) | 623 | LCRYPTO_ALIAS(UI_method_set_writer); |
624 | 624 | ||
625 | int | 625 | int |
626 | UI_method_set_flusher(UI_METHOD *method, int (*flusher)(UI *ui)) | 626 | UI_method_set_flusher(UI_METHOD *method, int (*flusher)(UI *ui)) |
@@ -632,7 +632,7 @@ UI_method_set_flusher(UI_METHOD *method, int (*flusher)(UI *ui)) | |||
632 | 632 | ||
633 | return 0; | 633 | return 0; |
634 | } | 634 | } |
635 | LCRYPTO_ALIAS(UI_method_set_flusher) | 635 | LCRYPTO_ALIAS(UI_method_set_flusher); |
636 | 636 | ||
637 | int | 637 | int |
638 | UI_method_set_reader(UI_METHOD *method, int (*reader)(UI *ui, UI_STRING *uis)) | 638 | UI_method_set_reader(UI_METHOD *method, int (*reader)(UI *ui, UI_STRING *uis)) |
@@ -644,7 +644,7 @@ UI_method_set_reader(UI_METHOD *method, int (*reader)(UI *ui, UI_STRING *uis)) | |||
644 | 644 | ||
645 | return 0; | 645 | return 0; |
646 | } | 646 | } |
647 | LCRYPTO_ALIAS(UI_method_set_reader) | 647 | LCRYPTO_ALIAS(UI_method_set_reader); |
648 | 648 | ||
649 | int | 649 | int |
650 | UI_method_set_closer(UI_METHOD *method, int (*closer)(UI *ui)) | 650 | UI_method_set_closer(UI_METHOD *method, int (*closer)(UI *ui)) |
@@ -656,7 +656,7 @@ UI_method_set_closer(UI_METHOD *method, int (*closer)(UI *ui)) | |||
656 | 656 | ||
657 | return 0; | 657 | return 0; |
658 | } | 658 | } |
659 | LCRYPTO_ALIAS(UI_method_set_closer) | 659 | LCRYPTO_ALIAS(UI_method_set_closer); |
660 | 660 | ||
661 | int | 661 | int |
662 | UI_method_set_prompt_constructor(UI_METHOD *method, | 662 | UI_method_set_prompt_constructor(UI_METHOD *method, |
@@ -670,7 +670,7 @@ UI_method_set_prompt_constructor(UI_METHOD *method, | |||
670 | 670 | ||
671 | return 0; | 671 | return 0; |
672 | } | 672 | } |
673 | LCRYPTO_ALIAS(UI_method_set_prompt_constructor) | 673 | LCRYPTO_ALIAS(UI_method_set_prompt_constructor); |
674 | 674 | ||
675 | int | 675 | int |
676 | (*UI_method_get_opener(const UI_METHOD * method))(UI *) | 676 | (*UI_method_get_opener(const UI_METHOD * method))(UI *) |
@@ -680,7 +680,7 @@ int | |||
680 | 680 | ||
681 | return method->ui_open_session; | 681 | return method->ui_open_session; |
682 | } | 682 | } |
683 | LCRYPTO_ALIAS(UI_method_get_opener) | 683 | LCRYPTO_ALIAS(UI_method_get_opener); |
684 | 684 | ||
685 | int | 685 | int |
686 | (*UI_method_get_writer(const UI_METHOD *method))(UI *, UI_STRING *) | 686 | (*UI_method_get_writer(const UI_METHOD *method))(UI *, UI_STRING *) |
@@ -690,7 +690,7 @@ int | |||
690 | 690 | ||
691 | return method->ui_write_string; | 691 | return method->ui_write_string; |
692 | } | 692 | } |
693 | LCRYPTO_ALIAS(UI_method_get_writer) | 693 | LCRYPTO_ALIAS(UI_method_get_writer); |
694 | 694 | ||
695 | int | 695 | int |
696 | (*UI_method_get_flusher(const UI_METHOD *method)) (UI *) | 696 | (*UI_method_get_flusher(const UI_METHOD *method)) (UI *) |
@@ -700,7 +700,7 @@ int | |||
700 | 700 | ||
701 | return method->ui_flush; | 701 | return method->ui_flush; |
702 | } | 702 | } |
703 | LCRYPTO_ALIAS(UI_method_get_flusher) | 703 | LCRYPTO_ALIAS(UI_method_get_flusher); |
704 | 704 | ||
705 | int | 705 | int |
706 | (*UI_method_get_reader(const UI_METHOD *method))(UI *, UI_STRING *) | 706 | (*UI_method_get_reader(const UI_METHOD *method))(UI *, UI_STRING *) |
@@ -710,7 +710,7 @@ int | |||
710 | 710 | ||
711 | return method->ui_read_string; | 711 | return method->ui_read_string; |
712 | } | 712 | } |
713 | LCRYPTO_ALIAS(UI_method_get_reader) | 713 | LCRYPTO_ALIAS(UI_method_get_reader); |
714 | 714 | ||
715 | int | 715 | int |
716 | (*UI_method_get_closer(const UI_METHOD *method))(UI *) | 716 | (*UI_method_get_closer(const UI_METHOD *method))(UI *) |
@@ -720,7 +720,7 @@ int | |||
720 | 720 | ||
721 | return method->ui_close_session; | 721 | return method->ui_close_session; |
722 | } | 722 | } |
723 | LCRYPTO_ALIAS(UI_method_get_closer) | 723 | LCRYPTO_ALIAS(UI_method_get_closer); |
724 | 724 | ||
725 | char * | 725 | char * |
726 | (*UI_method_get_prompt_constructor(const UI_METHOD *method))(UI *, const char *, | 726 | (*UI_method_get_prompt_constructor(const UI_METHOD *method))(UI *, const char *, |
@@ -731,7 +731,7 @@ char * | |||
731 | 731 | ||
732 | return method->ui_construct_prompt; | 732 | return method->ui_construct_prompt; |
733 | } | 733 | } |
734 | LCRYPTO_ALIAS(UI_method_get_prompt_constructor) | 734 | LCRYPTO_ALIAS(UI_method_get_prompt_constructor); |
735 | 735 | ||
736 | enum UI_string_types | 736 | enum UI_string_types |
737 | UI_get_string_type(UI_STRING *uis) | 737 | UI_get_string_type(UI_STRING *uis) |
@@ -741,7 +741,7 @@ UI_get_string_type(UI_STRING *uis) | |||
741 | 741 | ||
742 | return uis->type; | 742 | return uis->type; |
743 | } | 743 | } |
744 | LCRYPTO_ALIAS(UI_get_string_type) | 744 | LCRYPTO_ALIAS(UI_get_string_type); |
745 | 745 | ||
746 | int | 746 | int |
747 | UI_get_input_flags(UI_STRING *uis) | 747 | UI_get_input_flags(UI_STRING *uis) |
@@ -751,7 +751,7 @@ UI_get_input_flags(UI_STRING *uis) | |||
751 | 751 | ||
752 | return uis->input_flags; | 752 | return uis->input_flags; |
753 | } | 753 | } |
754 | LCRYPTO_ALIAS(UI_get_input_flags) | 754 | LCRYPTO_ALIAS(UI_get_input_flags); |
755 | 755 | ||
756 | const char * | 756 | const char * |
757 | UI_get0_output_string(UI_STRING *uis) | 757 | UI_get0_output_string(UI_STRING *uis) |
@@ -761,7 +761,7 @@ UI_get0_output_string(UI_STRING *uis) | |||
761 | 761 | ||
762 | return uis->out_string; | 762 | return uis->out_string; |
763 | } | 763 | } |
764 | LCRYPTO_ALIAS(UI_get0_output_string) | 764 | LCRYPTO_ALIAS(UI_get0_output_string); |
765 | 765 | ||
766 | const char * | 766 | const char * |
767 | UI_get0_action_string(UI_STRING *uis) | 767 | UI_get0_action_string(UI_STRING *uis) |
@@ -777,7 +777,7 @@ UI_get0_action_string(UI_STRING *uis) | |||
777 | return NULL; | 777 | return NULL; |
778 | } | 778 | } |
779 | } | 779 | } |
780 | LCRYPTO_ALIAS(UI_get0_action_string) | 780 | LCRYPTO_ALIAS(UI_get0_action_string); |
781 | 781 | ||
782 | const char * | 782 | const char * |
783 | UI_get0_result_string(UI_STRING *uis) | 783 | UI_get0_result_string(UI_STRING *uis) |
@@ -793,7 +793,7 @@ UI_get0_result_string(UI_STRING *uis) | |||
793 | return NULL; | 793 | return NULL; |
794 | } | 794 | } |
795 | } | 795 | } |
796 | LCRYPTO_ALIAS(UI_get0_result_string) | 796 | LCRYPTO_ALIAS(UI_get0_result_string); |
797 | 797 | ||
798 | const char * | 798 | const char * |
799 | UI_get0_test_string(UI_STRING *uis) | 799 | UI_get0_test_string(UI_STRING *uis) |
@@ -808,7 +808,7 @@ UI_get0_test_string(UI_STRING *uis) | |||
808 | return NULL; | 808 | return NULL; |
809 | } | 809 | } |
810 | } | 810 | } |
811 | LCRYPTO_ALIAS(UI_get0_test_string) | 811 | LCRYPTO_ALIAS(UI_get0_test_string); |
812 | 812 | ||
813 | int | 813 | int |
814 | UI_get_result_minsize(UI_STRING *uis) | 814 | UI_get_result_minsize(UI_STRING *uis) |
@@ -824,7 +824,7 @@ UI_get_result_minsize(UI_STRING *uis) | |||
824 | return -1; | 824 | return -1; |
825 | } | 825 | } |
826 | } | 826 | } |
827 | LCRYPTO_ALIAS(UI_get_result_minsize) | 827 | LCRYPTO_ALIAS(UI_get_result_minsize); |
828 | 828 | ||
829 | int | 829 | int |
830 | UI_get_result_maxsize(UI_STRING *uis) | 830 | UI_get_result_maxsize(UI_STRING *uis) |
@@ -840,7 +840,7 @@ UI_get_result_maxsize(UI_STRING *uis) | |||
840 | return -1; | 840 | return -1; |
841 | } | 841 | } |
842 | } | 842 | } |
843 | LCRYPTO_ALIAS(UI_get_result_maxsize) | 843 | LCRYPTO_ALIAS(UI_get_result_maxsize); |
844 | 844 | ||
845 | int | 845 | int |
846 | UI_set_result(UI *ui, UI_STRING *uis, const char *result) | 846 | UI_set_result(UI *ui, UI_STRING *uis, const char *result) |
@@ -904,4 +904,4 @@ UI_set_result(UI *ui, UI_STRING *uis, const char *result) | |||
904 | } | 904 | } |
905 | return 0; | 905 | return 0; |
906 | } | 906 | } |
907 | LCRYPTO_ALIAS(UI_set_result) | 907 | LCRYPTO_ALIAS(UI_set_result); |