[openssl] OpenSSL_1_1_1-stable update

Dr. Paul Dale pauli at openssl.org
Wed Aug 25 23:59:28 UTC 2021


The branch OpenSSL_1_1_1-stable has been updated
       via  7a1a91556cc271d38944410b133a2ab5e2cf8ca8 (commit)
      from  18622c7625436d7f99c0f51895c4d3cea233c62e (commit)


- Log -----------------------------------------------------------------
commit 7a1a91556cc271d38944410b133a2ab5e2cf8ca8
Author: Tianjia Zhang <tianjia.zhang at linux.alibaba.com>
Date:   Mon Aug 23 17:40:22 2021 +0800

    apps/ciphers: Fix wrong return value when using -convert parameter
    
    Command 'openssl ciphers -convert <name>' always returns failure,
    this patch set the correct return value.
    
    Signed-off-by: Tianjia Zhang <tianjia.zhang at linux.alibaba.com>
    
    Reviewed-by: Paul Yang <kaishen.yy at antfin.com>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/16383)
    
    (cherry picked from commit 8b4e9c5265ffd3457ad37133502a9d8a4e8daccd)

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

Summary of changes:
 apps/ciphers.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/ciphers.c b/apps/ciphers.c
index 0bb33a4aca..e403130eeb 100644
--- a/apps/ciphers.c
+++ b/apps/ciphers.c
@@ -172,6 +172,7 @@ int ciphers_main(int argc, char **argv)
     if (convert != NULL) {
         BIO_printf(bio_out, "OpenSSL cipher name: %s\n",
                    OPENSSL_cipher_name(convert));
+        ret = 0;
         goto end;
     }
 


More information about the openssl-commits mailing list