[SCM] GNU gnutls branch, gnutls_3_0_x-2, updated. gnutls_3_0_20-30-gb9762f9

[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=b9762f94d922d3afe37682ff9bd74906c7d1e106

The branch, gnutls_3_0_x-2 has been updated
       via  b9762f94d922d3afe37682ff9bd74906c7d1e106 (commit)
       via  c212f00d27f30090711337fb7f65ac0bca0eca4e (commit)
       via  9228d621443a320d575a3aea7187babf343fdf87 (commit)
      from  17857206577647e51c8619b80720335f9dc34996 (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 b9762f94d922d3afe37682ff9bd74906c7d1e106
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Jun 30 01:47:26 2012 +0200

    fix

commit c212f00d27f30090711337fb7f65ac0bca0eca4e
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Jun 30 01:46:19 2012 +0200

    no need to check for DTLS

commit 9228d621443a320d575a3aea7187babf343fdf87
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 |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/lib/gnutls_dtls.c b/lib/gnutls_dtls.c
index 02b37a9..ae6faf9 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;
 
@@ -692,7 +689,7 @@ int overhead;
 int gnutls_dtls_set_data_mtu (gnutls_session_t session, unsigned int mtu)
 {
   unsigned int blocksize;
-  int overhead = _gnutls_record_overhead_rt(session, &blocksize);
+  int overhead = record_overhead_rt(session, &blocksize);
 
   /* You can't call this until the session is actually running */
   if (overhead < 0)


hooks/post-receive
-- 
GNU gnutls