[SCM] GNU gnutls branch, master, updated. gnutls_2_9_10-400-g59425cb

[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=59425cbec511cdc314f2a22ee95b299f8fa06fc8

The branch, master has been updated
       via  59425cbec511cdc314f2a22ee95b299f8fa06fc8 (commit)
       via  c5a9cde842502afcb3d9d0115b1b42edfe07afd9 (commit)
       via  ef66da674e51fc30c71b11b0237c943b106744d0 (commit)
       via  a6b2f5ce7316b4774649ee9b421da2ee7fef461f (commit)
      from  e468763b03ec470c1aec999efbc5b74821e4457f (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 59425cbec511cdc314f2a22ee95b299f8fa06fc8
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Fri Oct 8 08:30:45 2010 +0200

    bumped version

commit c5a9cde842502afcb3d9d0115b1b42edfe07afd9
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Fri Oct 8 08:30:00 2010 +0200

    Revert "Applied last patch of Micah Anderson on IKE status."
    
    This reverts commit a6b2f5ce7316b4774649ee9b421da2ee7fef461f.

commit ef66da674e51fc30c71b11b0237c943b106744d0
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Fri Oct 8 08:24:42 2010 +0200

    removed unneeded code.

commit a6b2f5ce7316b4774649ee9b421da2ee7fef461f
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Fri Oct 8 08:23:01 2010 +0200

    Applied last patch of Micah Anderson on IKE status.

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

Summary of changes:
 NEWS               |    2 +-
 configure.ac       |    2 +-
 lib/m4/hooks.m4    |    6 +++---
 libextra/fipsmd5.c |   35 -----------------------------------
 4 files changed, 5 insertions(+), 40 deletions(-)

diff --git a/NEWS b/NEWS
index af4a431..88f9b38 100644
--- a/NEWS
+++ b/NEWS
@@ -3,7 +3,7 @@ Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
               2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 See the end for copying conditions.
 
-* Version 2.11.2 (unreleased)
+* Version 2.11.2 (released 2010-10-08)
 
 ** libgnutls: Several bug fixes on session resumption
 and session tickets support.
diff --git a/configure.ac b/configure.ac
index 086ab8f..0c6e9c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ dnl Process this file with autoconf to produce a configure 
script.
 # USA
 
 AC_PREREQ(2.61)
-AC_INIT([GnuTLS], [2.11.1], address@hidden)
+AC_INIT([GnuTLS], [2.11.2], address@hidden)
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/lib/m4/hooks.m4 b/lib/m4/hooks.m4
index f1a7ea0..918575f 100644
--- a/lib/m4/hooks.m4
+++ b/lib/m4/hooks.m4
@@ -26,9 +26,9 @@ AC_DEFUN([LIBGNUTLS_HOOKS],
   # Interfaces changed/added/removed:   CURRENT++       REVISION=0
   # Interfaces added:                             AGE++
   # Interfaces removed:                           AGE=0
-  AC_SUBST(LT_CURRENT, 43)
-  AC_SUBST(LT_REVISION, 1)
-  AC_SUBST(LT_AGE, 17)
+  AC_SUBST(LT_CURRENT, 44)
+  AC_SUBST(LT_REVISION, 0)
+  AC_SUBST(LT_AGE, 18)
 
   AC_SUBST(CXX_LT_CURRENT, 27)
   AC_SUBST(CXX_LT_REVISION, 0)
diff --git a/libextra/fipsmd5.c b/libextra/fipsmd5.c
index b5482e7..801289a 100644
--- a/libextra/fipsmd5.c
+++ b/libextra/fipsmd5.c
@@ -133,40 +133,6 @@ hmacmd5hash (void *ctx, const void *text, size_t textsize)
 }
 
 static int
-hmacmd5copy (void **dst_ctx, void *src_ctx)
-{
-  struct hmacctx *p = src_ctx;
-  struct hmacctx *q;
-
-  q = gnutls_malloc (sizeof (struct hmacctx));
-  if (!q)
-    return -1;
-
-  q->data = gnutls_malloc (p->datasize);
-  if (!q->data)
-    {
-      gnutls_free (q);
-      return -1;
-    }
-  memcpy (q->data, p->data, p->datasize);
-  q->datasize = p->datasize;
-
-  q->key = gnutls_malloc (p->keysize);
-  if (!q->key)
-    {
-      gnutls_free (q);
-      gnutls_free (q->data);
-      return -1;
-    }
-  memcpy (q->key, p->key, p->keysize);
-  q->keysize = p->keysize;
-
-  *dst_ctx = q;
-
-  return 0;
-}
-
-static int
 hmacmd5output (void *ctx, void *digest, size_t digestsize)
 {
   struct hmacctx *p = ctx;
@@ -207,7 +173,6 @@ static gnutls_crypto_mac_st mac = {
   .init = hmacmd5init,
   .setkey = hmacmd5setkey,
   .hash = hmacmd5hash,
-  .copy = hmacmd5copy,
   .output = hmacmd5output,
   .deinit = hmacmd5deinit
 };


hooks/post-receive
-- 
GNU gnutls