~ubuntu-branches/ubuntu/lucid/openssl/lucid-security

« back to all changes in this revision

Viewing changes to ssl/ssl_txt.c

  • Committer: Bazaar Package Importer
  • Author(s): Kurt Roeckx
  • Date: 2008-08-03 19:47:10 UTC
  • mfrom: (1.1.6 upstream) (14 gutsy)
  • mto: This revision was merged to the branch mainline in revision 26.
  • Revision ID: james.westby@ubuntu.com-20080803194710-dwlvv1y2pyzi3in2
Tags: 0.9.8g-13
Fix a problem with tlsext preventing firefox 3 from connection.
Patch from upstream CVS and part of 0.9.8h.
(Closes: #492758)

Show diffs side-by-side

added added

removed removed

Lines of Context:
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_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
154
169
#ifndef OPENSSL_NO_COMP
155
170
        if (x->compress_meth != 0)
156
171
                {