From 8da506fe86ae4114f94c896522d4bf388c1bfded Mon Sep 17 00:00:00 2001
From: tedu <>
Date: Thu, 28 Apr 2016 16:42:28 +0000
Subject: 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.

---
 src/lib/libcrypto/ui/ui_lib.c         | 3 ++-
 src/lib/libssl/src/crypto/ui/ui_lib.c | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/lib/libcrypto/ui/ui_lib.c b/src/lib/libcrypto/ui/ui_lib.c
index 1c7f81d1f1..80f0992ddd 100644
--- a/src/lib/libcrypto/ui/ui_lib.c
+++ b/src/lib/libcrypto/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 */
diff --git a/src/lib/libssl/src/crypto/ui/ui_lib.c b/src/lib/libssl/src/crypto/ui/ui_lib.c
index 1c7f81d1f1..80f0992ddd 100644
--- a/src/lib/libssl/src/crypto/ui/ui_lib.c
+++ b/src/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 */
-- 
cgit v1.2.3-55-g6feb