[SCM] GNU gnutls branch, master, updated. gnutls_2_9_10-262-g8d5ef89

[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=8d5ef8910cd5e80346c5aab2399c57532c1175cd

The branch, master has been updated
       via  8d5ef8910cd5e80346c5aab2399c57532c1175cd (commit)
       via  9c3922fb51cef20db97d0b86eff5a05d63af43b0 (commit)
       via  94b502fc8984dd87a94999ed2cb9c1459bd58be9 (commit)
      from  fe1b3846c8c34a103da138e375f435f72fa042a6 (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 8d5ef8910cd5e80346c5aab2399c57532c1175cd
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Jun 27 21:21:37 2010 +0200

    Added AES-128 to block ciphers.

commit 9c3922fb51cef20db97d0b86eff5a05d63af43b0
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Jun 27 21:04:34 2010 +0200

    Corrected writing and reading order of security parameters.

commit 94b502fc8984dd87a94999ed2cb9c1459bd58be9
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Jun 27 19:52:07 2010 +0200

    use 2.11.0 everywhere

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

Summary of changes:
 lib/configure.ac          |    2 +-
 lib/gnutls_session_pack.c |    7 ++++---
 libextra/configure.ac     |    2 +-
 src/tests.c               |   12 +++++++-----
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/lib/configure.ac b/lib/configure.ac
index 97252b5..80dd99e 100644
--- a/lib/configure.ac
+++ b/lib/configure.ac
@@ -22,7 +22,7 @@ dnl Process this file with autoconf to produce a configure 
script.
 # MA 02110-1301, USA
 
 AC_PREREQ(2.61)
-AC_INIT([libgnutls], [2.9.11], address@hidden)
+AC_INIT([libgnutls], [2.11.0], address@hidden)
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/lib/gnutls_session_pack.c b/lib/gnutls_session_pack.c
index 6ad507f..70de27d 100644
--- a/lib/gnutls_session_pack.c
+++ b/lib/gnutls_session_pack.c
@@ -764,11 +764,12 @@ pack_security_parameters (gnutls_session_t session,
   BUFFER_APPEND(ps, session->security_parameters.master_secret, 
GNUTLS_MASTER_SIZE);
   BUFFER_APPEND(ps, session->security_parameters.client_random, 
GNUTLS_RANDOM_SIZE);
   BUFFER_APPEND(ps, session->security_parameters.server_random, 
GNUTLS_RANDOM_SIZE);
+
   BUFFER_APPEND_NUM(ps, session->security_parameters.session_id_size);
-  BUFFER_APPEND_NUM(ps, session->security_parameters.max_record_send_size);
-  BUFFER_APPEND_NUM(ps, session->security_parameters.max_record_recv_size);
   BUFFER_APPEND(ps, session->security_parameters.session_id, 
session->security_parameters.session_id_size);
 
+  BUFFER_APPEND_NUM(ps, session->security_parameters.max_record_send_size);
+  BUFFER_APPEND_NUM(ps, session->security_parameters.max_record_recv_size);
   BUFFER_APPEND_NUM(ps, session->security_parameters.timestamp);
 
   _gnutls_write_uint32(ps->length-cur_size, ps->data+size_offset);
@@ -818,9 +819,9 @@ unpack_security_parameters (gnutls_session_t session,
   BUFFER_POP(ps, &session->internals.resumed_security_parameters.session_id,
          session->internals.resumed_security_parameters.session_id_size);
 
-  BUFFER_POP_NUM(ps, session->internals.resumed_security_parameters.timestamp);
   BUFFER_POP_NUM(ps, 
session->internals.resumed_security_parameters.max_record_send_size);
   BUFFER_POP_NUM(ps, 
session->internals.resumed_security_parameters.max_record_recv_size);
+  BUFFER_POP_NUM(ps, session->internals.resumed_security_parameters.timestamp);
 
   if (timestamp - session->internals.resumed_security_parameters.timestamp >
       session->internals.expire_time
diff --git a/libextra/configure.ac b/libextra/configure.ac
index d071d01..e2a03c8 100644
--- a/libextra/configure.ac
+++ b/libextra/configure.ac
@@ -22,7 +22,7 @@ dnl Process this file with autoconf to produce a configure 
script.
 # 02110-1301, USA.
 
 AC_PREREQ(2.61)
-AC_INIT([libgnutls-extra], [2.9.11], address@hidden)
+AC_INIT([libgnutls-extra], [2.11.0], address@hidden)
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/src/tests.c b/src/tests.c
index ff814ec..578518a 100644
--- a/src/tests.c
+++ b/src/tests.c
@@ -109,7 +109,7 @@ char protocol_str[] = "+VERS-TLS1.0:+VERS-SSL3.0";
 char prio_str[256] = "";
 
 #define ALL_CIPHERS "+3DES-CBC:+ARCFOUR-128:+ARCFOUR-40"
-#define BLOCK_CIPHERS "+3DES-CBC"
+#define BLOCK_CIPHERS "+3DES-CBC:+AES-128-CBC"
 #define ALL_COMP "+COMP-NULL"
 #define ALL_MACS "+SHA1:+MD5"
 #define ALL_CERTTYPES "+CTYPE-X509"
@@ -647,15 +647,17 @@ test_record_padding (gnutls_session_t session)
   _gnutls_priority_set_direct (session, prio_str);
 
   gnutls_credentials_set (session, GNUTLS_CRD_CERTIFICATE, xcred);
-
   ret = do_handshake (session);
   if (ret == TEST_SUCCEED)
-    tls1_ok = 1;
+    {
+      tls1_ok = 1;
+    }
   else
-    strcat(rest, ":%COMPAT");
+    {
+      strcat(rest, ":%COMPAT");
+    }
 
   return ret;
-
 }
 
 test_code_t


hooks/post-receive
-- 
GNU gnutls