diff options
| author | Richard Levitte <levitte@openssl.org> | 2017-07-05 10:26:25 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2017-07-05 11:17:08 +0200 |
| commit | fac8e70de383861315b1fd1ee64193c794f1d9ca (patch) | |
| tree | ccde14bc99439660b0a33466d59ff9c6c35b8042 /crypto/ui/ui_lib.c | |
| parent | b066ef30585bdb051f9aae84d3b5a5df402c43b7 (diff) | |
Fix small UI issues
- in EVP_read_pw_string_min(), the return value from UI_add_* wasn't
properly checked
- in UI_process(), |state| was never made NULL, which means an error
when closing the session wouldn't be accurately reported.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/3849)
(cherry picked from commit b96dba9e5ec7afc355be1eab915f69c8c0d51741)
Diffstat (limited to 'crypto/ui/ui_lib.c')
| -rw-r--r-- | crypto/ui/ui_lib.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/ui/ui_lib.c b/crypto/ui/ui_lib.c index 24d30e1592..464dac4237 100644 --- a/crypto/ui/ui_lib.c +++ b/crypto/ui/ui_lib.c @@ -479,6 +479,8 @@ int UI_process(UI *ui) } } } + + state = NULL; err: if (ui->meth->ui_close_session != NULL && ui->meth->ui_close_session(ui) <= 0) { |