[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[Richard Levitte]

The branch OpenSSL_1_1_0-stable has been updated
       via  f31c714e923e76f54ff3b492f646662ef57f7d59 (commit)
      from  fe6984df95f91422b11e74c02202a5f5eaf99eaa (commit)


- Log -----------------------------------------------------------------
commit f31c714e923e76f54ff3b492f646662ef57f7d59
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)
    (cherry picked from commit 6e470e190853f59a394dc92fefd74666c94266f4)

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

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

diff --git a/crypto/ui/ui_lib.c b/crypto/ui/ui_lib.c
index 12d62d8..c06baa0 100644
--- a/crypto/ui/ui_lib.c
+++ b/crypto/ui/ui_lib.c
@@ -705,7 +705,6 @@ 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;
     default: