make code a little more similar to what it looked like before the fixes
This commit is contained in:
parent
44cc9715ec
commit
a10b85d9e6
2
CHANGES
2
CHANGES
@ -26,7 +26,7 @@
|
||||
|
||||
*) Change ssl/s2_clnt.c and ssl/s3_srvr.c so that received handshake
|
||||
messages are stored in a single piece (fixed-length part and
|
||||
variable-length part) and fix various bugs found on the way.
|
||||
variable-length part combined) and fix various bugs found on the way.
|
||||
[Bodo Moeller]
|
||||
|
||||
*) In ssl3_get_client_hello (ssl/s3_srvr.c), generate a fatal alert
|
||||
|
@ -852,8 +852,8 @@ static int get_server_verify(SSL *s)
|
||||
p=(unsigned char *)s->init_buf->data;
|
||||
if (s->state == SSL2_ST_GET_SERVER_VERIFY_A)
|
||||
{
|
||||
i=ssl2_read(s,(char *)&(p[s->init_num]),3-s->init_num);
|
||||
if (i < (3-s->init_num))
|
||||
i=ssl2_read(s,(char *)&(p[s->init_num]),1-s->init_num);
|
||||
if (i < (1-s->init_num))
|
||||
return(ssl2_part_read(s,SSL_F_GET_SERVER_VERIFY,i));
|
||||
s->init_num += i;
|
||||
|
||||
@ -900,8 +900,8 @@ static int get_server_finished(SSL *s)
|
||||
p=buf;
|
||||
if (s->state == SSL2_ST_GET_SERVER_FINISHED_A)
|
||||
{
|
||||
i=ssl2_read(s,(char *)&(buf[s->init_num]),3-s->init_num);
|
||||
if (i < (3-s->init_num))
|
||||
i=ssl2_read(s,(char *)&(buf[s->init_num]),1-s->init_num);
|
||||
if (i < (1-s->init_num))
|
||||
return(ssl2_part_read(s,SSL_F_GET_SERVER_FINISHED,i));
|
||||
s->init_num += i;
|
||||
|
||||
|
@ -780,10 +780,10 @@ static int get_client_finished(SSL *s)
|
||||
p=(unsigned char *)s->init_buf->data;
|
||||
if (s->state == SSL2_ST_GET_CLIENT_FINISHED_A)
|
||||
{
|
||||
i=ssl2_read(s,(char *)&(p[s->init_num]),3-s->init_num);
|
||||
if (i < 3-s->init_num)
|
||||
i=ssl2_read(s,(char *)&(p[s->init_num]),1-s->init_num);
|
||||
if (i < 1-s->init_num)
|
||||
return(ssl2_part_read(s,SSL_F_GET_CLIENT_FINISHED,i));
|
||||
s->init_num = 3;
|
||||
s->init_num += i;
|
||||
|
||||
if (*p != SSL2_MT_CLIENT_FINISHED)
|
||||
{
|
||||
|
Loading…
x
Reference in New Issue
Block a user