diff options
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libssl/ssl_txt.c | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/src/lib/libssl/ssl_txt.c b/src/lib/libssl/ssl_txt.c index 8655a31333..06b86750fd 100644 --- a/src/lib/libssl/ssl_txt.c +++ b/src/lib/libssl/ssl_txt.c | |||
| @@ -81,7 +81,7 @@ int SSL_SESSION_print_fp(FILE *fp, const SSL_SESSION *x) | |||
| 81 | int SSL_SESSION_print(BIO *bp, const SSL_SESSION *x) | 81 | int SSL_SESSION_print(BIO *bp, const SSL_SESSION *x) |
| 82 | { | 82 | { |
| 83 | unsigned int i; | 83 | unsigned int i; |
| 84 | char *s; | 84 | const char *s; |
| 85 | 85 | ||
| 86 | if (x == NULL) goto err; | 86 | if (x == NULL) goto err; |
| 87 | if (BIO_puts(bp,"SSL-Session:\n") <= 0) goto err; | 87 | if (BIO_puts(bp,"SSL-Session:\n") <= 0) goto err; |
| @@ -151,9 +151,25 @@ int SSL_SESSION_print(BIO *bp, const SSL_SESSION *x) | |||
| 151 | if (BIO_printf(bp,"%02X",x->krb5_client_princ[i]) <= 0) goto err; | 151 | if (BIO_printf(bp,"%02X",x->krb5_client_princ[i]) <= 0) goto err; |
| 152 | } | 152 | } |
| 153 | #endif /* OPENSSL_NO_KRB5 */ | 153 | #endif /* OPENSSL_NO_KRB5 */ |
| 154 | #ifndef OPENSSL_NO_TLSEXT | ||
| 155 | if (x->tlsext_tick_lifetime_hint) | ||
| 156 | { | ||
| 157 | if (BIO_printf(bp, | ||
| 158 | "\n TLS session ticket lifetime hint: %ld (seconds)", | ||
| 159 | x->tlsext_tick_lifetime_hint) <=0) | ||
| 160 | goto err; | ||
| 161 | } | ||
| 162 | if (x->tlsext_tick) | ||
| 163 | { | ||
| 164 | if (BIO_puts(bp, "\n TLS session ticket:\n") <= 0) goto err; | ||
| 165 | if (BIO_dump_indent(bp, (char *)x->tlsext_tick, x->tlsext_ticklen, 4) <= 0) | ||
| 166 | goto err; | ||
| 167 | } | ||
| 168 | #endif | ||
| 169 | #ifndef OPENSSL_NO_COMP | ||
| 154 | if (x->compress_meth != 0) | 170 | if (x->compress_meth != 0) |
| 155 | { | 171 | { |
| 156 | SSL_COMP *comp; | 172 | SSL_COMP *comp = NULL; |
| 157 | 173 | ||
| 158 | ssl_cipher_get_evp(x,NULL,NULL,&comp); | 174 | ssl_cipher_get_evp(x,NULL,NULL,&comp); |
| 159 | if (comp == NULL) | 175 | if (comp == NULL) |
| @@ -165,6 +181,7 @@ int SSL_SESSION_print(BIO *bp, const SSL_SESSION *x) | |||
| 165 | if (BIO_printf(bp,"\n Compression: %d (%s)", comp->id,comp->method->name) <= 0) goto err; | 181 | if (BIO_printf(bp,"\n Compression: %d (%s)", comp->id,comp->method->name) <= 0) goto err; |
| 166 | } | 182 | } |
| 167 | } | 183 | } |
| 184 | #endif | ||
| 168 | if (x->time != 0L) | 185 | if (x->time != 0L) |
| 169 | { | 186 | { |
| 170 | if (BIO_printf(bp, "\n Start Time: %ld",x->time) <= 0) goto err; | 187 | if (BIO_printf(bp, "\n Start Time: %ld",x->time) <= 0) goto err; |
