[SCM] GNU gnutls branch, master, updated. gnutls_3_1_0-18-gcf58284

[Simon Josefsson]

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=cf5828497b58488907bfe900eb760e8701ce9d20

The branch, master has been updated
       via  cf5828497b58488907bfe900eb760e8701ce9d20 (commit)
       via  c095e6db00ef98bdaa1b771aa088de15259c070b (commit)
       via  aded6cacfa07f1c9179638a66b46a180e81dfa60 (commit)
       via  cc546f3d2b42f9999255c25416818529cd8d1982 (commit)
       via  5658682222996403fd53d427acfd6234073ef26e (commit)
      from  699dc93bff116ea49464e6941365ba0628bd9575 (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 cf5828497b58488907bfe900eb760e8701ce9d20
Author: Simon Josefsson <address@hidden>
Date:   Fri Aug 24 10:50:26 2012 +0200

    Fix suppression rules.

commit c095e6db00ef98bdaa1b771aa088de15259c070b
Author: Simon Josefsson <address@hidden>
Date:   Fri Aug 24 10:43:35 2012 +0200

    Sort and add doc/tpm-api.texi.

commit aded6cacfa07f1c9179638a66b46a180e81dfa60
Author: Simon Josefsson <address@hidden>
Date:   Fri Aug 24 10:31:22 2012 +0200

    Silence automake warning.

commit cc546f3d2b42f9999255c25416818529cd8d1982
Author: Simon Josefsson <address@hidden>
Date:   Fri Aug 24 10:24:20 2012 +0200

    Generate manpages for tpm.h.

commit 5658682222996403fd53d427acfd6234073ef26e
Author: Simon Josefsson <address@hidden>
Date:   Sun Aug 19 15:00:32 2012 +0200

    Generated.

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

Summary of changes:
 .gitignore                  |   51 ++++++++++++++++++++++---------------------
 configure.ac                |    2 +-
 doc/manpages/Makefile.am    |   46 ++++++++++++++++++++++++++++++++++++++
 tests/suppressions.valgrind |   17 +++++++++++---
 4 files changed, 86 insertions(+), 30 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4cfbcd0..5e125cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -85,6 +85,7 @@ doc/examples/ex-serv1
 doc/examples/libexamples.la
 doc/examples/print-ciphersuites
 doc/extra.c.texi
+doc/functions/
 doc/gnutls-api.texi
 doc/gnutls-extra-api.texi
 doc/gnutls-guile.html
@@ -92,6 +93,7 @@ doc/gnutls.aux
 doc/gnutls.cp
 doc/gnutls.cps
 doc/gnutls.dvi
+doc/gnutls.epub
 doc/gnutls.fn
 doc/gnutls.fns
 doc/gnutls.html
@@ -105,7 +107,9 @@ doc/gnutls.toc
 doc/gnutls.tp
 doc/gnutls.vr
 doc/gnutls.vrs
+doc/gnutls.xml
 doc/ia-api.texi
+doc/latex/cha-upgrade.tex
 doc/latex/enums
 doc/latex/gnutls-enums.tex
 doc/latex/gnutls.lof
@@ -161,6 +165,8 @@ doc/scripts/Makefile.in
 doc/stamp-1
 doc/stamp-vti
 doc/stamp_enums
+doc/stamp_functions
+doc/tpm-api.texi
 doc/version-guile.texi
 doc/version.texi
 doc/x509-api.texi
@@ -177,6 +183,7 @@ gl/arpa/
 gl/c++defs.h
 gl/dirent.h
 gl/getopt.h
+gl/glthread/.dirstamp
 gl/libgnu.la
 gl/math.h
 gl/netdb.h
@@ -204,6 +211,7 @@ gl/tests/test-alignof
 gl/tests/test-alloca-opt
 gl/tests/test-argp
 gl/tests/test-arpa_inet
+gl/tests/test-base64
 gl/tests/test-binary-io
 gl/tests/test-bind
 gl/tests/test-byteswap
@@ -437,7 +445,6 @@ po/quot.sed
 po/remove-potcdate.sed
 po/remove-potcdate.sin
 po/stamp-po
-src/invoke-*.menu
 src/Makefile
 src/Makefile.in
 src/benchmark
@@ -455,6 +462,7 @@ src/gaa.skel
 src/gnutls-cli
 src/gnutls-cli-debug
 src/gnutls-serv
+src/invoke-*.menu
 src/libcfg.la
 src/libcmd-certtool.la
 src/libcmd-cli-debug.la
@@ -464,10 +472,13 @@ src/libcmd-p11tool.la
 src/libcmd-psk.la
 src/libcmd-serv.la
 src/libcmd-srp.la
+src/libcmd-tpmtool.la
+src/libopts/libopts.la
 src/ocsptool
 src/p11tool
 src/psktool
 src/srptool
+src/tpmtool
 stamp-h1
 tags
 tests/*/out
@@ -488,6 +499,7 @@ tests/cve-2009-1416
 tests/dhepskself
 tests/dn
 tests/dn2
+tests/dtls/dtls-stress
 tests/finished
 tests/gc
 tests/hostname-check
@@ -497,15 +509,21 @@ tests/key-id/Makefile
 tests/key-id/Makefile.in
 tests/libutils.la
 tests/mini
-tests/mini-loss
-tests/mini-emsgsize-dtls
 tests/mini-deflate
+tests/mini-dtls-rehandshake
 tests/mini-eagain
 tests/mini-eagain-dtls
+tests/mini-emsgsize-dtls
+tests/mini-loss
+tests/mini-loss-time
+tests/mini-loss2
+tests/mini-record
+tests/mini-rehandshake
+tests/mini-tdb
+tests/mini-termination
 tests/mini-x509
+tests/mini-x509-2
 tests/mini-x509-cas
-tests/mini-dtls-rehandshake
-tests/mini-rehandshake
 tests/moredn
 tests/mpi
 tests/netconf-psk
@@ -529,10 +547,12 @@ tests/pkcs12-decode/Makefile.in
 tests/pkcs12_encode
 tests/pkcs12_s2k
 tests/pkcs12_s2k_pem
+tests/pkcs12_simple
 tests/pkcs8-decode/Makefile
 tests/pkcs8-decode/Makefile.in
 tests/pskself
 tests/resume
+tests/resume-dtls
 tests/rng-fork
 tests/rsa-encrypt-decrypt
 tests/rsa-md5-collision/Makefile
@@ -551,6 +571,7 @@ tests/simple
 tests/slow/cipher-test
 tests/slow/gendh
 tests/slow/keygen
+tests/srp/mini-srp
 tests/suite/eagain-cli
 tests/suite/libecore.la
 tests/suite/x509paths/X509tests
@@ -565,25 +586,5 @@ tests/x509paths/
 tests/x509self
 tests/x509sign-verify
 tests/x509signself
-gl/tests/test-base64
-tests/mini-loss2
-src/libopts/libopts.la
-tests/mini-loss-time
-tests/dtls/dtls-stress
-doc/gnutls.epub
-doc/gnutls.xml
-tests/mini-tdb
-tests/resume-dtls
-tests/mini-record
-tests/srp/mini-srp
-doc/stamp_functions
-doc/latex/cha-upgrade.tex
-doc/functions/
-gl/glthread/.dirstamp
-tests/mini-termination
-tests/mini-x509-2
-tests/pkcs12_simple
 win32
 win64
-src/tpmtool
-src/libcmd-tpmtool.la
diff --git a/configure.ac b/configure.ac
index 0e62e4b..81b6e8a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -383,7 +383,7 @@ if test "$opt_guile_bindings" = "yes"; then
       CFLAGS="$CFLAGS $GUILE_CFLAGS"
       LIBS="$LIBS $GUILE_LDFLAGS"
       AC_MSG_CHECKING([whether GNU Guile is recent enough])
-      AC_LINK_IFELSE(AC_LANG_CALL([], [scm_from_locale_string]),
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([], [scm_from_locale_string ("")])],
         [], [opt_guile_bindings=no])
       CFLAGS="$save_CFLAGS"
       LIBS="$save_LIBS"
diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
index b025eae..d1572ef 100644
--- a/doc/manpages/Makefile.am
+++ b/doc/manpages/Makefile.am
@@ -80,11 +80,15 @@ psktool.1: ../../src/psk-args.def
 APIMANS =
 APIMANS += gnutls_pubkey_init.3
 APIMANS += gnutls_pubkey_deinit.3
+APIMANS += gnutls_pubkey_set_pin_function.3
 APIMANS += gnutls_pubkey_get_pk_algorithm.3
 APIMANS += gnutls_pubkey_import_x509.3
 APIMANS += gnutls_pubkey_import_pkcs11.3
 APIMANS += gnutls_pubkey_import_openpgp.3
 APIMANS += gnutls_pubkey_import_privkey.3
+APIMANS += gnutls_pubkey_import_tpm_url.3
+APIMANS += gnutls_pubkey_import_url.3
+APIMANS += gnutls_pubkey_import_tpm_raw.3
 APIMANS += gnutls_pubkey_get_preferred_hash_algorithm.3
 APIMANS += gnutls_pubkey_get_pk_rsa_raw.3
 APIMANS += gnutls_pubkey_get_pk_dsa_raw.3
@@ -109,12 +113,20 @@ APIMANS += gnutls_pubkey_get_verify_algorithm.3
 APIMANS += gnutls_pubkey_verify_data2.3
 APIMANS += gnutls_privkey_init.3
 APIMANS += gnutls_privkey_deinit.3
+APIMANS += gnutls_privkey_set_pin_function.3
 APIMANS += gnutls_privkey_get_pk_algorithm.3
 APIMANS += gnutls_privkey_get_type.3
 APIMANS += gnutls_privkey_import_pkcs11.3
 APIMANS += gnutls_privkey_import_x509.3
 APIMANS += gnutls_privkey_import_openpgp.3
+APIMANS += gnutls_privkey_import_openpgp_raw.3
+APIMANS += gnutls_privkey_import_x509_raw.3
+APIMANS += gnutls_privkey_import_tpm_raw.3
+APIMANS += gnutls_privkey_import_tpm_url.3
+APIMANS += gnutls_privkey_import_url.3
+APIMANS += gnutls_privkey_import_pkcs11_url.3
 APIMANS += gnutls_privkey_import_ext.3
+APIMANS += gnutls_privkey_import_ext2.3
 APIMANS += gnutls_privkey_sign_data.3
 APIMANS += gnutls_privkey_sign_hash.3
 APIMANS += gnutls_privkey_decrypt_data.3
@@ -187,6 +199,7 @@ APIMANS += gnutls_dtls_set_timeouts.3
 APIMANS += gnutls_dtls_get_mtu.3
 APIMANS += gnutls_dtls_get_data_mtu.3
 APIMANS += gnutls_dtls_set_mtu.3
+APIMANS += gnutls_dtls_set_data_mtu.3
 APIMANS += gnutls_dtls_get_timeout.3
 APIMANS += gnutls_dtls_cookie_send.3
 APIMANS += gnutls_dtls_cookie_verify.3
@@ -197,6 +210,7 @@ APIMANS += gnutls_init.3
 APIMANS += gnutls_deinit.3
 APIMANS += gnutls_bye.3
 APIMANS += gnutls_handshake.3
+APIMANS += gnutls_handshake_set_timeout.3
 APIMANS += gnutls_rehandshake.3
 APIMANS += gnutls_alert_get.3
 APIMANS += gnutls_alert_send.3
@@ -214,6 +228,7 @@ APIMANS += gnutls_kx_get.3
 APIMANS += gnutls_mac_get.3
 APIMANS += gnutls_compression_get.3
 APIMANS += gnutls_certificate_type_get.3
+APIMANS += gnutls_sign_algorithm_get.3
 APIMANS += gnutls_sign_algorithm_get_requested.3
 APIMANS += gnutls_cipher_get_key_size.3
 APIMANS += gnutls_mac_get_key_size.3
@@ -224,6 +239,8 @@ APIMANS += gnutls_kx_get_name.3
 APIMANS += gnutls_certificate_type_get_name.3
 APIMANS += gnutls_pk_get_name.3
 APIMANS += gnutls_sign_get_name.3
+APIMANS += gnutls_sign_get_hash_algorithm.3
+APIMANS += gnutls_sign_get_pk_algorithm.3
 APIMANS += gnutls_pk_to_sign.3
 APIMANS += gnutls_mac_get_id.3
 APIMANS += gnutls_compression_get_id.3
@@ -288,6 +305,7 @@ APIMANS += gnutls_session_set_data.3
 APIMANS += gnutls_session_get_data.3
 APIMANS += gnutls_session_get_data2.3
 APIMANS += gnutls_session_get_random.3
+APIMANS += gnutls_session_set_premaster.3
 APIMANS += gnutls_session_get_id.3
 APIMANS += gnutls_session_channel_binding.3
 APIMANS += gnutls_session_is_resumed.3
@@ -429,6 +447,9 @@ APIMANS += gnutls_tdb_deinit.3
 APIMANS += gnutls_verify_stored_pubkey.3
 APIMANS += gnutls_store_commitment.3
 APIMANS += gnutls_store_pubkey.3
+APIMANS += gnutls_load_file.3
+APIMANS += gnutls_url_is_supported.3
+APIMANS += gnutls_certificate_set_pin_function.3
 APIMANS += gnutls_ocsp_req_init.3
 APIMANS += gnutls_ocsp_req_deinit.3
 APIMANS += gnutls_ocsp_req_import.3
@@ -535,8 +556,10 @@ APIMANS += gnutls_pkcs11_reinit.3
 APIMANS += gnutls_pkcs11_deinit.3
 APIMANS += gnutls_pkcs11_set_token_function.3
 APIMANS += gnutls_pkcs11_set_pin_function.3
+APIMANS += gnutls_pkcs11_get_pin_function.3
 APIMANS += gnutls_pkcs11_add_provider.3
 APIMANS += gnutls_pkcs11_obj_init.3
+APIMANS += gnutls_pkcs11_obj_set_pin_function.3
 APIMANS += gnutls_pkcs11_obj_import_url.3
 APIMANS += gnutls_pkcs11_obj_export_url.3
 APIMANS += gnutls_pkcs11_obj_deinit.3
@@ -560,6 +583,7 @@ APIMANS += gnutls_pkcs11_obj_get_type.3
 APIMANS += gnutls_pkcs11_type_get_name.3
 APIMANS += gnutls_x509_crt_list_import_pkcs11.3
 APIMANS += gnutls_pkcs11_privkey_init.3
+APIMANS += gnutls_pkcs11_privkey_set_pin_function.3
 APIMANS += gnutls_pkcs11_privkey_deinit.3
 APIMANS += gnutls_pkcs11_privkey_get_pk_algorithm.3
 APIMANS += gnutls_pkcs11_privkey_get_info.3
@@ -589,6 +613,11 @@ APIMANS += gnutls_pkcs12_bag_get_key_id.3
 APIMANS += gnutls_pkcs12_bag_set_key_id.3
 APIMANS += gnutls_pkcs12_bag_get_friendly_name.3
 APIMANS += gnutls_pkcs12_bag_set_friendly_name.3
+APIMANS += gnutls_tpm_privkey_generate.3
+APIMANS += gnutls_tpm_key_list_deinit.3
+APIMANS += gnutls_tpm_key_list_get_url.3
+APIMANS += gnutls_tpm_get_registered.3
+APIMANS += gnutls_tpm_privkey_delete.3
 APIMANS += gnutls_x509_crt_init.3
 APIMANS += gnutls_x509_crt_deinit.3
 APIMANS += gnutls_x509_crt_import.3
@@ -614,6 +643,7 @@ APIMANS += gnutls_x509_crt_get_authority_key_gn_serial.3
 APIMANS += gnutls_x509_crt_get_subject_key_id.3
 APIMANS += gnutls_x509_crt_get_subject_unique_id.3
 APIMANS += gnutls_x509_crt_get_issuer_unique_id.3
+APIMANS += gnutls_x509_crt_set_pin_function.3
 APIMANS += gnutls_x509_crt_get_authority_info_access.3
 APIMANS += gnutls_x509_crt_get_crl_dist_points.3
 APIMANS += gnutls_x509_crt_set_crl_dist_points2.3
@@ -734,6 +764,8 @@ APIMANS += gnutls_x509_privkey_sec_param.3
 APIMANS += gnutls_x509_privkey_cpy.3
 APIMANS += gnutls_x509_privkey_import.3
 APIMANS += gnutls_x509_privkey_import_pkcs8.3
+APIMANS += gnutls_x509_privkey_import_openssl.3
+APIMANS += gnutls_x509_privkey_import2.3
 APIMANS += gnutls_x509_privkey_import_rsa_raw.3
 APIMANS += gnutls_x509_privkey_import_rsa_raw2.3
 APIMANS += gnutls_x509_privkey_import_ecc_raw.3
@@ -959,5 +991,19 @@ doit:
                echo -n "."; \
        done
        @echo ""
+       @echo -n "Creating man pages for tpm.h..." && \
+       for i in `$(top_srcdir)/doc/scripts/getfuncs.pl 
<$(top_srcdir)/lib/includes/gnutls/tpm.h`; do \
+               $(top_srcdir)/doc/scripts/gdoc -man \
+                       -module $(PACKAGE) -sourceversion $(VERSION) \
+                       -bugsto $(PACKAGE_BUGREPORT) \
+                       -pkg-name "$(PACKAGE_NAME)" \
+                       -include "gnutls/tpm.h" \
+                       -seeinfo $(PACKAGE) -verbatimcopying \
+                       -copyright "2012 Free Software Foundation, Inc." \
+                       -function $$i \
+                       $(top_srcdir)/lib/*.c $(top_srcdir)/lib/*/*.c > $$i.3 
2>/dev/null && \
+               echo -n "."; \
+       done
+       @echo ""
 
 .PHONY: update-makefile doit
diff --git a/tests/suppressions.valgrind b/tests/suppressions.valgrind
index a8ca524..ee09620 100644
--- a/tests/suppressions.valgrind
+++ b/tests/suppressions.valgrind
@@ -16,10 +16,6 @@
    fun:_gnutls_epoch_set_keys
    fun:_gnutls_write_connection_state_init
    fun:_gnutls_send_handshake_final
-   fun:_gnutls_handshake_common
-   fun:gnutls_handshake
-   fun:doit
-   fun:main
 }
 
 {
@@ -201,3 +197,16 @@
    fun:_gnutls_rnd_init
    fun:gnutls_global_init
 }
+
+{
+   ignore p11 leaks
+   Memcheck:Leak
+   fun:calloc
+   obj:*
+   obj:*
+   obj:*
+   obj:*
+   fun:p11_kit_initialize_registered
+   fun:gnutls_pkcs11_init
+   fun:gnutls_global_init
+}


hooks/post-receive
-- 
GNU gnutls