summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2011-06-18 21:11:16 +0200
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2011-06-18 21:13:18 +0200
commitfd9c371c1d94b784b0801b4b9d8fe69e2334e6a3 (patch)
tree0b728001a44c91c22e1f648ed617b38c0d5ad6d7
parent73ea673d5d1851dfcd3d4c159822a96e1e7ad5c9 (diff)
downloadgnutls-fd9c371c1d94b784b0801b4b9d8fe69e2334e6a3.tar.gz
bumped version.
-rw-r--r--AUTHORS2
-rw-r--r--NEWS6
-rw-r--r--lib/includes/gnutls/gnutls.h.in1
-rw-r--r--m4/hooks.m42
4 files changed, 8 insertions, 3 deletions
diff --git a/AUTHORS b/AUTHORS
index cdc0d20798..41d7634889 100644
--- 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 696335161c..c37c36a302 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/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index 9c4b690d55..af159f5a64 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 ac36a14cc7..cfbab6529a 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)