Return -1 from ssl3_get_server_done (ssl3/s3_clnt.c) if

the SSL_R_LENGTH_MISMATCH error is detected.

diff --git a/CHANGES b/CHANGES
index 2a2614cfc34acc26cfe324eecdbba3cdbc499530..3478df77f29d17059c66db8beeb5495ff23396b2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,10 @@
 
  Changes between 0.9.6c and 0.9.6d  [XX xxx XXXX]
 
+  *) Bugfix: Return -1 from ssl3_get_server_done (ssl3/s3_clnt.c)
+     if the SSL_R_LENGTH_MISMATCH error is detected.
+     [Geoff Thorpe, Bodo Moeller]
+
   *) New 'shared_ldflag' column in Configure platform table.
      [Richard Levitte]
 

diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index 4d6da271a879530c21918ba1d79281cbcf8d3a79..6d83c57125d9e05e2d746c82b83ce1232b3837e4 100644 (file)
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -1314,6 +1314,7 @@ static int ssl3_get_server_done(SSL *s)
                /* should contain no data */
                ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_DECODE_ERROR);
                SSLerr(SSL_F_SSL3_GET_SERVER_DONE,SSL_R_LENGTH_MISMATCH);
+               return -1;
                }
        ret=1;
        return(ret);