[SCM] GNU gnutls branch, master, updated. gnutls-3_0_12-203-gba7d8b7

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

The branch, master has been updated
       via  ba7d8b70e82fe15eda24bb4539b3667e528f7f81 (commit)
       via  d06c54abd1f86cef2ee46bc5e88c024110bf2a79 (commit)
       via  aecc53b83c682214e523b01d7b35555dd207bda6 (commit)
       via  4c07a6c751a4454b5fadf06510df7f2c93a846b5 (commit)
       via  9c08f32155f539d208f0addbc0e4f207a0bc7892 (commit)
       via  79285ef8be4a90574e446314685de09a78b9208d (commit)
       via  18737b11e6e62ae8458a19af5cd4031734576791 (commit)
      from  1c47af90492cae3f445edc6c1243d86a95563101 (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 ba7d8b70e82fe15eda24bb4539b3667e528f7f81
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Fri Feb 10 22:37:42 2012 +0100

    escaped brackets

commit d06c54abd1f86cef2ee46bc5e88c024110bf2a79
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Fri Feb 10 16:09:33 2012 +0100

    depend on p11-kit 0.11

commit aecc53b83c682214e523b01d7b35555dd207bda6
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Fri Feb 10 16:09:21 2012 +0100

    disabled dead code when PKCS11 is not there

commit 4c07a6c751a4454b5fadf06510df7f2c93a846b5
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Fri Feb 10 15:58:07 2012 +0100

    depend on p11-kit 0.11

commit 9c08f32155f539d208f0addbc0e4f207a0bc7892
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Fri Feb 10 15:50:49 2012 +0100

    updated documentation for back-end.

commit 79285ef8be4a90574e446314685de09a78b9208d
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Fri Feb 10 15:50:01 2012 +0100

    index after bibliography

commit 18737b11e6e62ae8458a19af5cd4031734576791
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Fri Feb 10 15:49:40 2012 +0100

    more files to ignore

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

Summary of changes:
 .gitignore                      |    1 +
 NEWS                            |    2 ++
 configure.ac                    |    2 +-
 cross.mk                        |    4 ++--
 doc/cha-cert-auth.texi          |   22 ++++++++++++++++++++++
 doc/latex/.gitignore            |    1 +
 doc/latex/gnutls.tex            |    5 +++--
 lib/gnutls_x509.c               |    2 ++
 lib/includes/gnutls/gnutls.h.in |    2 +-
 lib/verify-ssh.c                |   12 ++++++------
 10 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 07c64a0..0e054ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -585,3 +585,4 @@ tests/x509sign-verify
 tests/x509signself
 gl/tests/test-base64
 tests/mini-loss2
+src/libopts/libopts.la
diff --git a/NEWS b/NEWS
index ec461be..d5bf0bd 100644
--- a/NEWS
+++ b/NEWS
@@ -45,6 +45,8 @@ when stored as a 'general name' and serial combo.
 of PKCS #11 modules. This is required on the child process after
 a fork (if PKCS #11 functionality is desirable).
 
+** libgnutls: Depend on p11-kit 0.11.
+
 ** API and ABI modifications:
 gnutls_verify_stored_pubkey: Added
 gnutls_store_pubkey: Added
diff --git a/configure.ac b/configure.ac
index 78caaf5..72f9014 100644
--- a/configure.ac
+++ b/configure.ac
@@ -127,7 +127,7 @@ AC_ARG_WITH(p11-kit,
        AS_HELP_STRING([--without-p11-kit],
                [Build without p11-kit and PKCS#11 support]))
 if test "$with_p11_kit" != "no"; then
-       PKG_CHECK_MODULES(P11_KIT, [p11-kit-1 >= 0.4], [with_p11_kit=yes], 
[with_p11_kit=no])
+       PKG_CHECK_MODULES(P11_KIT, [p11-kit-1 >= 0.11], [with_p11_kit=yes], 
[with_p11_kit=no])
        if test "$with_p11_kit" != "no";then
                AC_DEFINE([ENABLE_PKCS11], 1, [Build PKCS#11 support])
                if test "x$GNUTLS_REQUIRES_PRIVATE" = "x"; then
diff --git a/cross.mk b/cross.mk
index 7bbd67f..72870df 100644
--- a/cross.mk
+++ b/cross.mk
@@ -5,8 +5,8 @@ GNUTLS_DIR:=gnutls-3.0.13
 GMP_FILE:=gmp-5.0.2.tar.bz2
 GMP_DIR:=gmp-5.0.2
 
-P11_KIT_FILE:=p11-kit-0.10.tar.gz
-P11_KIT_DIR:=p11-kit-0.10
+P11_KIT_FILE:=p11-kit-0.11.tar.gz
+P11_KIT_DIR:=p11-kit-0.11
 
 NETTLE_FILE:=nettle-2.4.tar.gz
 NETTLE_DIR:=nettle-2.4
diff --git a/doc/cha-cert-auth.texi b/doc/cha-cert-auth.texi
index a2656ad..b03d35d 100644
--- a/doc/cha-cert-auth.texi
+++ b/doc/cha-cert-auth.texi
@@ -293,6 +293,28 @@ shown in @ref{Simple client example with SSH-style 
certificate verification}.
 @showfuncdesc{gnutls_verify_stored_pubkey}
 @showfuncdesc{gnutls_store_pubkey}
 
+The storage and verification functions may be used with the default
+text file based backend, or another backend may be specified. Such
+backend should contain a storage and a retrieval function. The format
+of those functions is shown below.
address@hidden
+  typedef int (*gnutls_trust_db_store_func) (const char* db_name, 
+                                             const char* host,
+                                             const char* service,
+                                             time_t expiration,
+                                             const gnutls_datum_t* pubkey);
+  
+  typedef int (*gnutls_trust_db_retr_func) (const char* db_name, 
+                                            const char* host,
+                                            const char* service,
+                                            const gnutls_datum_t *pubkey);
+  
+  typedef struct @{
+    gnutls_trust_db_store_func store;
+    gnutls_trust_db_retr_func retrieve;
+  @} trust_storage_st;
address@hidden example
+
 @node OpenPGP certificates
 @section @acronym{OpenPGP} certificates
 @cindex OpenPGP certificates
diff --git a/doc/latex/.gitignore b/doc/latex/.gitignore
index dbc59cd..7803ebe 100644
--- a/doc/latex/.gitignore
+++ b/doc/latex/.gitignore
@@ -37,3 +37,4 @@ sec-tls-app.tex
 cha-cert-auth2.tex
 cha-shared-key.tex
 cha-gtls-examples.tex
+invoke-*.tex
diff --git a/doc/latex/gnutls.tex b/doc/latex/gnutls.tex
index 0f77618..a041ac4 100644
--- a/doc/latex/gnutls.tex
+++ b/doc/latex/gnutls.tex
@@ -89,13 +89,14 @@
 
 \backmatter
 
-\printindex
-\addcontentsline{toc}{chapter}{Index}
 
 \bibliographystyle{abbrv}
 \bibliography{gnutls}
 \addcontentsline{toc}{chapter}{Bibliography}
 
+\printindex
+\addcontentsline{toc}{chapter}{Index}
+
 \cleardoublepage
 
 \end{document}
diff --git a/lib/gnutls_x509.c b/lib/gnutls_x509.c
index d270650..56b3e73 100644
--- a/lib/gnutls_x509.c
+++ b/lib/gnutls_x509.c
@@ -563,6 +563,7 @@ read_key_mem (gnutls_certificate_credentials_t res,
   return 0;
 }
 
+#ifdef ENABLE_PKCS11
 /* Reads a private key from a token.
  */
 static int
@@ -770,6 +771,7 @@ cleanup:
   gnutls_free (ccert);
   return ret;
 }
+#endif
 
 /* Reads a certificate file
  */
diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index 183ac94..c285427 100644
--- a/lib/includes/gnutls/gnutls.h.in
+++ b/lib/includes/gnutls/gnutls.h.in
@@ -1677,7 +1677,7 @@ gnutls_ecc_curve_t gnutls_ecc_curve_get(gnutls_session_t 
session);
     gnutls_trust_db_store_func store;
     gnutls_trust_db_retr_func retrieve;
   } trust_storage_st;
-  
+
   int gnutls_verify_stored_pubkey(const char* db_name, 
                             const trust_storage_st * tdb,
                             const char* host,
diff --git a/lib/verify-ssh.c b/lib/verify-ssh.c
index 1f53203..9135b41 100644
--- a/lib/verify-ssh.c
+++ b/lib/verify-ssh.c
@@ -68,12 +68,12 @@ static const trust_storage_st default_storage =
  * a list of stored public keys.  The @service field if non-NULL should
  * be a port number.
  *
- * The @tdb variable if non-null specifies a custom back-end for
+ * The @tdb variable if non-null specifies a custom backend for
  * the storage and retrieval of entries. If it is NULL then the
- * default file back-end will be used. In POSIX-like systems the
- * file back-end uses the $HOME/.gnutls/known_hosts file.
+ * default file backend will be used. In POSIX-like systems the
+ * file backend uses the $HOME/.gnutls/known_hosts file.
  *
- * Note that if the custom storage back-end is provided the
+ * Note that if the custom storage backend is provided the
  * retrieval function should return %GNUTLS_E_CERTIFICATE_KEY_MISMATCH
  * if the host/service pair is found but key doesn't match,
  * %GNUTLS_E_NO_CERTIFICATE_FOUND if no such host/service with
@@ -439,9 +439,9 @@ FILE* fd;
  * the list of stored public keys. The key will be considered valid until 
  * the provided expiration time.
  *
- * The @tdb variable if non-null specifies a custom back-end for
+ * The @tdb variable if non-null specifies a custom backend for
  * the storage and retrieval of entries. If it is NULL then the
- * default file back-end will be used.
+ * default file backend will be used.
  *
  * Note that this function is not thread safe with the default backend.
  *


hooks/post-receive
-- 
GNU gnutls