s3_clnt.c (72613) | s3_clnt.c (89837) |
---|---|
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 * --- 105 unchanged lines hidden (view full) --- 114 ERR_clear_error(); 115 clear_sys_error(); 116 117 if (s->info_callback != NULL) 118 cb=s->info_callback; 119 else if (s->ctx->info_callback != NULL) 120 cb=s->ctx->info_callback; 121 | 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 * --- 105 unchanged lines hidden (view full) --- 114 ERR_clear_error(); 115 clear_sys_error(); 116 117 if (s->info_callback != NULL) 118 cb=s->info_callback; 119 else if (s->ctx->info_callback != NULL) 120 cb=s->ctx->info_callback; 121 |
122 if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s); | |
123 s->in_handshake++; | 122 s->in_handshake++; |
123 if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s); |
|
124 125 for (;;) 126 { 127 state=s->state; 128 129 switch(s->state) 130 { 131 case SSL_ST_RENEGOTIATE: --- 304 unchanged lines hidden (view full) --- 436 s->state=state; 437 cb(s,SSL_CB_CONNECT_LOOP,1); 438 s->state=new_state; 439 } 440 } 441 skip=0; 442 } 443end: | 124 125 for (;;) 126 { 127 state=s->state; 128 129 switch(s->state) 130 { 131 case SSL_ST_RENEGOTIATE: --- 304 unchanged lines hidden (view full) --- 436 s->state=state; 437 cb(s,SSL_CB_CONNECT_LOOP,1); 438 s->state=new_state; 439 } 440 } 441 skip=0; 442 } 443end: |
444 s->in_handshake--; |
|
444 if (cb != NULL) 445 cb(s,SSL_CB_CONNECT_EXIT,ret); | 445 if (cb != NULL) 446 cb(s,SSL_CB_CONNECT_EXIT,ret); |
446 s->in_handshake--; | |
447 return(ret); 448 } 449 450 451static int ssl3_client_hello(SSL *s) 452 { 453 unsigned char *buf; 454 unsigned char *p,*d; --- 389 unchanged lines hidden (view full) --- 844 EVP_PKEY *pkey=NULL; 845#ifndef NO_RSA 846 RSA *rsa=NULL; 847#endif 848#ifndef NO_DH 849 DH *dh=NULL; 850#endif 851 | 447 return(ret); 448 } 449 450 451static int ssl3_client_hello(SSL *s) 452 { 453 unsigned char *buf; 454 unsigned char *p,*d; --- 389 unchanged lines hidden (view full) --- 844 EVP_PKEY *pkey=NULL; 845#ifndef NO_RSA 846 RSA *rsa=NULL; 847#endif 848#ifndef NO_DH 849 DH *dh=NULL; 850#endif 851 |
852 /* use same message size as in ssl3_get_certificate_request() 853 * as ServerKeyExchange message may be skipped */ |
|
852 n=ssl3_get_message(s, 853 SSL3_ST_CR_KEY_EXCH_A, 854 SSL3_ST_CR_KEY_EXCH_B, 855 -1, | 854 n=ssl3_get_message(s, 855 SSL3_ST_CR_KEY_EXCH_A, 856 SSL3_ST_CR_KEY_EXCH_B, 857 -1, |
856 1024*8, /* ?? */ | 858#if defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_WIN32) 859 1024*30, /* 30k max cert list :-) */ 860#else 861 1024*100, /* 100k max cert list :-) */ 862#endif |
857 &ok); 858 859 if (!ok) return((int)n); 860 861 if (s->s3->tmp.message_type != SSL3_MT_SERVER_KEY_EXCHANGE) 862 { 863 s->s3->tmp.reuse_message=1; 864 return(1); --- 877 unchanged lines hidden --- | 863 &ok); 864 865 if (!ok) return((int)n); 866 867 if (s->s3->tmp.message_type != SSL3_MT_SERVER_KEY_EXCHANGE) 868 { 869 s->s3->tmp.reuse_message=1; 870 return(1); --- 877 unchanged lines hidden --- |