diff options
| author | Peiwei Hu <jlu.hpw@foxmail.com> | 2022-05-29 00:02:37 +0800 |
|---|---|---|
| committer | Todd Short <todd.short@me.com> | 2022-06-02 10:36:56 -0400 |
| commit | 5755c11fd6e50028946e6e17c835afcd56995699 (patch) | |
| tree | 92ed95011ca89741b31cabfd560fc935116a84ec | |
| parent | babc818c3f669214fa192229003953e3dead1926 (diff) | |
| download | openssl-new-5755c11fd6e50028946e6e17c835afcd56995699.tar.gz | |
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)
| -rw-r--r-- | engines/e_loader_attic.c | 4 | ||||
| -rw-r--r-- | test/uitest.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/e_loader_attic.c b/engines/e_loader_attic.c index c7ab4251c0..7b9dcd9fee 100644 --- a/engines/e_loader_attic.c +++ b/engines/e_loader_attic.c @@ -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 { diff --git a/test/uitest.c b/test/uitest.c index 8659b0b4be..82c8c59204 100644 --- a/test/uitest.c +++ b/test/uitest.c @@ -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)) { |