[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  6f136aa6fc834fd841aee6c5267288ed13aae19d (commit)
       via  6c3cca5793b1ac57daceb8111d842f954a5ecf6a (commit)
      from  e77bdc7310fc8fb9e22fd481a991b3576d128b9f (commit)


- Log -----------------------------------------------------------------
commit 6f136aa6fc834fd841aee6c5267288ed13aae19d
Author: Adam Eijdenberg <eijdenberg at google.com>
Date:   Tue Aug 4 15:15:38 2015 -0700

    Change error reason to match previous behaviour.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>

commit 6c3cca5793b1ac57daceb8111d842f954a5ecf6a
Author: Adam Eijdenberg <eijdenberg at google.com>
Date:   Tue Aug 4 14:59:47 2015 -0700

    Fix unhandled error condition in sslv2 client hello parsing.
    
    --strict-warnings started showing warnings for this today...
    
    Surely an error should be raised if these reads fail?
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 ssl/s3_srvr.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index b60c962..76f49bd 100644
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -1014,6 +1014,9 @@ int ssl3_get_client_hello(SSL *s)
         if (!PACKET_get_net_2(&pkt, &csl)
                 || !PACKET_get_net_2(&pkt, &sil)
                 || !PACKET_get_net_2(&pkt, &cl)) {
+            SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_RECORD_LENGTH_MISMATCH);
+            al = SSL_AD_DECODE_ERROR;
+            goto f_err;
         }
 
         if (csl == 0) {