s3_clnt.c (100936) | s3_clnt.c (101615) |
---|---|
1/* ssl/s3_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 * --- 532 unchanged lines hidden (view full) --- 541 /* Session ID */ 542 if (s->new_session) 543 i=0; 544 else 545 i=s->session->session_id_length; 546 *(p++)=i; 547 if (i != 0) 548 { | 1/* ssl/s3_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 * --- 532 unchanged lines hidden (view full) --- 541 /* Session ID */ 542 if (s->new_session) 543 i=0; 544 else 545 i=s->session->session_id_length; 546 *(p++)=i; 547 if (i != 0) 548 { |
549 die(i <= sizeof s->session->session_id); | 549 if (i > sizeof s->session->session_id) 550 { 551 SSLerr(SSL_F_SSL3_CLIENT_HELLO, SSL_R_INTERNAL_ERROR); 552 goto err; 553 } |
550 memcpy(p,s->session->session_id,i); 551 p+=i; 552 } 553 554 /* Ciphers supported */ 555 i=ssl_cipher_list_to_bytes(s,SSL_get_ciphers(s),&(p[2])); 556 if (i == 0) 557 { --- 1254 unchanged lines hidden --- | 554 memcpy(p,s->session->session_id,i); 555 p+=i; 556 } 557 558 /* Ciphers supported */ 559 i=ssl_cipher_list_to_bytes(s,SSL_get_ciphers(s),&(p[2])); 560 if (i == 0) 561 { --- 1254 unchanged lines hidden --- |