[SCM] GNU gnutls branch, master, updated. gnutls_2_9_10-342-g93b9289

[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=93b9289429954195472d9a885492d67d08d0cccd

The branch, master has been updated
       via  93b9289429954195472d9a885492d67d08d0cccd (commit)
      from  aad3ec0ed2c56c86e6febada3734e2e8a66e23ac (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 93b9289429954195472d9a885492d67d08d0cccd
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Wed Aug 18 19:35:58 2010 +0200

    libnettle is the default crypto library.

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

Summary of changes:
 NEWS            |   10 +++++++++-
 lib/m4/hooks.m4 |   49 +++++++++++++++++++++++++------------------------
 2 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/NEWS b/NEWS
index 1adfa61..415664b 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,9 @@ See the end for copying conditions.
 
 * Version 2.11.1 (unreleased)
 
+** libgnutls: Nettle is the default crypto back end. Use --with-libgcrypt
+to use the libgcrypt back end.
+
 ** libgnutls: Depend on nettle 2.1. This makes nettle a fully working
 backend crypto library.
 
@@ -37,7 +40,12 @@ alternative locking procedures. By default the system 
available
 locking is used. In *NIX pthreads are used and in windows the
 critical section API. This follows a different approach than the
 previous versions that depended on libgcrypt initialization. The
-locks are now set by default in systems that support it.
+locks are now set by default in systems that support it. Programs
+that used gcry_control() to set thread locks should insert it into
+a block of
+#if GNUTLS_VERSION_NUMBER <= 0x020b00
+       gcry_control(...)
+#endif
 
 ** libgnutls: Added support for reading DN from EV-certificates.
 New DN values:
diff --git a/lib/m4/hooks.m4 b/lib/m4/hooks.m4
index 86d7869..4d7be06 100644
--- a/lib/m4/hooks.m4
+++ b/lib/m4/hooks.m4
@@ -39,40 +39,41 @@ AC_DEFUN([LIBGNUTLS_HOOKS],
   AC_SUBST(DLL_VERSION)
 
   cryptolib="nettle"
-  AC_ARG_WITH(nettle,
-    AS_HELP_STRING([--with-nettle], [use libnettle 2.x as crypto library]),
-      nettle=$withval,
-      nettle=no)
-    if test "$nettle" = "yes"; then
-    AC_LIB_HAVE_LINKFLAGS([nettle],, [#include <nettle/aes.h>],
-                          [nettle_aes_invert_key (0, 0)])
-    if test "$ac_cv_libnettle" != yes; then
-      nettle=yes
-      AC_MSG_WARN([[
-  *** 
-  *** Libnettle was not found. 
-  ]])
-    fi
-  fi
 
-  AC_MSG_CHECKING([whether to use nettle])
-  AC_MSG_RESULT($nettle)
-  AM_CONDITIONAL(ENABLE_NETTLE, test "$nettle" = "yes")
-
-  if test "$nettle" != "yes";then
+  AC_ARG_WITH(libgcrypt,
+    AS_HELP_STRING([--with-libgcrypt], [use libgcrypt as crypto library]),
+      libgcrypt=$withval,
+      libgcrypt=no)
+    if test "$libgcrypt" = "yes"; then
        cryptolib=libgcrypt
         AC_DEFINE([HAVE_GCRYPT], 1, [whether the gcrypt library is in use])
        AC_LIB_HAVE_LINKFLAGS([gcrypt], [gpg-error], [#include <gcrypt.h>],
     [enum gcry_cipher_algos i = GCRY_CIPHER_CAMELLIA128])
-  if test "$ac_cv_libgcrypt" != yes; then
-    AC_MSG_ERROR([[
+      if test "$ac_cv_libgcrypt" != yes; then
+        AC_MSG_ERROR([[
 ***  
 *** libgcrypt was not found. You may want to get it from
 *** ftp://ftp.gnupg.org/gcrypt/libgcrypt/
 ***
     ]])
-  fi
-  fi
+      fi
+    fi
+
+  AC_MSG_CHECKING([whether to use nettle])
+if test "$cryptolib" = "nettle";then
+  AC_MSG_RESULT(yes)
+    AC_LIB_HAVE_LINKFLAGS([nettle],, [#include <nettle/aes.h>],
+                          [nettle_aes_invert_key (0, 0)])
+    if test "$ac_cv_libnettle" != yes; then
+      AC_MSG_ERROR([[
+  *** 
+  *** Libnettle 2.1 was not found. 
+  ]])
+    fi
+else
+  AC_MSG_RESULT(no)
+fi
+  AM_CONDITIONAL(ENABLE_NETTLE, test "$cryptolib" = "nettle")
 
   AC_ARG_WITH(included-libtasn1,
     AS_HELP_STRING([--with-included-libtasn1], [use the included libtasn1]),


hooks/post-receive
-- 
GNU gnutls