commit 8639578f583b9ecce07ee11d5f95343b131f2eb2
author Paul Bakker <p.j.bakker@polarssl.org> Wed May 30 07:39:36 2012 +0000
committer Paul Bakker <p.j.bakker@polarssl.org> Wed May 30 07:39:36 2012 +0000
tree 84232c8e183e6ecf8a14ed6866c420d8b19e2bec
parent ce30bdf6249176df33952c144379f4bc31d42498

 - Correctly handle empty packets (Found by James Yonan)

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 35261b1..ea4cf46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
 = Version 1.1.4 released on 2012-05-30
 Bugfix
+   * Correctly handle empty packets (Found by James Yonan)
    * Fixed potential heap corruption in x509_name allocation
    * Fixed single RSA test that failed on Big Endian systems (Closes ticket #54)
 

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 8933355..12929e7 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -785,7 +785,7 @@
     /*
      * Always compute the MAC (RFC4346, CBCTIME).
      */
-    if( ssl->in_msglen <= ssl->maclen + padlen )
+    if( ssl->in_msglen < ssl->maclen + padlen )
     {
         SSL_DEBUG_MSG( 1, ( "msglen (%d) < maclen (%d) + padlen (%d)",
                     ssl->in_msglen, ssl->maclen, padlen ) );