Fix the checks of UI_add_input_string

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Todd Short <todd.short@me.com>
(Merged from https://github.com/openssl/openssl/pull/18424)
This commit is contained in:
Peiwei Hu 2022-05-29 00:02:37 +08:00 committed by Todd Short
parent babc818c3f
commit 5755c11fd6
2 changed files with 4 additions and 4 deletions

View File

@ -70,8 +70,8 @@ static char *file_get_pass(const UI_METHOD *ui_method, char *pass,
if ((prompt = UI_construct_prompt(ui, desc, info)) == NULL) {
ATTICerr(0, ERR_R_MALLOC_FAILURE);
pass = NULL;
} else if (!UI_add_input_string(ui, prompt, UI_INPUT_FLAG_DEFAULT_PWD,
pass, 0, maxsize - 1)) {
} else if (UI_add_input_string(ui, prompt, UI_INPUT_FLAG_DEFAULT_PWD,
pass, 0, maxsize - 1) <= 0) {
ATTICerr(0, ERR_R_UI_LIB);
pass = NULL;
} else {

View File

@ -44,8 +44,8 @@ static int test_old(void)
/* The wrapper passes the UI userdata as the callback userdata param */
UI_add_user_data(ui, defpass);
if (!UI_add_input_string(ui, "prompt", UI_INPUT_FLAG_DEFAULT_PWD,
pass, 0, sizeof(pass) - 1))
if (UI_add_input_string(ui, "prompt", UI_INPUT_FLAG_DEFAULT_PWD,
pass, 0, sizeof(pass) - 1) <= 0)
goto err;
switch (UI_process(ui)) {