| s23_clnt.c (205128) | s23_clnt.c (215697) |
|---|---|
| 1/* ssl/s23_clnt.c */ 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 3 * All rights reserved. 4 * 5 * This package is an SSL implementation written 6 * by Eric Young (eay@cryptsoft.com). 7 * The implementation was written so as to conform with Netscapes SSL. 8 * --- 355 unchanged lines hidden (view full) --- 364 i=ssl_cipher_list_to_bytes(s,SSL_get_ciphers(s),&(p[2]),ssl3_put_cipher_by_char); 365 if (i == 0) 366 { 367 SSLerr(SSL_F_SSL23_CLIENT_HELLO,SSL_R_NO_CIPHERS_AVAILABLE); 368 return -1; 369 } 370 s2n(i,p); 371 p+=i; | 1/* ssl/s23_clnt.c */ 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 3 * All rights reserved. 4 * 5 * This package is an SSL implementation written 6 * by Eric Young (eay@cryptsoft.com). 7 * The implementation was written so as to conform with Netscapes SSL. 8 * --- 355 unchanged lines hidden (view full) --- 364 i=ssl_cipher_list_to_bytes(s,SSL_get_ciphers(s),&(p[2]),ssl3_put_cipher_by_char); 365 if (i == 0) 366 { 367 SSLerr(SSL_F_SSL23_CLIENT_HELLO,SSL_R_NO_CIPHERS_AVAILABLE); 368 return -1; 369 } 370 s2n(i,p); 371 p+=i; |
| 372 | 372#ifdef OPENSSL_NO_COMP 373 *(p++)=1; 374#else |
| 373 /* COMPRESSION */ 374 if (s->ctx->comp_methods == NULL) 375 j=0; 376 else 377 j=sk_SSL_COMP_num(s->ctx->comp_methods); 378 *(p++)=1+j; 379 for (i=0; i<j; i++) 380 { 381 comp=sk_SSL_COMP_value(s->ctx->comp_methods,i); 382 *(p++)=comp->id; 383 } | 375 /* COMPRESSION */ 376 if (s->ctx->comp_methods == NULL) 377 j=0; 378 else 379 j=sk_SSL_COMP_num(s->ctx->comp_methods); 380 *(p++)=1+j; 381 for (i=0; i<j; i++) 382 { 383 comp=sk_SSL_COMP_value(s->ctx->comp_methods,i); 384 *(p++)=comp->id; 385 } |
| 386#endif |
|
| 384 *(p++)=0; /* Add the NULL method */ 385#ifndef OPENSSL_NO_TLSEXT 386 if ((p = ssl_add_clienthello_tlsext(s, p, buf+SSL3_RT_MAX_PLAIN_LENGTH)) == NULL) 387 { 388 SSLerr(SSL_F_SSL23_CLIENT_HELLO,ERR_R_INTERNAL_ERROR); 389 return -1; 390 } 391#endif --- 227 unchanged lines hidden --- | 387 *(p++)=0; /* Add the NULL method */ 388#ifndef OPENSSL_NO_TLSEXT 389 if ((p = ssl_add_clienthello_tlsext(s, p, buf+SSL3_RT_MAX_PLAIN_LENGTH)) == NULL) 390 { 391 SSLerr(SSL_F_SSL23_CLIENT_HELLO,ERR_R_INTERNAL_ERROR); 392 return -1; 393 } 394#endif --- 227 unchanged lines hidden --- |