| s2_srvr.c (205128) | s2_srvr.c (215697) |
|---|---|
| 1/* ssl/s2_srvr.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 * --- 683 unchanged lines hidden (view full) --- 692 SSLerr(SSL_F_GET_CLIENT_HELLO,ERR_R_MALLOC_FAILURE); 693 return(0); 694 } 695 696static int server_hello(SSL *s) 697 { 698 unsigned char *p,*d; 699 int n,hit; | 1/* ssl/s2_srvr.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 * --- 683 unchanged lines hidden (view full) --- 692 SSLerr(SSL_F_GET_CLIENT_HELLO,ERR_R_MALLOC_FAILURE); 693 return(0); 694 } 695 696static int server_hello(SSL *s) 697 { 698 unsigned char *p,*d; 699 int n,hit; |
| 700 STACK_OF(SSL_CIPHER) *sk; | |
| 701 702 p=(unsigned char *)s->init_buf->data; 703 if (s->state == SSL2_ST_SEND_SERVER_HELLO_A) 704 { 705 d=p+11; 706 *(p++)=SSL2_MT_SERVER_HELLO; /* type */ 707 hit=s->hit; 708 *(p++)=(unsigned char)hit; --- 64 unchanged lines hidden (view full) --- 773 s2n(s->version,p); /* version */ 774 n=i2d_X509(s->cert->pkeys[SSL_PKEY_RSA_ENC].x509,NULL); 775 s2n(n,p); /* certificate length */ 776 i2d_X509(s->cert->pkeys[SSL_PKEY_RSA_ENC].x509,&d); 777 n=0; 778 779 /* lets send out the ciphers we like in the 780 * prefered order */ | 700 701 p=(unsigned char *)s->init_buf->data; 702 if (s->state == SSL2_ST_SEND_SERVER_HELLO_A) 703 { 704 d=p+11; 705 *(p++)=SSL2_MT_SERVER_HELLO; /* type */ 706 hit=s->hit; 707 *(p++)=(unsigned char)hit; --- 64 unchanged lines hidden (view full) --- 772 s2n(s->version,p); /* version */ 773 n=i2d_X509(s->cert->pkeys[SSL_PKEY_RSA_ENC].x509,NULL); 774 s2n(n,p); /* certificate length */ 775 i2d_X509(s->cert->pkeys[SSL_PKEY_RSA_ENC].x509,&d); 776 n=0; 777 778 /* lets send out the ciphers we like in the 779 * prefered order */ |
| 781 sk= s->session->ciphers; | |
| 782 n=ssl_cipher_list_to_bytes(s,s->session->ciphers,d,0); 783 d+=n; 784 s2n(n,p); /* add cipher length */ 785 } 786 787 /* make and send conn_id */ 788 s2n(SSL2_CONNECTION_ID_LENGTH,p); /* add conn_id length */ 789 s->s2->conn_id_length=SSL2_CONNECTION_ID_LENGTH; --- 354 unchanged lines hidden --- | 780 n=ssl_cipher_list_to_bytes(s,s->session->ciphers,d,0); 781 d+=n; 782 s2n(n,p); /* add cipher length */ 783 } 784 785 /* make and send conn_id */ 786 s2n(SSL2_CONNECTION_ID_LENGTH,p); /* add conn_id length */ 787 s->s2->conn_id_length=SSL2_CONNECTION_ID_LENGTH; --- 354 unchanged lines hidden --- |