← Back to branch summary

~ubuntu-branches/ubuntu/karmic/openssl/karmic-proposed

« back to all changes in this revision

Viewing changes to ssl/s23_clnt.c

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2007-12-05 00:13:39 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20071205001339-tazlol313zs8u6ec
Tags: 0.9.8g-3ubuntu1
* Merge with Debian; remaining changes:
  - Configure: Add support for lpia.
  - Replace duplicate files in the doc directory with symlinks.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ssl/s23_clnt.c
223
223
                {
224
224
                version = SSL2_VERSION;
225
225
                }
 
226
#ifndef OPENSSL_NO_TLSEXT 
 
227
        if (version != SSL2_VERSION)
 
228
                {
 
229
                /* have to disable SSL 2.0 compatibility if we need TLS extensions */
 
230
 
 
231
                if (s->tlsext_hostname != NULL)
 
232
                        ssl2_compat = 0;
 
233
                }
 
234
#endif
226
235
 
227
236
        buf=(unsigned char *)s->init_buf->data;
228
237
        if (s->state == SSL23_ST_CW_CLNT_HELLO_A)
360
369
                                *(p++)=comp->id;
361
370
                                }
362
371
                        *(p++)=0; /* Add the NULL method */
 
372
#ifndef OPENSSL_NO_TLSEXT
 
373
                        if ((p = ssl_add_clienthello_tlsext(s, p, buf+SSL3_RT_MAX_PLAIN_LENGTH)) == NULL)
 
374
                                {
 
375
                                SSLerr(SSL_F_SSL23_CLIENT_HELLO,ERR_R_INTERNAL_ERROR);
 
376
                                return -1;
 
377
                                }
 
378
#endif
363
379
                        
364
380
                        l = p-d;
365
381
                        *p = 42;