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

call ssl2_part_read again to parse error message

diff --git a/CHANGES b/CHANGES
index 437c07ec6ad6eee18006ee3496ca99bccab1076a..0eec6b321752e39015f88fff84402ea8541f6496 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -115,7 +115,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

diff --git a/ssl/s2_clnt.c b/ssl/s2_clnt.c
index 3a990e42cc68eb3972e53e8a6497abd47f0e0603..868a975dc94a0cf3adf39e0b33c748bdb52af356 100644 (file)
--- a/ssl/s2_clnt.c
+++ b/ssl/s2_clnt.c
@@ -873,8 +873,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;
 
@@ -888,8 +888,12 @@ static int get_server_verify(SSL *s)
                                        SSL_R_READ_WRONG_PACKET_TYPE);
                                }
                        else
-                               SSLerr(SSL_F_GET_SERVER_VERIFY,
-                                       SSL_R_PEER_ERROR);
+                               {
+                               SSLerr(SSL_F_GET_SERVER_VERIFY,SSL_R_PEER_ERROR);
+                               /* try to read the error message */
+                               i=ssl2_read(s,(char *)&(p[s->init_num]),3-s->init_num);
+                               return ssl2_part_read(s,SSL_F_GET_SERVER_VERIFY,i);
+                               }
                        return(-1);
                        }
                }
@@ -923,8 +927,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;
 
@@ -941,7 +945,12 @@ static int get_server_finished(SSL *s)
                                SSLerr(SSL_F_GET_SERVER_FINISHED,SSL_R_READ_WRONG_PACKET_TYPE);
                                }
                        else
+                               {
                                SSLerr(SSL_F_GET_SERVER_FINISHED,SSL_R_PEER_ERROR);
+                               /* try to read the error message */
+                               i=ssl2_read(s,(char *)&(p[s->init_num]),3-s->init_num);
+                               return ssl2_part_read(s,SSL_F_GET_SERVER_VERIFY,i);
+                               }
                        return(-1);
                        }
                s->state=SSL2_ST_GET_SERVER_FINISHED_B;

diff --git a/ssl/s2_srvr.c b/ssl/s2_srvr.c
index ea07852d1aa50e81c64e8e6e845654aa701f58bb..58ee38963a014e15091612e9e507db7d2e3e1b19 100644 (file)
--- a/ssl/s2_srvr.c
+++ b/ssl/s2_srvr.c
@@ -801,10 +801,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)
                        {
@@ -814,7 +814,12 @@ static int get_client_finished(SSL *s)
                                SSLerr(SSL_F_GET_CLIENT_FINISHED,SSL_R_READ_WRONG_PACKET_TYPE);
                                }
                        else
+                               {
                                SSLerr(SSL_F_GET_CLIENT_FINISHED,SSL_R_PEER_ERROR);
+                               /* try to read the error message */
+                               i=ssl2_read(s,(char *)&(p[s->init_num]),3-s->init_num);
+                               return ssl2_part_read(s,SSL_F_GET_SERVER_VERIFY,i);
+                               }
                        return(-1);
                        }
                s->state=SSL2_ST_GET_CLIENT_FINISHED_B;