diff options
author | Ted Unangst <tedu@cvs.openbsd.org> | 2016-04-28 16:42:29 +0000 |
---|---|---|
committer | Ted Unangst <tedu@cvs.openbsd.org> | 2016-04-28 16:42:29 +0000 |
commit | 0392803436cc2c1f2e90e2836f82ba86c9ff4b8c (patch) | |
tree | d80e4a70ebd36a92f8e7aae727b6153531a90930 /lib | |
parent | d165879657d5f5797f53b4de91facfde5059d434 (diff) |
don't go into an unbreakable infinite loop during operations such
as reading passwords. allow ^C to break.
the pain was mine, the fix is miod's.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/libssl/src/crypto/ui/ui_lib.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/libssl/src/crypto/ui/ui_lib.c b/lib/libssl/src/crypto/ui/ui_lib.c index 1c7f81d1f17..80f0992ddd5 100644 --- a/lib/libssl/src/crypto/ui/ui_lib.c +++ b/lib/libssl/src/crypto/ui/ui_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ui_lib.c,v 1.30 2015/02/10 11:22:21 jsing Exp $ */ +/* $OpenBSD: ui_lib.c,v 1.31 2016/04/28 16:42:28 tedu Exp $ */ /* Written by Richard Levitte (richard@levitte.org) for the OpenSSL * project 2001. */ @@ -491,6 +491,7 @@ UI_process(UI *ui) switch (ui->meth->ui_read_string(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 */ |