diff options
| author | Simon L. B. Nielsen <simon@FreeBSD.org> | 2006-07-29 19:10:21 +0000 |
|---|---|---|
| committer | Simon L. B. Nielsen <simon@FreeBSD.org> | 2006-07-29 19:10:21 +0000 |
| commit | 3b4e3dcb9f42dc9f4f864acf804677d7a3e0c233 (patch) | |
| tree | 213a0c4d5ba3869f66ecf970819532048fed4a9d /crypto/openssl/ssl/ssl_txt.c | |
| parent | a37fa6607ab9ce4dac1c683442960508178fd371 (diff) | |
| download | src-3b4e3dcb9f42dc9f4f864acf804677d7a3e0c233.tar.gz src-3b4e3dcb9f42dc9f4f864acf804677d7a3e0c233.zip | |
Vendor import of OpenSSL 0.9.8b
Notes
Notes:
svn path=/vendor-crypto/openssl/dist/; revision=160814
Diffstat (limited to 'crypto/openssl/ssl/ssl_txt.c')
| -rw-r--r-- | crypto/openssl/ssl/ssl_txt.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/crypto/openssl/ssl/ssl_txt.c b/crypto/openssl/ssl/ssl_txt.c index 40b76b1b2692..4eb0867155e1 100644 --- a/crypto/openssl/ssl/ssl_txt.c +++ b/crypto/openssl/ssl/ssl_txt.c @@ -61,7 +61,7 @@ #include "ssl_locl.h" #ifndef OPENSSL_NO_FP_API -int SSL_SESSION_print_fp(FILE *fp, SSL_SESSION *x) +int SSL_SESSION_print_fp(FILE *fp, const SSL_SESSION *x) { BIO *b; int ret; @@ -78,10 +78,10 @@ int SSL_SESSION_print_fp(FILE *fp, SSL_SESSION *x) } #endif -int SSL_SESSION_print(BIO *bp, SSL_SESSION *x) +int SSL_SESSION_print(BIO *bp, const SSL_SESSION *x) { unsigned int i; - char *s; + const char *s; if (x == NULL) goto err; if (BIO_puts(bp,"SSL-Session:\n") <= 0) goto err; @@ -151,9 +151,10 @@ int SSL_SESSION_print(BIO *bp, SSL_SESSION *x) if (BIO_printf(bp,"%02X",x->krb5_client_princ[i]) <= 0) goto err; } #endif /* OPENSSL_NO_KRB5 */ +#ifndef OPENSSL_NO_COMP if (x->compress_meth != 0) { - SSL_COMP *comp; + SSL_COMP *comp = NULL; ssl_cipher_get_evp(x,NULL,NULL,&comp); if (comp == NULL) @@ -165,6 +166,7 @@ int SSL_SESSION_print(BIO *bp, SSL_SESSION *x) if (BIO_printf(bp,"\n Compression: %d (%s)", comp->id,comp->method->name) <= 0) goto err; } } +#endif if (x->time != 0L) { if (BIO_printf(bp, "\n Start Time: %ld",x->time) <= 0) goto err; |