[SCM] GNU gnutls branch, master, updated. gnutls_2_99_2-60-g43e993b

[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=43e993b44249589bf773ae6b0ae14db4275155a0

The branch, master has been updated
       via  43e993b44249589bf773ae6b0ae14db4275155a0 (commit)
       via  0c2820bd7f1c0536411f9288eadfbc22cfaa5f6d (commit)
       via  088ba12d2eb317227e6384157edcc1aa1e7c3e4b (commit)
      from  7af8e49ad43d5550c1cdf4fa5426c4e7034f08eb (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 43e993b44249589bf773ae6b0ae14db4275155a0
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Jun 4 21:56:19 2011 +0200

    reinstated MAC-ALL semantics.

commit 0c2820bd7f1c0536411f9288eadfbc22cfaa5f6d
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Jun 4 21:51:04 2011 +0200

    more files to ignore.

commit 088ba12d2eb317227e6384157edcc1aa1e7c3e4b
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Jun 4 21:44:55 2011 +0200

    store the ECC curve in the session resumption parameters.

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

Summary of changes:
 .gitignore                |    6 +++++-
 lib/gnutls_priority.c     |    2 +-
 lib/gnutls_session_pack.c |    7 ++++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 68a55b9..a2562cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -444,8 +444,12 @@ gl/tests/test-strverscmp
 gl/tests/test-u64
 gl/tests/test-vasprintf
 gl/tests/test-vsnprintf
-lib/accelerated/libaccelerated.la
+gl/tests/test-intprops 
+gl/tests/test-inttypes 
+gl/tests/test-sys_uio
+gl/tests/inttypes.h 
 gl/time.h
+lib/accelerated/libaccelerated.la
 lib/accelerated/intel/libintel.la
 doc/cyclo/cyclo-gnutls.html
 lib/ext/libgnutls_ext.la
diff --git a/lib/gnutls_priority.c b/lib/gnutls_priority.c
index fb04232..9500ea0 100644
--- a/lib/gnutls_priority.c
+++ b/lib/gnutls_priority.c
@@ -848,7 +848,7 @@ gnutls_priority_init (gnutls_priority_t * priority_cache,
           else if (strncasecmp (&broken_list[i][1], "MAC-ALL", 7) == 0)
             {
                   bulk_fn (&(*priority_cache)->mac,
-                                mac_priority_secure128);
+                                mac_priority_normal);
             }
           else if (strncasecmp (&broken_list[i][1], "CIPHER-ALL", 10) == 0)
             {
diff --git a/lib/gnutls_session_pack.c b/lib/gnutls_session_pack.c
index c39cfbd..55ce8db 100644
--- a/lib/gnutls_session_pack.c
+++ b/lib/gnutls_session_pack.c
@@ -732,8 +732,9 @@ error:
  *      x bytes the session ID (32 bytes max)
  *
  *      4 bytes a timestamp
+ *      4 bytes the ECC curve
  *            -------------------
- *                MAX: 165 bytes
+ *                MAX: 169 bytes
  *
  */
 static int
@@ -792,6 +793,7 @@ pack_security_parameters (gnutls_session_t session, 
gnutls_buffer_st * ps)
   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);
+  BUFFER_APPEND_NUM (ps, session->security_parameters.ecc_curve);
 
   _gnutls_write_uint32 (ps->length - cur_size, ps->data + size_offset);
 
@@ -852,6 +854,9 @@ unpack_security_parameters (gnutls_session_t session, 
gnutls_buffer_st * ps)
   BUFFER_POP_NUM (ps,
                   session->internals.resumed_security_parameters.timestamp);
 
+  BUFFER_POP_NUM (ps,
+                  session->internals.resumed_security_parameters.ecc_curve);
+
   if (timestamp - session->internals.resumed_security_parameters.timestamp >
       session->internals.expire_time
       || session->internals.resumed_security_parameters.timestamp > timestamp)


hooks/post-receive
-- 
GNU gnutls