diff options
| author | Theo Buehler <tb@cvs.openbsd.org> | 2024-01-05 10:14:09 +0000 |
|---|---|---|
| committer | Theo Buehler <tb@cvs.openbsd.org> | 2024-01-05 10:14:09 +0000 |
| commit | b9a7cf31279e0017495e16aaa4081196ebe57bde (patch) | |
| tree | 06ac7f20722db1e573394d06e0334fabe8c450bb /lib/libcrypto | |
| parent | 531959b132a85f82968be61100743db8e791776d (diff) | |
Plug a leak in EVP_read_pw_string_min()
Use an error exit that frees the ui in case the UI_add_* fail. Also add
a few empty lines for readability.
ok joshua
Diffstat (limited to 'lib/libcrypto')
| -rw-r--r-- | lib/libcrypto/evp/evp_key.c | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/lib/libcrypto/evp/evp_key.c b/lib/libcrypto/evp/evp_key.c index 2f6e7e70cc2..16c002fe677 100644 --- a/lib/libcrypto/evp/evp_key.c +++ b/lib/libcrypto/evp/evp_key.c @@ -1,4 +1,4 @@ -/* $OpenBSD: evp_key.c,v 1.30 2023/07/07 19:37:53 beck Exp $ */ +/* $OpenBSD: evp_key.c,v 1.31 2024/01/05 10:14:08 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -99,30 +99,35 @@ int EVP_read_pw_string_min(char *buf, int min, int len, const char *prompt, int verify) { - int ret; + UI *ui = NULL; char buff[BUFSIZ]; - UI *ui; + int ret = -1; if (len > BUFSIZ) len = BUFSIZ; /* Ensure that 0 <= min <= len - 1. In particular, 1 <= len. */ if (min < 0 || len - 1 < min) - return -1; + goto err; + if ((prompt == NULL) && (prompt_string[0] != '\0')) prompt = prompt_string; - ui = UI_new(); - if (ui == NULL) - return -1; + + if ((ui = UI_new()) == NULL) + goto err; if (UI_add_input_string(ui, prompt, 0, buf, min, len - 1) < 0) - return -1; + goto err; if (verify) { if (UI_add_verify_string(ui, prompt, 0, buff, min, len - 1, buf) < 0) - return -1; + goto err; } + ret = UI_process(ui); + + err: UI_free(ui); explicit_bzero(buff, BUFSIZ); + return ret; } |