bumped version.

diff --git a/AUTHORS b/AUTHORS
index cdc0d207989b272607916edee6fb349ccaa934db..41d7634889fe95e2087a89c4d7e27fb68bd641d2 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -34,7 +34,7 @@ Ivo Timmermans <ivo@o2w.nl>
 Man pages, OpenCDK, fixes.
 
 Stefan Walter <stef@memberwebs.com>
-PKCS8 fix.
+PKCS8 fix, PKCS #11 backend move to p11-kit.
 
 Yoshisato YANAGISAWA <yanagisawa@csg.is.titech.ac.jp>
 Camellia support.

diff --git a/NEWS b/NEWS
index 696335161ce73d502923292b38903cdc262c2083..c37c36a302e6b5d886e3473255da4c3c2627a0c6 100644 (file)
--- 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/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index 9c4b690d55bec1a06f9549f1824a575f4febb580..af159f5a642da14eaf7414a8ed49f21c2defa9a7 100644 (file)
--- 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 ac36a14cc7a1247a58602d4529afcd70e8fdae39..cfbab6529a5554ae22ce990ab529138d5e33fe93 100644 (file)
--- 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)