diff options
| author | Tilman Keskinöz <arved@arved.at> | 2018-05-17 13:04:31 +0200 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2018-05-21 21:57:18 +0200 |
| commit | d61e6040a02464f1dd41942ee1e17ef59822102d (patch) | |
| tree | 68ba2d3bd9ad100b3ae1674510a8e6bc4230e440 /ssl/ssl_txt.c | |
| parent | 6671c775e661b6bda139ec8154905bf566fb77c9 (diff) | |
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@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6282)
Diffstat (limited to 'ssl/ssl_txt.c')
| -rw-r--r-- | ssl/ssl_txt.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ssl/ssl_txt.c b/ssl/ssl_txt.c index b1254b09d7..2056de969e 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) |