summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortb <>2018-06-02 04:45:21 +0000
committertb <>2018-06-02 04:45:21 +0000
commit49a6a67825dd906dd3954d89449cf414223296be (patch)
tree32d6d3db62ab75be86b5f0af30598ea2408d698a /src
parenta3c52968413008aa01f7c8f6876331831bf28f03 (diff)
downloadopenbsd-49a6a67825dd906dd3954d89449cf414223296be.tar.gz
openbsd-49a6a67825dd906dd3954d89449cf414223296be.tar.bz2
openbsd-49a6a67825dd906dd3954d89449cf414223296be.zip
Add a const qualifier to the argument of UI_method_get_closer(),
UI_method_get_flusher(), UI_method_get_opener(), UI_method_get_prompt_constructor(), UI_method_get_reader(), and UI_method_get_writer(). tested in a bulk build by sthen ok jsing
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/ui/ui.h14
-rw-r--r--src/lib/libcrypto/ui/ui_lib.c14
2 files changed, 14 insertions, 14 deletions
diff --git a/src/lib/libcrypto/ui/ui.h b/src/lib/libcrypto/ui/ui.h
index 8ae0dd5e75..8035fc2baa 100644
--- a/src/lib/libcrypto/ui/ui.h
+++ b/src/lib/libcrypto/ui/ui.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ui.h,v 1.10 2018/05/19 11:03:33 tb Exp $ */ 1/* $OpenBSD: ui.h,v 1.11 2018/06/02 04:45:21 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 */
@@ -312,12 +312,12 @@ int UI_method_set_flusher(UI_METHOD *method, int (*flusher)(UI *ui));
312int UI_method_set_reader(UI_METHOD *method, int (*reader)(UI *ui, UI_STRING *uis)); 312int UI_method_set_reader(UI_METHOD *method, int (*reader)(UI *ui, UI_STRING *uis));
313int UI_method_set_closer(UI_METHOD *method, int (*closer)(UI *ui)); 313int UI_method_set_closer(UI_METHOD *method, int (*closer)(UI *ui));
314int UI_method_set_prompt_constructor(UI_METHOD *method, char *(*prompt_constructor)(UI* ui, const char* object_desc, const char* object_name)); 314int UI_method_set_prompt_constructor(UI_METHOD *method, char *(*prompt_constructor)(UI* ui, const char* object_desc, const char* object_name));
315int (*UI_method_get_opener(UI_METHOD *method))(UI*); 315int (*UI_method_get_opener(const UI_METHOD *method))(UI*);
316int (*UI_method_get_writer(UI_METHOD *method))(UI*, UI_STRING*); 316int (*UI_method_get_writer(const UI_METHOD *method))(UI*, UI_STRING*);
317int (*UI_method_get_flusher(UI_METHOD *method))(UI*); 317int (*UI_method_get_flusher(const UI_METHOD *method))(UI*);
318int (*UI_method_get_reader(UI_METHOD *method))(UI*, UI_STRING*); 318int (*UI_method_get_reader(const UI_METHOD *method))(UI*, UI_STRING*);
319int (*UI_method_get_closer(UI_METHOD *method))(UI*); 319int (*UI_method_get_closer(const UI_METHOD *method))(UI*);
320char * (*UI_method_get_prompt_constructor(UI_METHOD *method))(UI*, const char*, const char*); 320char * (*UI_method_get_prompt_constructor(const UI_METHOD *method))(UI*, const char*, const char*);
321 321
322/* The following functions are helpers for method writers to access relevant 322/* The following functions are helpers for method writers to access relevant
323 data from a UI_STRING. */ 323 data from a UI_STRING. */
diff --git a/src/lib/libcrypto/ui/ui_lib.c b/src/lib/libcrypto/ui/ui_lib.c
index 8ad5580261..06b29b8cee 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.33 2018/05/19 11:03:33 tb Exp $ */ 1/* $OpenBSD: ui_lib.c,v 1.34 2018/06/02 04:45:21 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 */
@@ -666,7 +666,7 @@ UI_method_set_prompt_constructor(UI_METHOD *method,
666} 666}
667 667
668int 668int
669(*UI_method_get_opener(UI_METHOD * method))(UI *) 669(*UI_method_get_opener(const UI_METHOD * method))(UI *)
670{ 670{
671 if (method) 671 if (method)
672 return method->ui_open_session; 672 return method->ui_open_session;
@@ -675,7 +675,7 @@ int
675} 675}
676 676
677int 677int
678(*UI_method_get_writer(UI_METHOD *method))(UI *, UI_STRING *) 678(*UI_method_get_writer(const UI_METHOD *method))(UI *, UI_STRING *)
679{ 679{
680 if (method) 680 if (method)
681 return method->ui_write_string; 681 return method->ui_write_string;
@@ -684,7 +684,7 @@ int
684} 684}
685 685
686int 686int
687(*UI_method_get_flusher(UI_METHOD *method)) (UI *) 687(*UI_method_get_flusher(const UI_METHOD *method)) (UI *)
688{ 688{
689 if (method) 689 if (method)
690 return method->ui_flush; 690 return method->ui_flush;
@@ -693,7 +693,7 @@ int
693} 693}
694 694
695int 695int
696(*UI_method_get_reader(UI_METHOD *method))(UI *, UI_STRING *) 696(*UI_method_get_reader(const UI_METHOD *method))(UI *, UI_STRING *)
697{ 697{
698 if (method) 698 if (method)
699 return method->ui_read_string; 699 return method->ui_read_string;
@@ -702,7 +702,7 @@ int
702} 702}
703 703
704int 704int
705(*UI_method_get_closer(UI_METHOD *method))(UI *) 705(*UI_method_get_closer(const UI_METHOD *method))(UI *)
706{ 706{
707 if (method) 707 if (method)
708 return method->ui_close_session; 708 return method->ui_close_session;
@@ -711,7 +711,7 @@ int
711} 711}
712 712
713char * 713char *
714(*UI_method_get_prompt_constructor(UI_METHOD *method))(UI *, const char *, 714(*UI_method_get_prompt_constructor(const UI_METHOD *method))(UI *, const char *,
715 const char *) 715 const char *)
716{ 716{
717 if (method) 717 if (method)