[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

Richard Levitte levitte at openssl.org
Sat Mar 11 00:27:41 UTC 2017


The branch OpenSSL_1_0_2-stable has been updated
       via  2b194874c14bdaa8f60280f37d5ad0c154cebfe2 (commit)
      from  5247c0388610bfdcc8f44b777d75ab681120753d (commit)


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

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

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 3cc067c..643ae59 100644
--- a/crypto/ui/ui_lib.c
+++ b/crypto/ui/ui_lib.c
@@ -747,7 +747,6 @@ const char *UI_get0_action_string(UI_STRING *uis)
     if (!uis)
         return NULL;
     switch (uis->type) {
-    case UIT_PROMPT:
     case UIT_BOOLEAN:
         return uis->_.boolean_data.action_desc;
     default:


More information about the openssl-commits mailing list