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

Make use of new features in UI's. Among others, the application

Browse Source 
password callbak doesn't need to check for sizes any more.
This commit is contained in:
Richard Levitte 2001-06-23 16:30:14 +00:00
parent fd3e027faa
commit 4f272c17f5
1 changed files with 14 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
apps/apps.c
View File

@ -390,7 +390,7 @@ static int ui_read(UI *ui, UI_STRING *uis)
((PW_CB_DATA *)UI_get0_user_data(ui))->password; ((PW_CB_DATA *)UI_get0_user_data(ui))->password;
if (password[0] != '\0') if (password[0] != '\0')
{ {
UI_set_result(uis, password); UI_set_result(ui, uis, password);
return 1; return 1;
} }
} }
@ -462,8 +462,6 @@ int password_callback(char *buf, int bufsiz, int verify,
ui = UI_new_method(ui_method); ui = UI_new_method(ui_method);
if (ui) if (ui)
{ {
char errstring[80];
int errstring_added = 0;
int ok = 0; int ok = 0;
char *buff = NULL; char *buff = NULL;
int ui_flags = 0; int ui_flags = 0;
@ -473,44 +471,32 @@ int password_callback(char *buf, int bufsiz, int verify,
cb_data->prompt_info); cb_data->prompt_info);
ui_flags |= UI_INPUT_FLAG_DEFAULT_PWD; ui_flags |= UI_INPUT_FLAG_DEFAULT_PWD;
UI_ctrl(ui, UI_CTRL_PRINT_ERRORS, 1, 0, 0);
if (ok >= 0) if (ok >= 0)
ok = UI_add_input_string(ui,prompt,ui_flags,buf,0,BUFSIZ-1); ok = UI_add_input_string(ui,prompt,ui_flags,buf,
PW_MIN_LENGTH,BUFSIZ-1);
if (ok >= 0 && verify) if (ok >= 0 && verify)
{ {
buff = (char *)OPENSSL_malloc(bufsiz); buff = (char *)OPENSSL_malloc(bufsiz);
ok = UI_add_verify_string(ui,prompt,ui_flags,buff,0,BUFSIZ-1, ok = UI_add_verify_string(ui,prompt,ui_flags,buff,
buf); PW_MIN_LENGTH,BUFSIZ-1, buf);
} }
if (ok >= 0) if (ok >= 0)
for(;;) do
{ {
res = 0; ok = UI_process(ui);
ok=UI_process(ui);
if (ok < 0)
break;
res=strlen(buf);
if (res < PW_MIN_LENGTH)
{
if (errstring_added == 0)
{
BIO_snprintf(errstring,
sizeof(errstring),
"phrase is too short, needs to be at least %d chars\n", PW_MIN_LENGTH);
UI_add_error_string(ui,
errstring);
}
errstring_added = 1;
}
else
break;
} }
while (ok < 0 && UI_ctrl(ui, UI_CTRL_IS_REDOABLE, 0, 0, 0));
if (buff) if (buff)
{ {
memset(buf,0,(unsigned int)bufsiz); memset(buff,0,(unsigned int)bufsiz);
OPENSSL_free(buff); OPENSSL_free(buff);
} }
if (ok >= 0)
res = strlen(buf);
if (ok == -1) if (ok == -1)
{ {
BIO_printf(bio_err, "User interface error\n"); BIO_printf(bio_err, "User interface error\n");
@ -525,6 +511,7 @@ int password_callback(char *buf, int bufsiz, int verify,
res = 0; res = 0;
} }
UI_free(ui); UI_free(ui);
OPENSSL_free(prompt);
} }
return res; return res;
} }