projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ssl/ssl_txt: fix NULL-check
[openssl.git]
/
ssl
/
ssl_txt.c
diff --git
a/ssl/ssl_txt.c
b/ssl/ssl_txt.c
index b1254b09d7e2edf31918d7683a938b787f7b88d6..2056de969e73f51cb51360fd217ea6d6217c051d 100644
(file)
--- 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 (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 {
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 {
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)
goto err;
}
if (BIO_puts(bp, " Session-ID: ") <= 0)