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

New function SSL_renegotiate_pending().

Browse Source 
New option SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION.
This commit is contained in:
Bodo Möller
2001-09-20 22:54:09 +00:00
parent c404ff7955
commit 6b0e9facf4
5 changed files with 51 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ssl/s3_srvr.c
View File

@@ -524,7 +524,9 @@ int ssl3_accept(SSL *s)
/* remove buffering on output */
ssl_free_wbio_buffer(s);
s->new_session=0;
if (s->new_session == 2)
s->new_session=0;
/* if s->new_session is still 1, we have only sent a HelloRequest */
s->init_num=0;
ssl_update_cache(s,SSL_SESS_CACHE_SERVER);
@@ -673,7 +675,15 @@ static int ssl3_get_client_hello(SSL *s)
j= *(p++);
s->hit=0;
if (j == 0)
/* Versions before 0.9.7 always allow session reuse during renegotiation
* (i.e. when s->new_session is true), option
* SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION is new with 0.9.7.
* Maybe this optional behaviour should always have been the default,
* but we cannot safely change the default behaviour (or new applications
* might be written that become totally unsecure when compiled with
* an earlier library version)
*/
if (j == 0 || (s->new_session && (s->options & SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION)))
{
if (!ssl_get_new_session(s,1))
goto err;
@@ -694,6 +704,11 @@ static int ssl3_get_client_hello(SSL *s)
}
}
if (s->new_session)
/* actually not necessarily a 'new' section unless
* SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION is set */
s->new_session = 2;
p+=j;
n2s(p,i);
if ((i == 0) && (j != 0))