generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use the new UI features, among others the new boolean input.

Browse Source 
NOTE: Boolean input hasn't been very well tested yet, so this part may
fail miserably.
This commit is contained in:
Richard Levitte 2001-06-23 16:46:14 +00:00
parent 1ae6ddac91
commit f13def508c
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
crypto/engine/hw_ncipher.c
View File

@ -1152,13 +1152,20 @@ static int hwcrhk_get_pass(const char *prompt_info,
UI_INPUT_FLAG_DEFAULT_PWD, UI_INPUT_FLAG_DEFAULT_PWD,
buf,0,(*len_io) - 1); buf,0,(*len_io) - 1);
UI_add_user_data(ui, callback_data); UI_add_user_data(ui, callback_data);
UI_ctrl(ui, UI_CTRL_PRINT_ERRORS, 1, 0, 0);
if (ok >= 0) if (ok >= 0)
do
{
ok=UI_process(ui); ok=UI_process(ui);
}
while (ok < 0 && UI_ctrl(ui, UI_CTRL_IS_REDOABLE, 0, 0, 0));
if (ok >= 0) if (ok >= 0)
*len_io = strlen(buf); *len_io = strlen(buf);
OPENSSL_free(prompt);
UI_free(ui); UI_free(ui);
OPENSSL_free(prompt);
} }
} }
else else
@ -1204,7 +1211,7 @@ static int hwcrhk_insert_card(const char *prompt_info,
if (ui) if (ui)
{ {
char answer[10]; char answer;
char buf[BUFSIZ]; char buf[BUFSIZ];
if (wrong_info) if (wrong_info)
@ -1214,21 +1221,21 @@ static int hwcrhk_insert_card(const char *prompt_info,
if (ok >= 0 && prompt_info) if (ok >= 0 && prompt_info)
{ {
BIO_snprintf(buf, sizeof(buf)-1, BIO_snprintf(buf, sizeof(buf)-1,
"Insert card \"%s\"\n then hit <enter> or C<enter> to cancel\n", prompt_info); "Insert card \"%s\"", prompt_info);
ok = UI_dup_input_string(ui, buf, 1, ok = UI_dup_input_boolean(ui, buf,
answer, 0, sizeof(answer)-1); "\n then hit <enter> or C<enter> to cancel\n",
"\r\n", "Cc", UI_INPUT_FLAG_ECHO, &answer);
} }
UI_add_user_data(ui, callback_data); UI_add_user_data(ui, callback_data);
if (ok >= 0) if (ok >= 0)
ok = UI_process(ui); ok = UI_process(ui);
UI_free(ui); UI_free(ui);
/* If canceled input treat as 'cancel' */
if (ok == -2) if (ok == -2 || (ok >= 0 && answer == 'C'))
ok = 1; ok = 1;
else if (ok < 0) else if (ok < 0)
ok = -1; ok = -1;
else if (answer[0] == 'c' || answer[0] == 'C')
ok = 1;
else else
ok = 0; ok = 0;
} }