[openssl] master update

[bernd.edlinger at hotmail.de]

The branch master has been updated
       via  f8922b5107d098c78f846c8c999f96111345de8d (commit)
      from  32ee452496f8cf4558d645f9db908b09df919f04 (commit)


- Log -----------------------------------------------------------------
commit f8922b5107d098c78f846c8c999f96111345de8d
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
Date:   Mon Jun 17 16:57:25 2019 +0200

    Handle CTRL-C as non-redoable abort signal
    
    This is a bit annoying, if for instance "openssl genrsa -aes128"
    tries to read a 4+ character size password, but CTRL-C does no longer
    work after a RETURN key, since the flag UI_FLAG_REDOABLE is set by
    UI_set_result_ex, together with the error "You must type in 4 to 1023 characters".
    Thus remove the REDOABLE flag to allow CTRL-C to work.
    
    [extended tests]
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/9170)

-----------------------------------------------------------------------

Summary of changes:
 crypto/ui/ui_lib.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/crypto/ui/ui_lib.c b/crypto/ui/ui_lib.c
index a3a00652..8c3502e 100644
--- a/crypto/ui/ui_lib.c
+++ b/crypto/ui/ui_lib.c
@@ -500,6 +500,7 @@ int UI_process(UI *ui)
     if (ui->meth->ui_flush != NULL)
         switch (ui->meth->ui_flush(ui)) {
         case -1:               /* Interrupt/Cancel/something... */
+            ui->flags &= ~UI_FLAG_REDOABLE;
             ok = -2;
             goto err;
         case 0:                /* Errors */
@@ -517,6 +518,7 @@ int UI_process(UI *ui)
                                              sk_UI_STRING_value(ui->strings,
                                                                 i))) {
             case -1:           /* Interrupt/Cancel/something... */
+                ui->flags &= ~UI_FLAG_REDOABLE;
                 ok = -2;
                 goto err;
             case 0:            /* Errors */