[SCM] GNU gnutls branch, master, updated. gnutls_2_99_1-108-ga3c2338

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

The branch, master has been updated
       via  a3c23384acf3faeb02146c1a1cee0290ef64a7f3 (commit)
       via  43d7458fa2571037ff974d29c54f55f977d5d37a (commit)
       via  7eef1c79e399f4d14ac9741681d5f7afc2ed7193 (commit)
       via  592b925b4aa5d5e0b79c58abd5d509db8a9db246 (commit)
      from  19288b5d88ae012bf0db145a28f2eaccea72a6cf (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 a3c23384acf3faeb02146c1a1cee0290ef64a7f3
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu May 26 18:55:06 2011 +0200

    Added new headers.

commit 43d7458fa2571037ff974d29c54f55f977d5d37a
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu May 26 18:52:54 2011 +0200

    document elliptic curves addition.

commit 7eef1c79e399f4d14ac9741681d5f7afc2ed7193
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu May 26 18:50:08 2011 +0200

    libgcrypt support was removed.

commit 592b925b4aa5d5e0b79c58abd5d509db8a9db246
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu May 26 18:45:07 2011 +0200

    listed newly added functions.

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

Summary of changes:
 NEWS                   |   32 +++++++++++++++++++++++++++++++-
 lib/Makefile.am        |    4 ++--
 lib/auth/Makefile.am   |    2 +-
 lib/ext/Makefile.am    |    2 +-
 lib/nettle/Makefile.am |    2 +-
 m4/hooks.m4            |   38 +++++++++++++++++++-------------------
 6 files changed, 55 insertions(+), 25 deletions(-)

diff --git a/NEWS b/NEWS
index 32e5a38..b3edf68 100644
--- a/NEWS
+++ b/NEWS
@@ -3,7 +3,14 @@ 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.99.2 (unreleased)
+* Version 2.99.2 (released 2011-05-26)
+
+** libgnutls: Added Elliptic curve support. This is not
+enabled by default. Requires priority strings:
++CURVE-ALL: to add all supported curves
++ECDHE-RSA: to add ephemeral ECDHE with an RSA-signed certificate
++ECDHE-ECDSA: to add ephemeral ECDHE with an ECDSA-signed certificate
++ANON-ECDHE: to add anonymous ECDH
 
 ** libgnutls: PKCS #11 URLs conform to the latest draft
 being http://tools.ietf.org/html/draft-pechanec-pkcs11uri-04.
@@ -35,6 +42,29 @@ gnutls_certificate_get_issuer: ADDED
 gnutls_x509_trust_list_get_issuer: ADDED
 gnutls_x509_crq_verify: ADDED
 gnutls_global_set_audit_log_function: ADDED
+gnutls_ecc_curve_get_name: ADDED
+gnutls_ecc_curve_get_size: ADDED
+gnutls_x509_privkey_import_ecc_raw: ADDED
+gnutls_x509_privkey_export_ecc_raw: ADDED
+gnutls_global_set_time_function: ADDED
+
+GNUTLS_E_ECC_NO_SUPPORTED_CURVES: New error code
+GNUTLS_E_ECC_UNSUPPORTED_CURVE: New error code
+GNUTLS_KX_ECDHE_RSA: New key exchange method
+GNUTLS_KX_ECDHE_ECDSA: New key exchange method
+GNUTLS_KX_ANON_ECDH: New key exchange method
+GNUTLS_PK_ECC: New public key algorithm
+GNUTLS_SIGN_ECDSA_SHA1: New signature algorithm
+GNUTLS_SIGN_ECDSA_SHA256: New signature algorithm
+GNUTLS_SIGN_ECDSA_SHA384: New signature algorithm
+GNUTLS_SIGN_ECDSA_SHA512: New signature algorithm 
+GNUTLS_SIGN_ECDSA_SHA224: New signature algorithm
+GNUTLS_ECC_CURVE_INVALID: New curve definition
+GNUTLS_ECC_CURVE_SECP224R1: New curve definition
+GNUTLS_ECC_CURVE_SECP256R1: New curve definition
+GNUTLS_ECC_CURVE_SECP384R1: New curve definition
+GNUTLS_ECC_CURVE_SECP521R1: New curve definition
+
 
 * Version 2.99.1 (released 2011-04-23)
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 01a87ee..7e9eaa9 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -85,7 +85,7 @@ endif
 
 HFILES = abstract_int.h debug.h gnutls_compress.h gnutls_cipher.h      \
        gnutls_buffers.h gnutls_errors.h gnutls_int.h gnutls_dtls.h     \
-       gnutls_handshake.h gnutls_num.h gnutls_algorithms.h             \
+       gnutls_handshake.h gnutls_num.h algorithms.h            \
        gnutls_dh.h gnutls_kx.h gnutls_hash_int.h gnutls_cipher_int.h   \
        gnutls_db.h gnutls_auth.h gnutls_extensions.h   \
        x509_b64.h gnutls_v2_compat.h gnutls_datum.h \
@@ -96,7 +96,7 @@ HFILES = abstract_int.h debug.h gnutls_compress.h 
gnutls_cipher.h     \
        gnutls_rsa_export.h gnutls_srp.h auth/srp.h auth/srp_passwd.h   \
        gnutls_helper.h gnutls_supplemental.h crypto.h random.h system.h\
        locks.h gnutls_mbuffers.h pkcs11_int.h \
-       hash.h
+       hash.h gnutls_ecc.h
 
 COBJECTS+=pakchois/pakchois.c pakchois/errors.c pakchois/dlopen.c
 HFILES+=pakchois/pakchois.h pakchois/pakchois11.h pakchois/dlopen.h
diff --git a/lib/auth/Makefile.am b/lib/auth/Makefile.am
index 92519de..c4cad8b 100644
--- a/lib/auth/Makefile.am
+++ b/lib/auth/Makefile.am
@@ -39,4 +39,4 @@ libgnutls_auth_la_SOURCES = anon.c cert.c dh_common.c dhe.c \
        dhe_psk.c psk.c psk_passwd.c rsa.c rsa_export.c srp.c \
        srp_passwd.c srp_rsa.c srp_sb64.c anon.h cert.h dh_common.h \
        psk.h psk_passwd.h srp.h srp_passwd.h anon_ecdh.c \
-       ecdh_common.c
+       ecdh_common.c ecdh_common.h
diff --git a/lib/ext/Makefile.am b/lib/ext/Makefile.am
index 90dcb07..977ebf6 100644
--- a/lib/ext/Makefile.am
+++ b/lib/ext/Makefile.am
@@ -39,4 +39,4 @@ libgnutls_ext_la_SOURCES = max_record.c cert_type.c \
        server_name.c signature.c safe_renegotiation.c \
        max_record.h cert_type.h server_name.h srp.h \
        session_ticket.h signature.h safe_renegotiation.h \
-       session_ticket.c srp.c ecc.c
+       session_ticket.c srp.c ecc.c ecc.h
diff --git a/lib/nettle/Makefile.am b/lib/nettle/Makefile.am
index 233ab30..500117b 100644
--- a/lib/nettle/Makefile.am
+++ b/lib/nettle/Makefile.am
@@ -39,4 +39,4 @@ libcrypto_la_SOURCES = pk.c mpi.c mac.c cipher.c rnd.c init.c 
egd.c egd.h \
        ecc_test.c ecc_map.c \
        ecc_mulmod.c ecc_points.c ecc_projective_dbl_point_3.c \
        ecc_projective_add_point.c ecc_projective_dbl_point.c \
-       ecc_sign_hash.c ecc_verify_hash.c 
+       ecc_sign_hash.c ecc_verify_hash.c gnettle.h
diff --git a/m4/hooks.m4 b/m4/hooks.m4
index 5af3831..e117eec 100644
--- a/m4/hooks.m4
+++ b/m4/hooks.m4
@@ -41,7 +41,7 @@ AC_DEFUN([LIBGNUTLS_HOOKS],
   # Interfaces added:                             AGE++
   # Interfaces removed:                           AGE=0
   AC_SUBST(LT_CURRENT, 27)
-  AC_SUBST(LT_REVISION, 0)
+  AC_SUBST(LT_REVISION, 1)
   AC_SUBST(LT_AGE, 0)
 
   AC_SUBST(LT_SSL_CURRENT, 27)
@@ -58,24 +58,24 @@ AC_DEFUN([LIBGNUTLS_HOOKS],
 
   cryptolib="nettle"
 
-  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([[
-***  
-*** Libgcrypt v1.4.0 or later was not found. You may want to get it from
-*** ftp://ftp.gnupg.org/gcrypt/libgcrypt/
-***
-    ]])
-      fi
-    fi
+dnl  AC_ARG_WITH(libgcrypt,
+dnl    AS_HELP_STRING([--with-libgcrypt], [use libgcrypt as crypto library]),
+dnl      libgcrypt=$withval,
+dnl      libgcrypt=no)
+dnl    if test "$libgcrypt" = "yes"; then
+dnl        cryptolib=libgcrypt
+dnl        AC_DEFINE([HAVE_GCRYPT], 1, [whether the gcrypt library is in use])
+dnl    AC_LIB_HAVE_LINKFLAGS([gcrypt], [gpg-error], [#include <gcrypt.h>],
+dnl                      [enum gcry_cipher_algos i = GCRY_CIPHER_CAMELLIA128])
+dnl      if test "$ac_cv_libgcrypt" != yes; then
+dnl        AC_MSG_ERROR([[
+dnl***  
+dnl*** Libgcrypt v1.4.0 or later was not found. You may want to get it from
+dnl*** ftp://ftp.gnupg.org/gcrypt/libgcrypt/
+dnl***
+dnl    ]])
+dnl      fi
+dnl    fi
 
   AC_MSG_CHECKING([whether to use nettle])
 if test "$cryptolib" = "nettle";then


hooks/post-receive
-- 
GNU gnutls