generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

synchronise with main 0.9.6 stable branch

Browse Source
This commit is contained in:
Bodo Möller
2001-11-12 22:42:40 +00:00
parent c3970428ac
commit da904c9cef
118 changed files with 2172 additions and 561 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ssl/s3_clnt.c
View File

@@ -119,8 +119,8 @@ int ssl3_connect(SSL *s)
else if (s->ctx->info_callback != NULL)
cb=s->ctx->info_callback;
if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s);
s->in_handshake++;
if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s);
for (;;)
{
@@ -441,9 +441,9 @@ int ssl3_connect(SSL *s)
skip=0;
}
end:
s->in_handshake--;
if (cb != NULL)
cb(s,SSL_CB_CONNECT_EXIT,ret);
s->in_handshake--;
return(ret);
}
@@ -849,11 +849,17 @@ static int ssl3_get_key_exchange(SSL *s)
DH *dh=NULL;
#endif
/* use same message size as in ssl3_get_certificate_request()
* as ServerKeyExchange message may be skipped */
n=ssl3_get_message(s,
SSL3_ST_CR_KEY_EXCH_A,
SSL3_ST_CR_KEY_EXCH_B,
-1,
1024*8, /* ?? */
#if defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_WIN32)
1024*30, /* 30k max cert list :-) */
#else
1024*100, /* 100k max cert list :-) */
#endif
&ok);
if (!ok) return((int)n);