← Back to branch summary

~ubuntu-branches/ubuntu/hardy/openssl/hardy-security

« back to all changes in this revision

Viewing changes to ssl/ssl_txt.c

  • Committer: Bazaar Package Importer
  • Author(s): Kurt Roeckx
  • Date: 2005-12-13 21:37:42 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20051213213742-7em5nrw5c7ceegyd
Tags: 0.9.8a-5
http://bugs.debian.org/335912
Stop ssh from crashing randomly on sparc (Closes: #335912)
Patch from upstream cvs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ssl/ssl_txt.c
61
61
#include "ssl_locl.h"
62
62
 
63
63
#ifndef OPENSSL_NO_FP_API
64
 
int SSL_SESSION_print_fp(FILE *fp, SSL_SESSION *x)
 
64
int SSL_SESSION_print_fp(FILE *fp, const SSL_SESSION *x)
65
65
        {
66
66
        BIO *b;
67
67
        int ret;
78
78
        }
79
79
#endif
80
80
 
81
 
int SSL_SESSION_print(BIO *bp, SSL_SESSION *x)
 
81
int SSL_SESSION_print(BIO *bp, const SSL_SESSION *x)
82
82
        {
83
83
        unsigned int i;
84
 
        char *s;
 
84
        const char *s;
85
85
 
86
86
        if (x == NULL) goto err;
87
87
        if (BIO_puts(bp,"SSL-Session:\n") <= 0) goto err;
151
151
                        if (BIO_printf(bp,"%02X",x->krb5_client_princ[i]) <= 0) goto err;
152
152
                        }
153
153
#endif /* OPENSSL_NO_KRB5 */
 
154
#ifndef OPENSSL_NO_COMP
154
155
        if (x->compress_meth != 0)
155
156
                {
156
 
                SSL_COMP *comp;
 
157
                SSL_COMP *comp = NULL;
157
158
 
158
159
                ssl_cipher_get_evp(x,NULL,NULL,&comp);
159
160
                if (comp == NULL)
165
166
                        if (BIO_printf(bp,"\n   Compression: %d (%s)", comp->id,comp->method->name) <= 0) goto err;
166
167
                        }
167
168
                }       
 
169
#endif
168
170
        if (x->time != 0L)
169
171
                {
170
172
                if (BIO_printf(bp, "\n    Start Time: %ld",x->time) <= 0) goto err;