[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  d61e6040a02464f1dd41942ee1e17ef59822102d (commit)
      from  6671c775e661b6bda139ec8154905bf566fb77c9 (commit)


- Log -----------------------------------------------------------------
commit d61e6040a02464f1dd41942ee1e17ef59822102d
Author: Tilman Keskinöz <arved at arved.at>
Date:   Thu May 17 13:04:31 2018 +0200

    ssl/ssl_txt: fix NULL-check
    
    NULL-check for cipher is redundant, instead check if cipher->name is NULL
    
    While here fix formatting of BIO_printf calls as suggested by Andy Polyakov.
    
    CLA: trivial
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6282)

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

Summary of changes:
 ssl/ssl_txt.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ssl/ssl_txt.c b/ssl/ssl_txt.c
index b1254b0..2056de9 100644
--- a/ssl/ssl_txt.c
+++ b/ssl/ssl_txt.c
@@ -44,18 +44,18 @@ int SSL_SESSION_print(BIO *bp, const SSL_SESSION *x)
 
     if (x->cipher == NULL) {
         if (((x->cipher_id) & 0xff000000) == 0x02000000) {
-            if (BIO_printf
-                (bp, "    Cipher    : %06lX\n", x->cipher_id & 0xffffff) <= 0)
+            if (BIO_printf(bp, "    Cipher    : %06lX\n",
+                           x->cipher_id & 0xffffff) <= 0)
                 goto err;
         } else {
-            if (BIO_printf
-                (bp, "    Cipher    : %04lX\n", x->cipher_id & 0xffff) <= 0)
+            if (BIO_printf(bp, "    Cipher    : %04lX\n",
+                           x->cipher_id & 0xffff) <= 0)
                 goto err;
         }
     } else {
-        if (BIO_printf
-            (bp, "    Cipher    : %s\n",
-             ((x->cipher == NULL) ? "unknown" : x->cipher->name)) <= 0)
+        if (BIO_printf(bp, "    Cipher    : %s\n",
+                       ((x->cipher->name == NULL) ? "unknown"
+                                                  : x->cipher->name)) <= 0)
             goto err;
     }
     if (BIO_puts(bp, "    Session-ID: ") <= 0)