From: Bodo Möller <bodo@openssl.org>
Date: Mon, 14 Jan 2002 12:42:38 +0000 (+0000)
Subject: Return -1 from ssl3_get_server_done (ssl3/s3_clnt.c) if
X-Git-Tag: OpenSSL_0_9_6d-beta1~77
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5f18fe493ef27da560abdd71f9bc2210d1f64488;p=oweals%2Fopenssl.git

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 2a2614cfc3..3478df77f2 100644
--- 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 4d6da271a8..6d83c57125 100644
--- 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);