[SCM] GNU gnutls branch, master, updated. gnutls_2_99_2-108-g06eaa93

[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=06eaa93dc23fdb92113420cd4dd473636d12f21e

The branch, master has been updated
       via  06eaa93dc23fdb92113420cd4dd473636d12f21e (commit)
       via  fd9c371c1d94b784b0801b4b9d8fe69e2334e6a3 (commit)
      from  73ea673d5d1851dfcd3d4c159822a96e1e7ad5c9 (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 06eaa93dc23fdb92113420cd4dd473636d12f21e
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Jun 18 21:17:12 2011 +0200

    added missing file.

commit fd9c371c1d94b784b0801b4b9d8fe69e2334e6a3
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Jun 18 21:11:16 2011 +0200

    bumped version.

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

Summary of changes:
 AUTHORS                         |    2 +-
 NEWS                            |    6 +++++-
 doc/Makefile.am                 |    2 +-
 lib/includes/gnutls/gnutls.h.in |    1 +
 m4/hooks.m4                     |    2 +-
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index cdc0d20..41d7634 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -34,7 +34,7 @@ Ivo Timmermans <address@hidden>
 Man pages, OpenCDK, fixes.
 
 Stefan Walter <address@hidden>
-PKCS8 fix.
+PKCS8 fix, PKCS #11 backend move to p11-kit.
 
 Yoshisato YANAGISAWA <address@hidden>
 Camellia support.
diff --git a/NEWS b/NEWS
index 6963351..c37c36a 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.99.3 (unreleased)
+* Version 2.99.3 (released 2011-06-18)
 
 ** libgnutls: Added new PKCS #11 flags to force an object being private or
 not. (GNUTLS_PKCS11_OBJ_FLAG_MARK_PRIVATE and 
GNUTLS_PKCS11_OBJ_FLAG_MARK_NOT_PRIVATE)
@@ -28,6 +28,10 @@ gnutls_x509_trust_list_verify_named_crt() that allow having a
 list of certificates in the trusted list that will be associated
 with a name (e.g. server name) and will not be used as CAs.
 
+** libgnutls: PKCS #11 back-end rewritten to use p11-kit
+http://p11-glue.freedesktop.org/p11-kit.html. Rewrite by
+Stef Walter.
+
 ** libgnutls: Added ECDHE-PSK ciphersuites for TLS (RFC 5489).
 
 ** API and ABI modifications:
diff --git a/doc/Makefile.am b/doc/Makefile.am
index fe0a29e..183986a 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -57,7 +57,7 @@ gnutls_TEXINFOS += gnutls-crypto-layers.dia 
gnutls-crypto-layers.eps  \
 gnutls_TEXINFOS += gnutls-pgp.dia gnutls-pgp.eps gnutls-pgp.png
 gnutls_TEXINFOS += gnutls-x509.dia gnutls-x509.eps gnutls-x509.png
 gnutls_TEXINFOS += gnutls-logo.eps gnutls-logo.png
-gnutls_TEXINFOS += pkcs11-vision.dia pkcs11-vision.eps
+gnutls_TEXINFOS += pkcs11-vision.dia pkcs11-vision.eps pkcs11-vision.png
 
 # Images.  Make sure there are eps + png + pdf of each, plus the source dia.
 gnutls_TEXINFOS += gnutls-certificate-user-use-case.dia        \
diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index 9c4b690..af159f5 100644
--- a/lib/includes/gnutls/gnutls.h.in
+++ b/lib/includes/gnutls/gnutls.h.in
@@ -1806,6 +1806,7 @@ gnutls_ecc_curve_t gnutls_ecc_curve_get(gnutls_session_t 
session);
 #define GNUTLS_E_USER_ERROR -320
 #define GNUTLS_E_ECC_NO_SUPPORTED_CURVES -321
 #define GNUTLS_E_ECC_UNSUPPORTED_CURVE -322
+#define GNUTLS_E_PKCS11_REQUESTED_OBJECT_NOT_AVAILBLE -323
 
 #define GNUTLS_E_UNIMPLEMENTED_FEATURE -1250
 
diff --git a/m4/hooks.m4 b/m4/hooks.m4
index ac36a14..cfbab65 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, 2)
+  AC_SUBST(LT_REVISION, 3)
   AC_SUBST(LT_AGE, 0)
 
   AC_SUBST(LT_SSL_CURRENT, 27)


hooks/post-receive
-- 
GNU gnutls