From: Richard Levitte <levitte@openssl.org>
Date: Fri, 10 Mar 2017 23:54:52 +0000 (+0100)
Subject: Fix UI_get0_action_string()
X-Git-Tag: OpenSSL_1_1_1-pre1~2069
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6e470e190853f59a394dc92fefd74666c94266f4;p=oweals%2Fopenssl.git

Fix UI_get0_action_string()

It shouldn't try to return an action description for UIT_PROMPT type
UI strings.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2904)
---

diff --git a/crypto/ui/ui_lib.c b/crypto/ui/ui_lib.c
index ceda7e934f..7f30a5b0af 100644
--- a/crypto/ui/ui_lib.c
+++ b/crypto/ui/ui_lib.c
@@ -724,9 +724,9 @@ const char *UI_get0_output_string(UI_STRING *uis)
 const char *UI_get0_action_string(UI_STRING *uis)
 {
     switch (uis->type) {
-    case UIT_PROMPT:
     case UIT_BOOLEAN:
         return uis->_.boolean_data.action_desc;
+    case UIT_PROMPT:
     case UIT_NONE:
     case UIT_VERIFY:
     case UIT_INFO: