[SCM] GNU gnutls branch, master, updated. gnutls_3_0_18-180-g4bd66ed

[Nikos Mavrogiannopoulos]

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=4bd66ed1e0cd58cb365d9ccf063e6d052877a410

The branch, master has been updated
       via  4bd66ed1e0cd58cb365d9ccf063e6d052877a410 (commit)
       via  cc380ed0eab31d572a643b155079dcdffd16cd0f (commit)
      from  cf64fa749890eefae3201b403de6b4c1e565ba7f (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 4bd66ed1e0cd58cb365d9ccf063e6d052877a410
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Jun 30 01:46:19 2012 +0200

    no need to check for DTLS

commit cc380ed0eab31d572a643b155079dcdffd16cd0f
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Jun 30 01:44:39 2012 +0200

    no need for _gnutls prefix.

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

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

diff --git a/lib/gnutls_dtls.c b/lib/gnutls_dtls.c
index 02b37a9..7a78f8f 100644
--- a/lib/gnutls_dtls.c
+++ b/lib/gnutls_dtls.c
@@ -594,7 +594,7 @@ void gnutls_dtls_set_mtu (gnutls_session_t session, 
unsigned int mtu)
  *
  * It may return a negative error code on error.
  */
-static int _gnutls_record_overhead_rt(gnutls_session_t session, unsigned int 
*blocksize)
+static int record_overhead_rt(gnutls_session_t session, unsigned int 
*blocksize)
 {
 record_parameters_st *params;
 int total = 0, ret, iv_size;
@@ -613,10 +613,7 @@ int total = 0, ret, iv_size;
     {
       *blocksize = iv_size;
 
-      if (!IS_DTLS(session))
-        total += MAX_PAD_SIZE;
-      else
-        total += iv_size; /* iv_size == block_size */
+      total += iv_size; /* iv_size == block_size in DTLS */
 
       /* We always pad with at least one byte; never 0. */
       total++;
@@ -662,7 +659,7 @@ int overhead;
  
   mtu -= RECORD_HEADER_SIZE(session);
 
-  overhead = _gnutls_record_overhead_rt(session, &blocksize);
+  overhead = record_overhead_rt(session, &blocksize);
   if (overhead < 0)
     return mtu;
 


hooks/post-receive
-- 
GNU gnutls