diff options
Diffstat (limited to 'src/lib/libssl/ssl_txt.c')
| -rw-r--r-- | src/lib/libssl/ssl_txt.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/lib/libssl/ssl_txt.c b/src/lib/libssl/ssl_txt.c index 25f2290290..950620d300 100644 --- a/src/lib/libssl/ssl_txt.c +++ b/src/lib/libssl/ssl_txt.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssl_txt.c,v 1.22 2014/07/10 08:51:15 tedu Exp $ */ | 1 | /* $OpenBSD: ssl_txt.c,v 1.23 2014/07/11 09:24:44 beck Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -159,16 +159,6 @@ SSL_SESSION_print(BIO *bp, const SSL_SESSION *x) | |||
| 159 | if (BIO_printf(bp, "%02X", x->master_key[i]) <= 0) | 159 | if (BIO_printf(bp, "%02X", x->master_key[i]) <= 0) |
| 160 | goto err; | 160 | goto err; |
| 161 | } | 161 | } |
| 162 | #ifndef OPENSSL_NO_PSK | ||
| 163 | if (BIO_puts(bp, "\n PSK identity: ") <= 0) | ||
| 164 | goto err; | ||
| 165 | if (BIO_printf(bp, "%s", x->psk_identity ? x->psk_identity : "None") <= 0) | ||
| 166 | goto err; | ||
| 167 | if (BIO_puts(bp, "\n PSK identity hint: ") <= 0) | ||
| 168 | goto err; | ||
| 169 | if (BIO_printf(bp, "%s", x->psk_identity_hint ? x->psk_identity_hint : "None") <= 0) | ||
| 170 | goto err; | ||
| 171 | #endif | ||
| 172 | if (x->tlsext_tick_lifetime_hint) { | 162 | if (x->tlsext_tick_lifetime_hint) { |
| 173 | if (BIO_printf(bp, | 163 | if (BIO_printf(bp, |
| 174 | "\n TLS session ticket lifetime hint: %ld (seconds)", | 164 | "\n TLS session ticket lifetime hint: %ld (seconds)", |
