Commit b17bdc77 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

PR: 2188 

Submitted By: Jaroslav Imrich <jaroslav.imrich@disig.sk>

Add "missing" functions to get and set prompt constructor.
parent a0e4a8e1

crypto/ui/ui.h

+2 −0
Original line number Diff line number Diff line
@@ -310,11 +310,13 @@ int UI_method_set_writer(UI_METHOD *method, int (*writer)(UI *ui, UI_STRING *uis 
int UI_method_set_flusher(UI_METHOD *method, int (*flusher)(UI *ui));

int UI_method_set_reader(UI_METHOD *method, int (*reader)(UI *ui, UI_STRING *uis));

int UI_method_set_closer(UI_METHOD *method, int (*closer)(UI *ui));

int UI_method_set_prompt_constructor(UI_METHOD *method, char *(*prompt_constructor)(UI* ui, const char* object_desc, const char* object_name));

int (*UI_method_get_opener(UI_METHOD *method))(UI*);

int (*UI_method_get_writer(UI_METHOD *method))(UI*,UI_STRING*);

int (*UI_method_get_flusher(UI_METHOD *method))(UI*);

int (*UI_method_get_reader(UI_METHOD *method))(UI*,UI_STRING*);

int (*UI_method_get_closer(UI_METHOD *method))(UI*);

char* (*UI_method_get_prompt_constructor(UI_METHOD *method))(UI*, const char*, const char*);



/* The following functions are helpers for method writers to access relevant

   data from a UI_STRING. */

crypto/ui/ui_lib.c

+19 −0
Original line number Diff line number Diff line
@@ -693,6 +693,17 @@ int UI_method_set_closer(UI_METHOD *method, int (*closer)(UI *ui)) 
		return -1;

	}



int UI_method_set_prompt_constructor(UI_METHOD *method, char *(*prompt_constructor)(UI* ui, const char* object_desc, const char* object_name))

	{

	if (method)

		{

		method->ui_construct_prompt = prompt_constructor;

		return 0;

		}

	else

		return -1;

	}



int (*UI_method_get_opener(UI_METHOD *method))(UI*)

	{

	if (method)
@@ -733,6 +744,14 @@ int (*UI_method_get_closer(UI_METHOD *method))(UI*) 
		return NULL;

	}



char* (*UI_method_get_prompt_constructor(UI_METHOD *method))(UI*, const char*, const char*)

	{

	if (method)

		return method->ui_construct_prompt;

	else

		return NULL;

	}



enum UI_string_types UI_get_string_type(UI_STRING *uis)

	{

	if (!uis)