[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  6e470e190853f59a394dc92fefd74666c94266f4 (commit)
      from  5469600e367a1a4cf3dd929159b5bc8091db49de (commit)


- Log -----------------------------------------------------------------
commit 6e470e190853f59a394dc92fefd74666c94266f4
Author: Richard Levitte <levitte at openssl.org>
Date:   Sat Mar 11 00:54:52 2017 +0100

    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 at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2904)

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

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

diff --git a/crypto/ui/ui_lib.c b/crypto/ui/ui_lib.c
index ceda7e9..7f30a5b 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: