[SCM] GNU gnutls branch, master, updated. gnutls_3_0_18-178-gcf64fa7

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=cf64fa749890eefae3201b403de6b4c1e565ba7f

The branch, master has been updated
       via  cf64fa749890eefae3201b403de6b4c1e565ba7f (commit)
      from  6259978aef726402104ab0950b8f460bf3d27331 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit cf64fa749890eefae3201b403de6b4c1e565ba7f
Author: Nikos Mavrogiannopoulos <[email protected]>
Date:   Sat Jun 30 01:42:14 2012 +0200

    only block ciphers need 1 byte padding.

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

Summary of changes:
 lib/gnutls_dtls.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/gnutls_dtls.c b/lib/gnutls_dtls.c
index bd3c637..02b37a9 100644
--- a/lib/gnutls_dtls.c
+++ b/lib/gnutls_dtls.c
@@ -617,6 +617,9 @@ int total = 0, ret, iv_size;
         total += MAX_PAD_SIZE;
       else
         total += iv_size; /* iv_size == block_size */
+
+      /* We always pad with at least one byte; never 0. */
+      total++;
     }
   else
     {
@@ -635,9 +638,6 @@ int total = 0, ret, iv_size;
 
   if (params->compression_algorithm != GNUTLS_COMP_NULL)
     total += EXTRA_COMP_SIZE;
-  
-  /* We always pad with at least one byte; never 0. */
-  total++;
 
   return total;
 }


hooks/post-receive
-- 
GNU gnutls