[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  341de5f1997d21b60cee69be656f1ae709bccdac (commit)
      from  50799f3558981eac0482d3ea77b21c58b56d4871 (commit)


- Log -----------------------------------------------------------------
commit 341de5f1997d21b60cee69be656f1ae709bccdac
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Feb 23 00:11:18 2017 +0100

    Let the output from 'openssl enc -ciphers' go to stdout
    
    Also, don't exit with an error code
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2716)

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

Summary of changes:
 apps/enc.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/apps/enc.c b/apps/enc.c
index f31e2c8..94c8255 100644
--- a/apps/enc.c
+++ b/apps/enc.c
@@ -134,10 +134,11 @@ int enc_main(int argc, char **argv)
             ret = 0;
             goto end;
         case OPT_LIST:
-            BIO_printf(bio_err, "Supported ciphers:\n");
+            BIO_printf(bio_out, "Supported ciphers:\n");
             OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_CIPHER_METH,
-                                   show_ciphers, bio_err);
-            BIO_printf(bio_err, "\n");
+                                   show_ciphers, bio_out);
+            BIO_printf(bio_out, "\n");
+            ret = 0;
             goto end;
         case OPT_E:
             enc = 1;