[SCM] GNU gnutls branch, master, updated. gnutls_3_0_13-86-g517aee3

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=517aee329836d13dcf5656a38278e10cd3f0f1f9

The branch, master has been updated
       via  517aee329836d13dcf5656a38278e10cd3f0f1f9 (commit)
       via  4a142ceb0e52b08f4a7c0e340c38fea2ac153ff0 (commit)
       via  de31dad7e0f27b041f26eee50fd6b53b6a408bfa (commit)
       via  f14e4cf0507aab359b7aa9f511f94082c7213869 (commit)
      from  22091a76bc4a846cef4a333baeb0707144cf309c (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 517aee329836d13dcf5656a38278e10cd3f0f1f9
Author: Nikos Mavrogiannopoulos <[email protected]>
Date:   Thu Mar 1 17:38:09 2012 +0100

    corrected version replacement in .texi.

commit 4a142ceb0e52b08f4a7c0e340c38fea2ac153ff0
Author: Nikos Mavrogiannopoulos <[email protected]>
Date:   Thu Mar 1 17:28:12 2012 +0100

    bumped version

commit de31dad7e0f27b041f26eee50fd6b53b6a408bfa
Author: Nikos Mavrogiannopoulos <[email protected]>
Date:   Thu Mar 1 17:25:57 2012 +0100

    avoid regeneration of header files

commit f14e4cf0507aab359b7aa9f511f94082c7213869
Author: Nikos Mavrogiannopoulos <[email protected]>
Date:   Thu Mar 1 16:41:11 2012 +0100

    No longer crash on a pkcs11 object without an ID.

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

Summary of changes:
 Makefile.am     |    2 +-
 NEWS            |    3 +++
 configure.ac    |    2 +-
 doc/Makefile.am |    9 ++++++++-
 lib/pkcs11.c    |    6 ++++++
 m4/hooks.m4     |    2 +-
 6 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index a59db29..0afe4bd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,7 +38,7 @@ dist-hook:
 	make ChangeLog
 	cp -f ChangeLog $(distdir)/
 	sed 's/\@VERSION\@/$(VERSION)/g' -i $(distdir)/src/args-std.def
-	sed 's/\@VERSION\@/$(VERSION)/g' -i $(distdir)/doc/invoke-*.texi
+	sed 's/\@\@VERSION\@\@/$(VERSION)/g' -i $(distdir)/doc/invoke-*.texi
 	cd $(distdir)/src/ && for i in *.def;do \
 		if test x"$$i" = x"args-std.def";then  continue; fi; \
 		autogen $$i; \
diff --git a/NEWS b/NEWS
index 02ba4bf..db964f7 100644
--- a/NEWS
+++ b/NEWS
@@ -22,6 +22,9 @@ Reported by Andreas Metzler.
 ** libgnutls: Corrected rehandshake and resumption
 operations in DTLS. Reported by Sean Buckheister.
 
+** libgnutls: PKCS #11 objects that do not have ID
+no longer crash listing. Reported by Sven Geggus.
+
 ** API and ABI modifications:
 No changes since last version.
 
diff --git a/configure.ac b/configure.ac
index 4550adf..0a24f53 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ dnl Process this file with autoconf to produce a configure script.
 # USA
 
 AC_PREREQ(2.61)
-AC_INIT([GnuTLS], [3.0.14], [[email protected]])
+AC_INIT([GnuTLS], [3.0.15], [[email protected]])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 22288f3..b22803f 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -181,6 +181,13 @@ MAINTAINERCLEANFILES += gnutls-api.texi x509-api.texi pgp-api.texi	\
 	pkcs12-api.texi pkcs11-api.texi abstract-api.texi		\
 	compat-api.texi dtls-api.texi crypto-api.texi ocsp-api.texi
 
+HEADER_FILES = $(top_srcdir)/lib/includes/gnutls/gnutls.h.in \
+	$(top_srcdir)/lib/includes/gnutls/x509.h $(top_srcdir)/lib/includes/gnutls/openpgp.h \
+	$(top_srcdir)/lib/includes/gnutls/pkcs12.h $(top_srcdir)/lib/includes/gnutls/pkcs11.h \
+	$(top_srcdir)/lib/includes/gnutls/abstract.h $(top_srcdir)/lib/includes/gnutls/compat.h \
+	$(top_srcdir)/lib/includes/gnutls/dtls.h $(top_srcdir)/lib/includes/gnutls/crypto.h \
+	$(top_srcdir)/lib/includes/gnutls/ocsp.h
+
 gnutls-api.texi: $(top_srcdir)/lib/includes/gnutls/gnutls.h.in
 	echo "" > $@-tmp
 	for i in `$(top_srcdir)/doc/scripts/getfuncs.pl <$(top_srcdir)/lib/includes/gnutls/gnutls.h.in|sort|uniq`; do \
@@ -330,7 +337,7 @@ alerts.texi: $(top_srcdir)/lib/gnutls_alert.c $(srcdir)/alert-printlist.c
 	$(builddir)/alert-printlist > $@-tmp
 	mv -f $@-tmp $@
 
-enums.texi: $(srcdir)/../lib/includes/gnutls/*.h $(builddir)/../lib/includes/gnutls/*.h
+enums.texi: $(HEADER_FILES)
 	echo "" > $@-tmp
 	for i in $^; do \
 		echo -n "Creating documentation for $$i... " && \
diff --git a/lib/pkcs11.c b/lib/pkcs11.c
index 40bcb66..fee7023 100644
--- a/lib/pkcs11.c
+++ b/lib/pkcs11.c
@@ -400,6 +400,12 @@ pkcs11_get_info (struct p11_kit_uri *info,
                          (int)version->minor);
       terminate = 1;
     }
+  else
+    {
+      *output_size = 0;
+      if (output) ((uint8_t*)output)[0] = 0;
+      return 0;
+    }
 
   if (hexify)
     {
diff --git a/m4/hooks.m4 b/m4/hooks.m4
index 6c5139f..9188553 100644
--- a/m4/hooks.m4
+++ b/m4/hooks.m4
@@ -40,7 +40,7 @@ AC_DEFUN([LIBGNUTLS_HOOKS],
   # Interfaces added:                             AGE++
   # Interfaces removed:                           AGE=0
   AC_SUBST(LT_CURRENT, 34)
-  AC_SUBST(LT_REVISION, 1)
+  AC_SUBST(LT_REVISION, 2)
   AC_SUBST(LT_AGE, 6)
 
   AC_SUBST(LT_SSL_CURRENT, 27)


hooks/post-receive
-- 
GNU gnutls