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

make code a little more similar to what it looked like before the fixes

Browse Source
This commit is contained in:
Bodo Möller 2001-11-10 10:43:51 +00:00
parent 44cc9715ec
commit a10b85d9e6
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -26,7 +26,7 @@
*) Change ssl/s2_clnt.c and ssl/s3_srvr.c so that received handshake *) 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 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] [Bodo Moeller]
*) In ssl3_get_client_hello (ssl/s3_srvr.c), generate a fatal alert *) In ssl3_get_client_hello (ssl/s3_srvr.c), generate a fatal alert

8
ssl/s2_clnt.c
View File

@ -852,8 +852,8 @@ static int get_server_verify(SSL *s)
p=(unsigned char *)s->init_buf->data; p=(unsigned char *)s->init_buf->data;
if (s->state == SSL2_ST_GET_SERVER_VERIFY_A) if (s->state == SSL2_ST_GET_SERVER_VERIFY_A)
{ {
i=ssl2_read(s,(char *)&(p[s->init_num]),3-s->init_num); i=ssl2_read(s,(char *)&(p[s->init_num]),1-s->init_num);
if (i < (3-s->init_num)) if (i < (1-s->init_num))
return(ssl2_part_read(s,SSL_F_GET_SERVER_VERIFY,i)); return(ssl2_part_read(s,SSL_F_GET_SERVER_VERIFY,i));
s->init_num += i; s->init_num += i;
@ -900,8 +900,8 @@ static int get_server_finished(SSL *s)
p=buf; p=buf;
if (s->state == SSL2_ST_GET_SERVER_FINISHED_A) if (s->state == SSL2_ST_GET_SERVER_FINISHED_A)
{ {
i=ssl2_read(s,(char *)&(buf[s->init_num]),3-s->init_num); i=ssl2_read(s,(char *)&(buf[s->init_num]),1-s->init_num);
if (i < (3-s->init_num)) if (i < (1-s->init_num))
return(ssl2_part_read(s,SSL_F_GET_SERVER_FINISHED,i)); return(ssl2_part_read(s,SSL_F_GET_SERVER_FINISHED,i));
s->init_num += i; s->init_num += i;

6
ssl/s2_srvr.c
View File

@ -780,10 +780,10 @@ static int get_client_finished(SSL *s)
p=(unsigned char *)s->init_buf->data; p=(unsigned char *)s->init_buf->data;
if (s->state == SSL2_ST_GET_CLIENT_FINISHED_A) if (s->state == SSL2_ST_GET_CLIENT_FINISHED_A)
{ {
i=ssl2_read(s,(char *)&(p[s->init_num]),3-s->init_num); i=ssl2_read(s,(char *)&(p[s->init_num]),1-s->init_num);
if (i < 3-s->init_num) if (i < 1-s->init_num)
return(ssl2_part_read(s,SSL_F_GET_CLIENT_FINISHED,i)); 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) if (*p != SSL2_MT_CLIENT_FINISHED)
{ {