gnutls-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[SCM] GNU gnutls branch, master, updated. gnutls_3_0_21-96-g5cd6ecd


From: Nikos Mavrogiannopoulos
Subject: [SCM] GNU gnutls branch, master, updated. gnutls_3_0_21-96-g5cd6ecd
Date: Tue, 07 Aug 2012 19:09:35 +0000

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=5cd6ecd192636509a4dd66bdd295ebe19fc67b6c

The branch, master has been updated
       via  5cd6ecd192636509a4dd66bdd295ebe19fc67b6c (commit)
       via  afab4ff9bdf459f02d73ec6ffabb1b15a633c84b (commit)
       via  e048b2c6be7371aafb2ac2f8b6232121bb05ac87 (commit)
       via  863b7a19f0df4605ddd3750a664ba959e0adcd42 (commit)
       via  d08e63c0c3244beb501c85e7f3510fa9a2b5c5cf (commit)
       via  a23b198ea9f38b44cc7b0f3957097022efbe2435 (commit)
      from  402169e5c31e5d79b18553269ac036545533313d (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 5cd6ecd192636509a4dd66bdd295ebe19fc67b6c
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Mon Aug 6 17:54:50 2012 +0200

    Added gnutls_handshake_timeout().

commit afab4ff9bdf459f02d73ec6ffabb1b15a633c84b
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Aug 5 21:48:24 2012 +0200

    document the deprecated functions in 3.1.x

commit e048b2c6be7371aafb2ac2f8b6232121bb05ac87
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Aug 5 21:48:06 2012 +0200

    document the alloc functions

commit 863b7a19f0df4605ddd3750a664ba959e0adcd42
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Aug 5 12:14:29 2012 +0200

    released

commit d08e63c0c3244beb501c85e7f3510fa9a2b5c5cf
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Aug 5 11:37:49 2012 +0200

    distribute all generated files

commit a23b198ea9f38b44cc7b0f3957097022efbe2435
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Aug 5 11:37:34 2012 +0200

    documented TPM support

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

Summary of changes:
 NEWS                            |   28 +-
 build-aux/config.rpath          |  106 +++----
 configure.ac                    |    2 +-
 doc/Makefile.am                 |  757 ++++++++++++++++++++++++++++++++++++++-
 doc/cha-gtls-app.texi           |    2 +
 doc/cha-shared-key.texi         |    2 +-
 doc/cha-upgrade.texi            |   20 +-
 doc/examples/ex-client-anon.c   |    2 +-
 doc/examples/ex-client-dtls.c   |    2 +-
 doc/examples/ex-client-psk.c    |    2 +-
 doc/examples/ex-client-resume.c |    2 +-
 doc/examples/ex-client-srp.c    |    2 +-
 doc/examples/ex-client-x509.c   |    2 +-
 doc/gnutls.texi                 |   42 ++--
 lib/gnutls_buffers.c            |   59 +++-
 lib/gnutls_buffers.h            |    4 +-
 lib/gnutls_handshake.c          |   22 ++
 lib/gnutls_int.h                |    2 +
 lib/gnutls_record.c             |   32 ++-
 lib/includes/gnutls/gnutls.h.in |    3 +
 lib/libgnutls.map               |    1 +
 src/cli.c                       |    2 +-
 22 files changed, 969 insertions(+), 127 deletions(-)

diff --git a/NEWS b/NEWS
index ac75e7d..2abf67e 100644
--- a/NEWS
+++ b/NEWS
@@ -4,18 +4,8 @@ See the end for copying conditions.
 
 * Version 3.1.0 (unreleased)
 
-** tpmtool: Added. It is a tool to generate private keys in the
-TPM.
-
-** gnutls-cli: --benchmark-tls was split to --benchmark-tls-kx
-and --benchmark-tls-ciphers
-
-** certtool: generated PKCS #12 structures may hold more than one
-private key. Patch by Lucas Fisher.
-
-** certtool: Added option --null-password to generate/decrypt keys
-that use a NULL password (in schemas that distinguish between NULL
-an empty passwords).
+** libgnutls: Added direct support for TPM as a cryptographic module 
+in gnutls/tpm.h. 
 
 ** libgnutls: requires libnettle 2.5.
 
@@ -41,6 +31,19 @@ password was provided.
 ** libgnutlsxx: Added session::set_transport_vec_push_function. Patch
 by Alexandre Bique.
 
+** tpmtool: Added. It is a tool to generate private keys in the
+TPM.
+
+** gnutls-cli: --benchmark-tls was split to --benchmark-tls-kx
+and --benchmark-tls-ciphers
+
+** certtool: generated PKCS #12 structures may hold more than one
+private key. Patch by Lucas Fisher.
+
+** certtool: Added option --null-password to generate/decrypt keys
+that use a NULL password (in schemas that distinguish between NULL
+an empty passwords).
+
 ** minitasn1: Upgraded to libtasn1 version 2.13.
 
 ** API and ABI modifications:
@@ -81,6 +84,7 @@ gnutls_x509_trust_list_add_system_trust: Added
 gnutls_x509_trust_list_add_trust_file: Added
 gnutls_x509_trust_list_add_trust_mem: Added
 gnutls_pk_to_sign: Added
+gnutls_handshake_timeout: Added
 gnutls_pubkey_verify_hash: Deprecated (use gnutls_pubkey_verify_hash2)
 gnutls_pubkey_verify_data: Deprecated (use gnutls_pubkey_verify_data2)
 
diff --git a/build-aux/config.rpath b/build-aux/config.rpath
index 1a07018..17298f2 100755
--- a/build-aux/config.rpath
+++ b/build-aux/config.rpath
@@ -2,7 +2,7 @@
 # Output a system dependent set of variables, describing how to set the
 # run time search path of shared libraries in an executable.
 #
-#   Copyright 1996-2012 Free Software Foundation, Inc.
+#   Copyright 1996-2010 Free Software Foundation, Inc.
 #   Taken from GNU libtool, 2001
 #   Originally by Gordon Matzigkeit <address@hidden>, 1996
 #
@@ -25,7 +25,7 @@
 #   known workaround is to choose shorter directory names for the build
 #   directory and/or the installation directory.
 
-# All known linkers require a '.a' archive for static linking (except MSVC,
+# All known linkers require a `.a' archive for static linking (except MSVC,
 # which needs '.lib').
 libext=a
 shrext=.so
@@ -57,6 +57,13 @@ else
     aix*)
       wl='-Wl,'
       ;;
+    darwin*)
+      case $cc_basename in
+        xlc*)
+          wl='-Wl,'
+          ;;
+      esac
+      ;;
     mingw* | cygwin* | pw32* | os2* | cegcc*)
       ;;
     hpux9* | hpux10* | hpux11*)
@@ -65,7 +72,9 @@ else
     irix5* | irix6* | nonstopux*)
       wl='-Wl,'
       ;;
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+    newsos6)
+      ;;
+    linux* | k*bsd*-gnu)
       case $cc_basename in
         ecc*)
           wl='-Wl,'
@@ -76,26 +85,17 @@ else
         lf95*)
           wl='-Wl,'
           ;;
-        nagfor*)
-          wl='-Wl,-Wl,,'
-          ;;
-        pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+        pgcc | pgf77 | pgf90)
           wl='-Wl,'
           ;;
         ccc*)
           wl='-Wl,'
           ;;
-        xl* | bgxl* | bgf* | mpixl*)
-          wl='-Wl,'
-          ;;
         como)
           wl='-lopt='
           ;;
         *)
           case `$CC -V 2>&1 | sed 5q` in
-            *Sun\ F* | *Sun*Fortran*)
-              wl=
-              ;;
             *Sun\ C*)
               wl='-Wl,'
               ;;
@@ -103,24 +103,13 @@ else
           ;;
       esac
       ;;
-    newsos6)
-      ;;
-    *nto* | *qnx*)
-      ;;
     osf3* | osf4* | osf5*)
       wl='-Wl,'
       ;;
     rdos*)
       ;;
     solaris*)
-      case $cc_basename in
-        f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
-          wl='-Qoption ld '
-          ;;
-        *)
-          wl='-Wl,'
-          ;;
-      esac
+      wl='-Wl,'
       ;;
     sunos4*)
       wl='-Qoption ld '
@@ -182,14 +171,15 @@ if test "$with_gnu_ld" = yes; then
       fi
       ;;
     amigaos*)
-      case "$host_cpu" in
-        powerpc)
-          ;;
-        m68k)
-          hardcode_libdir_flag_spec='-L$libdir'
-          hardcode_minus_L=yes
-          ;;
-      esac
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      # Samuel A. Falvo II <address@hidden> reports
+      # that the semantics of dynamic libraries on AmigaOS, at least up
+      # to version 4, is to share data among multiple programs linked
+      # with the same dynamic library.  Since this doesn't match the
+      # behavior of shared libraries on other platforms, we cannot use
+      # them.
+      ld_shlibs=no
       ;;
     beos*)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -208,13 +198,11 @@ if test "$with_gnu_ld" = yes; then
         ld_shlibs=no
       fi
       ;;
-    haiku*)
-      ;;
     interix[3-9]*)
       hardcode_direct=no
       hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
       ;;
-    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+    gnu* | linux* | k*bsd*-gnu)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
         :
       else
@@ -337,14 +325,10 @@ else
       fi
       ;;
     amigaos*)
-      case "$host_cpu" in
-        powerpc)
-          ;;
-        m68k)
-          hardcode_libdir_flag_spec='-L$libdir'
-          hardcode_minus_L=yes
-          ;;
-      esac
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      # see comment about different semantics on the GNU ld section
+      ld_shlibs=no
       ;;
     bsdi[45]*)
       ;;
@@ -358,15 +342,24 @@ else
       ;;
     darwin* | rhapsody*)
       hardcode_direct=no
-      if { case $cc_basename in ifort*) true;; *) test "$GCC" = yes;; esac; }; 
then
+      if test "$GCC" = yes ; then
         :
       else
-        ld_shlibs=no
+        case $cc_basename in
+          xlc*)
+            ;;
+          *)
+            ld_shlibs=no
+            ;;
+        esac
       fi
       ;;
     dgux*)
       hardcode_libdir_flag_spec='-L$libdir'
       ;;
+    freebsd1*)
+      ld_shlibs=no
+      ;;
     freebsd2.2*)
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_direct=yes
@@ -427,8 +420,6 @@ else
       hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
       hardcode_libdir_separator=:
       ;;
-    *nto* | *qnx*)
-      ;;
     openbsd*)
       if test -f /usr/libexec/ld.so; then
         hardcode_direct=yes
@@ -524,12 +515,7 @@ case "$host_os" in
     library_names_spec='$libname$shrext'
     ;;
   amigaos*)
-    case "$host_cpu" in
-      powerpc*)
-        library_names_spec='$libname$shrext' ;;
-      m68k)
-        library_names_spec='$libname.a' ;;
-    esac
+    library_names_spec='$libname.a'
     ;;
   beos*)
     library_names_spec='$libname$shrext'
@@ -548,6 +534,8 @@ case "$host_os" in
   dgux*)
     library_names_spec='$libname$shrext'
     ;;
+  freebsd1*)
+    ;;
   freebsd* | dragonfly*)
     case "$host_os" in
       freebsd[123]*)
@@ -559,9 +547,6 @@ case "$host_os" in
   gnu*)
     library_names_spec='$libname$shrext'
     ;;
-  haiku*)
-    library_names_spec='$libname$shrext'
-    ;;
   hpux9* | hpux10* | hpux11*)
     case $host_cpu in
       ia64*)
@@ -597,7 +582,7 @@ case "$host_os" in
     ;;
   linux*oldld* | linux*aout* | linux*coff*)
     ;;
-  linux* | k*bsd*-gnu | kopensolaris*-gnu)
+  linux* | k*bsd*-gnu)
     library_names_spec='$libname$shrext'
     ;;
   knetbsd*-gnu)
@@ -609,7 +594,7 @@ case "$host_os" in
   newsos6)
     library_names_spec='$libname$shrext'
     ;;
-  *nto* | *qnx*)
+  nto-qnx*)
     library_names_spec='$libname$shrext'
     ;;
   openbsd*)
@@ -640,9 +625,6 @@ case "$host_os" in
   sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
     library_names_spec='$libname$shrext'
     ;;
-  tpf*)
-    library_names_spec='$libname$shrext'
-    ;;
   uts4*)
     library_names_spec='$libname$shrext'
     ;;
diff --git a/configure.ac b/configure.ac
index 791da92..0e62e4b 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.1.0pre0], address@hidden)
+AC_INIT([GnuTLS], [3.1.0], address@hidden)
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 16a03aa..a8dfa6e 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -377,13 +377,12 @@ DISTCLEANFILES += $(ENUMS) stamp_enums stamp_functions
 
 stamp_functions: gnutls-api.texi x509-api.texi pgp-api.texi pkcs12-api.texi 
tpm-api.texi pkcs11-api.texi abstract-api.texi compat-api.texi dtls-api.texi 
crypto-api.texi ocsp-api.texi tpm-api.texi
        -mkdir functions
-       -mkdir functions.short
        for i in $^; do \
                $(srcdir)/scripts/split-texi.pl functions < $$i; \
        done
        sed -i 's/address@hidden//g' functions/*
        sed -i 's/address@hidden//g' functions/*
-       cd functions && for i in *;do grep ^"@deftypefun" $$i | sed 
's/@deftypefun/@item/g;s/ {/ @var{/;s/ {/ @ref{/' > ../functions.short/$$i;done
+       cd functions && for i in *;do grep ^"@deftypefun" $$i | sed 
's/@deftypefun/@item/g;s/ {/ @var{/;s/ {/ @ref{/' > ../functions/$$i.short;done
        echo $@ > $@
        $(MAKE) compare-makefile
 
@@ -410,7 +409,7 @@ compare-makefile: enums.texi
        FUNCS=`cat $(top_srcdir)/lib/includes/gnutls/*.h | 
$(top_srcdir)/doc/scripts/getfuncs.pl`; \
        MANS=""; \
        for i in $$FUNCS; do \
-               MANS="$$MANS\nFUNCS += functions/$$i"; \
+               MANS="$$MANS\nFUNCS += functions/$$i\nFUNCS += 
functions/$$i.short"; \
        done; \
        grep -v -e '^FUNCS += ' Makefile.am | \
                perl -p -e "s,^FUNCS =,FUNCS =$$MANS," > tmp-$@; \
@@ -504,752 +503,1504 @@ ENUMS += enums/gnutls_x509_subject_alt_name_t
 
 FUNCS =
 FUNCS += functions/gnutls_pubkey_init
+FUNCS += functions/gnutls_pubkey_init.short
 FUNCS += functions/gnutls_pubkey_deinit
+FUNCS += functions/gnutls_pubkey_deinit.short
 FUNCS += functions/gnutls_pubkey_set_pin_function
+FUNCS += functions/gnutls_pubkey_set_pin_function.short
 FUNCS += functions/gnutls_pubkey_get_pk_algorithm
+FUNCS += functions/gnutls_pubkey_get_pk_algorithm.short
 FUNCS += functions/gnutls_pubkey_import_x509
+FUNCS += functions/gnutls_pubkey_import_x509.short
 FUNCS += functions/gnutls_pubkey_import_pkcs11
+FUNCS += functions/gnutls_pubkey_import_pkcs11.short
 FUNCS += functions/gnutls_pubkey_import_openpgp
+FUNCS += functions/gnutls_pubkey_import_openpgp.short
 FUNCS += functions/gnutls_pubkey_import_privkey
+FUNCS += functions/gnutls_pubkey_import_privkey.short
 FUNCS += functions/gnutls_pubkey_import_tpm_url
+FUNCS += functions/gnutls_pubkey_import_tpm_url.short
 FUNCS += functions/gnutls_pubkey_import_url
+FUNCS += functions/gnutls_pubkey_import_url.short
 FUNCS += functions/gnutls_pubkey_import_tpm_raw
+FUNCS += functions/gnutls_pubkey_import_tpm_raw.short
 FUNCS += functions/gnutls_pubkey_get_preferred_hash_algorithm
+FUNCS += functions/gnutls_pubkey_get_preferred_hash_algorithm.short
 FUNCS += functions/gnutls_pubkey_get_pk_rsa_raw
+FUNCS += functions/gnutls_pubkey_get_pk_rsa_raw.short
 FUNCS += functions/gnutls_pubkey_get_pk_dsa_raw
+FUNCS += functions/gnutls_pubkey_get_pk_dsa_raw.short
 FUNCS += functions/gnutls_pubkey_get_pk_ecc_raw
+FUNCS += functions/gnutls_pubkey_get_pk_ecc_raw.short
 FUNCS += functions/gnutls_pubkey_get_pk_ecc_x962
+FUNCS += functions/gnutls_pubkey_get_pk_ecc_x962.short
 FUNCS += functions/gnutls_pubkey_export
+FUNCS += functions/gnutls_pubkey_export.short
 FUNCS += functions/gnutls_pubkey_get_key_id
+FUNCS += functions/gnutls_pubkey_get_key_id.short
 FUNCS += functions/gnutls_pubkey_get_openpgp_key_id
+FUNCS += functions/gnutls_pubkey_get_openpgp_key_id.short
 FUNCS += functions/gnutls_pubkey_get_key_usage
+FUNCS += functions/gnutls_pubkey_get_key_usage.short
 FUNCS += functions/gnutls_pubkey_set_key_usage
+FUNCS += functions/gnutls_pubkey_set_key_usage.short
 FUNCS += functions/gnutls_pubkey_import
+FUNCS += functions/gnutls_pubkey_import.short
 FUNCS += functions/gnutls_pubkey_import_pkcs11_url
+FUNCS += functions/gnutls_pubkey_import_pkcs11_url.short
 FUNCS += functions/gnutls_pubkey_import_dsa_raw
+FUNCS += functions/gnutls_pubkey_import_dsa_raw.short
 FUNCS += functions/gnutls_pubkey_import_rsa_raw
+FUNCS += functions/gnutls_pubkey_import_rsa_raw.short
 FUNCS += functions/gnutls_pubkey_import_ecc_x962
+FUNCS += functions/gnutls_pubkey_import_ecc_x962.short
 FUNCS += functions/gnutls_pubkey_import_ecc_raw
+FUNCS += functions/gnutls_pubkey_import_ecc_raw.short
 FUNCS += functions/gnutls_pubkey_encrypt_data
+FUNCS += functions/gnutls_pubkey_encrypt_data.short
 FUNCS += functions/gnutls_x509_crt_set_pubkey
+FUNCS += functions/gnutls_x509_crt_set_pubkey.short
 FUNCS += functions/gnutls_x509_crq_set_pubkey
+FUNCS += functions/gnutls_x509_crq_set_pubkey.short
 FUNCS += functions/gnutls_pubkey_verify_hash2
+FUNCS += functions/gnutls_pubkey_verify_hash2.short
 FUNCS += functions/gnutls_pubkey_get_verify_algorithm
+FUNCS += functions/gnutls_pubkey_get_verify_algorithm.short
 FUNCS += functions/gnutls_pubkey_verify_data2
+FUNCS += functions/gnutls_pubkey_verify_data2.short
 FUNCS += functions/gnutls_privkey_init
+FUNCS += functions/gnutls_privkey_init.short
 FUNCS += functions/gnutls_privkey_deinit
+FUNCS += functions/gnutls_privkey_deinit.short
 FUNCS += functions/gnutls_privkey_set_pin_function
+FUNCS += functions/gnutls_privkey_set_pin_function.short
 FUNCS += functions/gnutls_privkey_get_pk_algorithm
+FUNCS += functions/gnutls_privkey_get_pk_algorithm.short
 FUNCS += functions/gnutls_privkey_get_type
+FUNCS += functions/gnutls_privkey_get_type.short
 FUNCS += functions/gnutls_privkey_import_pkcs11
+FUNCS += functions/gnutls_privkey_import_pkcs11.short
 FUNCS += functions/gnutls_privkey_import_x509
+FUNCS += functions/gnutls_privkey_import_x509.short
 FUNCS += functions/gnutls_privkey_import_openpgp
+FUNCS += functions/gnutls_privkey_import_openpgp.short
 FUNCS += functions/gnutls_privkey_import_openpgp_raw
+FUNCS += functions/gnutls_privkey_import_openpgp_raw.short
 FUNCS += functions/gnutls_privkey_import_x509_raw
+FUNCS += functions/gnutls_privkey_import_x509_raw.short
 FUNCS += functions/gnutls_privkey_import_tpm_raw
+FUNCS += functions/gnutls_privkey_import_tpm_raw.short
 FUNCS += functions/gnutls_privkey_import_tpm_url
+FUNCS += functions/gnutls_privkey_import_tpm_url.short
 FUNCS += functions/gnutls_privkey_import_url
+FUNCS += functions/gnutls_privkey_import_url.short
 FUNCS += functions/gnutls_privkey_import_pkcs11_url
+FUNCS += functions/gnutls_privkey_import_pkcs11_url.short
 FUNCS += functions/gnutls_privkey_import_ext
+FUNCS += functions/gnutls_privkey_import_ext.short
 FUNCS += functions/gnutls_privkey_import_ext2
+FUNCS += functions/gnutls_privkey_import_ext2.short
 FUNCS += functions/gnutls_privkey_sign_data
+FUNCS += functions/gnutls_privkey_sign_data.short
 FUNCS += functions/gnutls_privkey_sign_hash
+FUNCS += functions/gnutls_privkey_sign_hash.short
 FUNCS += functions/gnutls_privkey_decrypt_data
+FUNCS += functions/gnutls_privkey_decrypt_data.short
 FUNCS += functions/gnutls_x509_crt_privkey_sign
+FUNCS += functions/gnutls_x509_crt_privkey_sign.short
 FUNCS += functions/gnutls_x509_crl_privkey_sign
+FUNCS += functions/gnutls_x509_crl_privkey_sign.short
 FUNCS += functions/gnutls_x509_crq_privkey_sign
+FUNCS += functions/gnutls_x509_crq_privkey_sign.short
 FUNCS += functions/gnutls_pcert_import_x509
+FUNCS += functions/gnutls_pcert_import_x509.short
 FUNCS += functions/gnutls_pcert_list_import_x509_raw
+FUNCS += functions/gnutls_pcert_list_import_x509_raw.short
 FUNCS += functions/gnutls_pcert_import_x509_raw
+FUNCS += functions/gnutls_pcert_import_x509_raw.short
 FUNCS += functions/gnutls_pcert_import_openpgp_raw
+FUNCS += functions/gnutls_pcert_import_openpgp_raw.short
 FUNCS += functions/gnutls_pcert_import_openpgp
+FUNCS += functions/gnutls_pcert_import_openpgp.short
 FUNCS += functions/gnutls_pcert_deinit
+FUNCS += functions/gnutls_pcert_deinit.short
 FUNCS += functions/gnutls_certificate_set_retrieve_function2
+FUNCS += functions/gnutls_certificate_set_retrieve_function2.short
 FUNCS += functions/gnutls_certificate_set_key
+FUNCS += functions/gnutls_certificate_set_key.short
 FUNCS += functions/gnutls_pubkey_verify_data
+FUNCS += functions/gnutls_pubkey_verify_data.short
 FUNCS += functions/gnutls_pubkey_verify_hash
+FUNCS += functions/gnutls_pubkey_verify_hash.short
 FUNCS += functions/gnutls_sign_callback_set
+FUNCS += functions/gnutls_sign_callback_set.short
 FUNCS += functions/gnutls_sign_callback_get
+FUNCS += functions/gnutls_sign_callback_get.short
 FUNCS += functions/gnutls_x509_privkey_sign_hash
+FUNCS += functions/gnutls_x509_privkey_sign_hash.short
 FUNCS += functions/gnutls_openpgp_privkey_sign_hash
+FUNCS += functions/gnutls_openpgp_privkey_sign_hash.short
 FUNCS += functions/gnutls_x509_privkey_sign_data
+FUNCS += functions/gnutls_x509_privkey_sign_data.short
 FUNCS += functions/gnutls_x509_crt_verify_data
+FUNCS += functions/gnutls_x509_crt_verify_data.short
 FUNCS += functions/gnutls_x509_crt_verify_hash
+FUNCS += functions/gnutls_x509_crt_verify_hash.short
 FUNCS += functions/gnutls_x509_crt_get_verify_algorithm
+FUNCS += functions/gnutls_x509_crt_get_verify_algorithm.short
 FUNCS += functions/gnutls_x509_crt_get_preferred_hash_algorithm
+FUNCS += functions/gnutls_x509_crt_get_preferred_hash_algorithm.short
 FUNCS += functions/gnutls_x509_crq_sign
+FUNCS += functions/gnutls_x509_crq_sign.short
 FUNCS += functions/gnutls_x509_crl_sign
+FUNCS += functions/gnutls_x509_crl_sign.short
 FUNCS += functions/gnutls_cipher_set_priority
+FUNCS += functions/gnutls_cipher_set_priority.short
 FUNCS += functions/gnutls_mac_set_priority
+FUNCS += functions/gnutls_mac_set_priority.short
 FUNCS += functions/gnutls_compression_set_priority
+FUNCS += functions/gnutls_compression_set_priority.short
 FUNCS += functions/gnutls_kx_set_priority
+FUNCS += functions/gnutls_kx_set_priority.short
 FUNCS += functions/gnutls_protocol_set_priority
+FUNCS += functions/gnutls_protocol_set_priority.short
 FUNCS += functions/gnutls_certificate_type_set_priority
+FUNCS += functions/gnutls_certificate_type_set_priority.short
 FUNCS += functions/gnutls_rsa_params_init
+FUNCS += functions/gnutls_rsa_params_init.short
 FUNCS += functions/gnutls_rsa_params_deinit
+FUNCS += functions/gnutls_rsa_params_deinit.short
 FUNCS += functions/gnutls_rsa_params_cpy
+FUNCS += functions/gnutls_rsa_params_cpy.short
 FUNCS += functions/gnutls_rsa_params_import_raw
+FUNCS += functions/gnutls_rsa_params_import_raw.short
 FUNCS += functions/gnutls_rsa_params_generate2
+FUNCS += functions/gnutls_rsa_params_generate2.short
 FUNCS += functions/gnutls_rsa_params_export_raw
+FUNCS += functions/gnutls_rsa_params_export_raw.short
 FUNCS += functions/gnutls_rsa_params_export_pkcs1
+FUNCS += functions/gnutls_rsa_params_export_pkcs1.short
 FUNCS += functions/gnutls_rsa_params_import_pkcs1
+FUNCS += functions/gnutls_rsa_params_import_pkcs1.short
 FUNCS += functions/gnutls_rsa_export_get_pubkey
+FUNCS += functions/gnutls_rsa_export_get_pubkey.short
 FUNCS += functions/gnutls_rsa_export_get_modulus_bits
+FUNCS += functions/gnutls_rsa_export_get_modulus_bits.short
 FUNCS += functions/gnutls_set_default_export_priority
+FUNCS += functions/gnutls_set_default_export_priority.short
 FUNCS += functions/gnutls_certificate_set_rsa_export_params
+FUNCS += functions/gnutls_certificate_set_rsa_export_params.short
 FUNCS += functions/gnutls_cipher_init
+FUNCS += functions/gnutls_cipher_init.short
 FUNCS += functions/gnutls_cipher_encrypt
+FUNCS += functions/gnutls_cipher_encrypt.short
 FUNCS += functions/gnutls_cipher_decrypt
+FUNCS += functions/gnutls_cipher_decrypt.short
 FUNCS += functions/gnutls_cipher_decrypt2
+FUNCS += functions/gnutls_cipher_decrypt2.short
 FUNCS += functions/gnutls_cipher_encrypt2
+FUNCS += functions/gnutls_cipher_encrypt2.short
 FUNCS += functions/gnutls_cipher_set_iv
+FUNCS += functions/gnutls_cipher_set_iv.short
 FUNCS += functions/gnutls_cipher_tag
+FUNCS += functions/gnutls_cipher_tag.short
 FUNCS += functions/gnutls_cipher_add_auth
+FUNCS += functions/gnutls_cipher_add_auth.short
 FUNCS += functions/gnutls_cipher_deinit
+FUNCS += functions/gnutls_cipher_deinit.short
 FUNCS += functions/gnutls_cipher_get_block_size
+FUNCS += functions/gnutls_cipher_get_block_size.short
 FUNCS += functions/gnutls_hmac_init
+FUNCS += functions/gnutls_hmac_init.short
 FUNCS += functions/gnutls_hmac
+FUNCS += functions/gnutls_hmac.short
 FUNCS += functions/gnutls_hmac_output
+FUNCS += functions/gnutls_hmac_output.short
 FUNCS += functions/gnutls_hmac_deinit
+FUNCS += functions/gnutls_hmac_deinit.short
 FUNCS += functions/gnutls_hmac_get_len
+FUNCS += functions/gnutls_hmac_get_len.short
 FUNCS += functions/gnutls_hmac_fast
+FUNCS += functions/gnutls_hmac_fast.short
 FUNCS += functions/gnutls_hash_init
+FUNCS += functions/gnutls_hash_init.short
 FUNCS += functions/gnutls_hash
+FUNCS += functions/gnutls_hash.short
 FUNCS += functions/gnutls_hash_output
+FUNCS += functions/gnutls_hash_output.short
 FUNCS += functions/gnutls_hash_deinit
+FUNCS += functions/gnutls_hash_deinit.short
 FUNCS += functions/gnutls_hash_get_len
+FUNCS += functions/gnutls_hash_get_len.short
 FUNCS += functions/gnutls_hash_fast
+FUNCS += functions/gnutls_hash_fast.short
 FUNCS += functions/gnutls_rnd
+FUNCS += functions/gnutls_rnd.short
 FUNCS += functions/gnutls_dtls_set_timeouts
+FUNCS += functions/gnutls_dtls_set_timeouts.short
 FUNCS += functions/gnutls_dtls_get_mtu
+FUNCS += functions/gnutls_dtls_get_mtu.short
 FUNCS += functions/gnutls_dtls_get_data_mtu
+FUNCS += functions/gnutls_dtls_get_data_mtu.short
 FUNCS += functions/gnutls_dtls_set_mtu
+FUNCS += functions/gnutls_dtls_set_mtu.short
 FUNCS += functions/gnutls_dtls_set_data_mtu
+FUNCS += functions/gnutls_dtls_set_data_mtu.short
 FUNCS += functions/gnutls_dtls_get_timeout
+FUNCS += functions/gnutls_dtls_get_timeout.short
 FUNCS += functions/gnutls_dtls_cookie_send
+FUNCS += functions/gnutls_dtls_cookie_send.short
 FUNCS += functions/gnutls_dtls_cookie_verify
+FUNCS += functions/gnutls_dtls_cookie_verify.short
 FUNCS += functions/gnutls_dtls_prestate_set
+FUNCS += functions/gnutls_dtls_prestate_set.short
 FUNCS += functions/gnutls_record_get_discarded
+FUNCS += functions/gnutls_record_get_discarded.short
 FUNCS += functions/gnutls_pk_algorithm_get_name
+FUNCS += functions/gnutls_pk_algorithm_get_name.short
 FUNCS += functions/gnutls_init
+FUNCS += functions/gnutls_init.short
 FUNCS += functions/gnutls_deinit
+FUNCS += functions/gnutls_deinit.short
 FUNCS += functions/gnutls_bye
+FUNCS += functions/gnutls_bye.short
 FUNCS += functions/gnutls_handshake
+FUNCS += functions/gnutls_handshake.short
+FUNCS += functions/gnutls_handshake_timeout
+FUNCS += functions/gnutls_handshake_timeout.short
 FUNCS += functions/gnutls_rehandshake
+FUNCS += functions/gnutls_rehandshake.short
 FUNCS += functions/gnutls_alert_get
+FUNCS += functions/gnutls_alert_get.short
 FUNCS += functions/gnutls_alert_send
+FUNCS += functions/gnutls_alert_send.short
 FUNCS += functions/gnutls_alert_send_appropriate
+FUNCS += functions/gnutls_alert_send_appropriate.short
 FUNCS += functions/gnutls_alert_get_name
+FUNCS += functions/gnutls_alert_get_name.short
 FUNCS += functions/gnutls_alert_get_strname
+FUNCS += functions/gnutls_alert_get_strname.short
 FUNCS += functions/gnutls_pk_bits_to_sec_param
+FUNCS += functions/gnutls_pk_bits_to_sec_param.short
 FUNCS += functions/gnutls_sec_param_get_name
+FUNCS += functions/gnutls_sec_param_get_name.short
 FUNCS += functions/gnutls_sec_param_to_pk_bits
+FUNCS += functions/gnutls_sec_param_to_pk_bits.short
 FUNCS += functions/gnutls_ecc_curve_get_name
+FUNCS += functions/gnutls_ecc_curve_get_name.short
 FUNCS += functions/gnutls_ecc_curve_get_size
+FUNCS += functions/gnutls_ecc_curve_get_size.short
 FUNCS += functions/gnutls_ecc_curve_get
+FUNCS += functions/gnutls_ecc_curve_get.short
 FUNCS += functions/gnutls_cipher_get
+FUNCS += functions/gnutls_cipher_get.short
 FUNCS += functions/gnutls_kx_get
+FUNCS += functions/gnutls_kx_get.short
 FUNCS += functions/gnutls_mac_get
+FUNCS += functions/gnutls_mac_get.short
 FUNCS += functions/gnutls_compression_get
+FUNCS += functions/gnutls_compression_get.short
 FUNCS += functions/gnutls_certificate_type_get
+FUNCS += functions/gnutls_certificate_type_get.short
 FUNCS += functions/gnutls_sign_algorithm_get_requested
+FUNCS += functions/gnutls_sign_algorithm_get_requested.short
 FUNCS += functions/gnutls_cipher_get_key_size
+FUNCS += functions/gnutls_cipher_get_key_size.short
 FUNCS += functions/gnutls_mac_get_key_size
+FUNCS += functions/gnutls_mac_get_key_size.short
 FUNCS += functions/gnutls_cipher_get_name
+FUNCS += functions/gnutls_cipher_get_name.short
 FUNCS += functions/gnutls_mac_get_name
+FUNCS += functions/gnutls_mac_get_name.short
 FUNCS += functions/gnutls_compression_get_name
+FUNCS += functions/gnutls_compression_get_name.short
 FUNCS += functions/gnutls_kx_get_name
+FUNCS += functions/gnutls_kx_get_name.short
 FUNCS += functions/gnutls_certificate_type_get_name
+FUNCS += functions/gnutls_certificate_type_get_name.short
 FUNCS += functions/gnutls_pk_get_name
+FUNCS += functions/gnutls_pk_get_name.short
 FUNCS += functions/gnutls_sign_get_name
+FUNCS += functions/gnutls_sign_get_name.short
 FUNCS += functions/gnutls_pk_to_sign
+FUNCS += functions/gnutls_pk_to_sign.short
 FUNCS += functions/gnutls_mac_get_id
+FUNCS += functions/gnutls_mac_get_id.short
 FUNCS += functions/gnutls_compression_get_id
+FUNCS += functions/gnutls_compression_get_id.short
 FUNCS += functions/gnutls_cipher_get_id
+FUNCS += functions/gnutls_cipher_get_id.short
 FUNCS += functions/gnutls_kx_get_id
+FUNCS += functions/gnutls_kx_get_id.short
 FUNCS += functions/gnutls_protocol_get_id
+FUNCS += functions/gnutls_protocol_get_id.short
 FUNCS += functions/gnutls_certificate_type_get_id
+FUNCS += functions/gnutls_certificate_type_get_id.short
 FUNCS += functions/gnutls_pk_get_id
+FUNCS += functions/gnutls_pk_get_id.short
 FUNCS += functions/gnutls_sign_get_id
+FUNCS += functions/gnutls_sign_get_id.short
 FUNCS += functions/gnutls_ecc_curve_list
+FUNCS += functions/gnutls_ecc_curve_list.short
 FUNCS += functions/gnutls_cipher_list
+FUNCS += functions/gnutls_cipher_list.short
 FUNCS += functions/gnutls_mac_list
+FUNCS += functions/gnutls_mac_list.short
 FUNCS += functions/gnutls_compression_list
+FUNCS += functions/gnutls_compression_list.short
 FUNCS += functions/gnutls_protocol_list
+FUNCS += functions/gnutls_protocol_list.short
 FUNCS += functions/gnutls_certificate_type_list
+FUNCS += functions/gnutls_certificate_type_list.short
 FUNCS += functions/gnutls_kx_list
+FUNCS += functions/gnutls_kx_list.short
 FUNCS += functions/gnutls_pk_list
+FUNCS += functions/gnutls_pk_list.short
 FUNCS += functions/gnutls_sign_list
+FUNCS += functions/gnutls_sign_list.short
 FUNCS += functions/gnutls_cipher_suite_info
+FUNCS += functions/gnutls_cipher_suite_info.short
 FUNCS += functions/gnutls_error_is_fatal
+FUNCS += functions/gnutls_error_is_fatal.short
 FUNCS += functions/gnutls_error_to_alert
+FUNCS += functions/gnutls_error_to_alert.short
 FUNCS += functions/gnutls_perror
+FUNCS += functions/gnutls_perror.short
 FUNCS += functions/gnutls_strerror
+FUNCS += functions/gnutls_strerror.short
 FUNCS += functions/gnutls_strerror_name
+FUNCS += functions/gnutls_strerror_name.short
 FUNCS += functions/gnutls_handshake_set_private_extensions
+FUNCS += functions/gnutls_handshake_set_private_extensions.short
 FUNCS += functions/gnutls_handshake_get_last_out
+FUNCS += functions/gnutls_handshake_get_last_out.short
 FUNCS += functions/gnutls_handshake_get_last_in
+FUNCS += functions/gnutls_handshake_get_last_in.short
 FUNCS += functions/gnutls_record_send
+FUNCS += functions/gnutls_record_send.short
 FUNCS += functions/gnutls_record_recv
+FUNCS += functions/gnutls_record_recv.short
 FUNCS += functions/gnutls_record_recv_seq
+FUNCS += functions/gnutls_record_recv_seq.short
 FUNCS += functions/gnutls_session_enable_compatibility_mode
+FUNCS += functions/gnutls_session_enable_compatibility_mode.short
 FUNCS += functions/gnutls_record_disable_padding
+FUNCS += functions/gnutls_record_disable_padding.short
 FUNCS += functions/gnutls_record_get_direction
+FUNCS += functions/gnutls_record_get_direction.short
 FUNCS += functions/gnutls_record_get_max_size
+FUNCS += functions/gnutls_record_get_max_size.short
 FUNCS += functions/gnutls_record_set_max_size
+FUNCS += functions/gnutls_record_set_max_size.short
 FUNCS += functions/gnutls_record_check_pending
+FUNCS += functions/gnutls_record_check_pending.short
 FUNCS += functions/gnutls_prf
+FUNCS += functions/gnutls_prf.short
 FUNCS += functions/gnutls_prf_raw
+FUNCS += functions/gnutls_prf_raw.short
 FUNCS += functions/gnutls_server_name_set
+FUNCS += functions/gnutls_server_name_set.short
 FUNCS += functions/gnutls_server_name_get
+FUNCS += functions/gnutls_server_name_get.short
 FUNCS += functions/gnutls_safe_renegotiation_status
+FUNCS += functions/gnutls_safe_renegotiation_status.short
 FUNCS += functions/gnutls_supplemental_get_name
+FUNCS += functions/gnutls_supplemental_get_name.short
 FUNCS += functions/gnutls_session_ticket_key_generate
+FUNCS += functions/gnutls_session_ticket_key_generate.short
 FUNCS += functions/gnutls_session_ticket_enable_client
+FUNCS += functions/gnutls_session_ticket_enable_client.short
 FUNCS += functions/gnutls_session_ticket_enable_server
+FUNCS += functions/gnutls_session_ticket_enable_server.short
 FUNCS += functions/gnutls_key_generate
+FUNCS += functions/gnutls_key_generate.short
 FUNCS += functions/gnutls_priority_init
+FUNCS += functions/gnutls_priority_init.short
 FUNCS += functions/gnutls_priority_deinit
+FUNCS += functions/gnutls_priority_deinit.short
 FUNCS += functions/gnutls_priority_get_cipher_suite_index
+FUNCS += functions/gnutls_priority_get_cipher_suite_index.short
 FUNCS += functions/gnutls_priority_set
+FUNCS += functions/gnutls_priority_set.short
 FUNCS += functions/gnutls_priority_set_direct
+FUNCS += functions/gnutls_priority_set_direct.short
 FUNCS += functions/gnutls_priority_certificate_type_list
+FUNCS += functions/gnutls_priority_certificate_type_list.short
 FUNCS += functions/gnutls_priority_sign_list
+FUNCS += functions/gnutls_priority_sign_list.short
 FUNCS += functions/gnutls_priority_protocol_list
+FUNCS += functions/gnutls_priority_protocol_list.short
 FUNCS += functions/gnutls_priority_compression_list
+FUNCS += functions/gnutls_priority_compression_list.short
 FUNCS += functions/gnutls_priority_ecc_curve_list
+FUNCS += functions/gnutls_priority_ecc_curve_list.short
 FUNCS += functions/gnutls_set_default_priority
+FUNCS += functions/gnutls_set_default_priority.short
 FUNCS += functions/gnutls_cipher_suite_get_name
+FUNCS += functions/gnutls_cipher_suite_get_name.short
 FUNCS += functions/gnutls_protocol_get_version
+FUNCS += functions/gnutls_protocol_get_version.short
 FUNCS += functions/gnutls_protocol_get_name
+FUNCS += functions/gnutls_protocol_get_name.short
 FUNCS += functions/gnutls_session_set_data
+FUNCS += functions/gnutls_session_set_data.short
 FUNCS += functions/gnutls_session_get_data
+FUNCS += functions/gnutls_session_get_data.short
 FUNCS += functions/gnutls_session_get_data2
+FUNCS += functions/gnutls_session_get_data2.short
 FUNCS += functions/gnutls_session_get_random
+FUNCS += functions/gnutls_session_get_random.short
 FUNCS += functions/gnutls_session_set_premaster
+FUNCS += functions/gnutls_session_set_premaster.short
 FUNCS += functions/gnutls_session_get_id
+FUNCS += functions/gnutls_session_get_id.short
 FUNCS += functions/gnutls_session_channel_binding
+FUNCS += functions/gnutls_session_channel_binding.short
 FUNCS += functions/gnutls_session_is_resumed
+FUNCS += functions/gnutls_session_is_resumed.short
 FUNCS += functions/gnutls_session_resumption_requested
+FUNCS += functions/gnutls_session_resumption_requested.short
 FUNCS += functions/gnutls_db_set_cache_expiration
+FUNCS += functions/gnutls_db_set_cache_expiration.short
 FUNCS += functions/gnutls_db_remove_session
+FUNCS += functions/gnutls_db_remove_session.short
 FUNCS += functions/gnutls_db_set_retrieve_function
+FUNCS += functions/gnutls_db_set_retrieve_function.short
 FUNCS += functions/gnutls_db_set_remove_function
+FUNCS += functions/gnutls_db_set_remove_function.short
 FUNCS += functions/gnutls_db_set_store_function
+FUNCS += functions/gnutls_db_set_store_function.short
 FUNCS += functions/gnutls_db_set_ptr
+FUNCS += functions/gnutls_db_set_ptr.short
 FUNCS += functions/gnutls_db_get_ptr
+FUNCS += functions/gnutls_db_get_ptr.short
 FUNCS += functions/gnutls_db_check_entry
+FUNCS += functions/gnutls_db_check_entry.short
 FUNCS += functions/gnutls_handshake_set_post_client_hello_function
+FUNCS += functions/gnutls_handshake_set_post_client_hello_function.short
 FUNCS += functions/gnutls_handshake_set_max_packet_length
+FUNCS += functions/gnutls_handshake_set_max_packet_length.short
 FUNCS += functions/gnutls_check_version
+FUNCS += functions/gnutls_check_version.short
 FUNCS += functions/gnutls_credentials_clear
+FUNCS += functions/gnutls_credentials_clear.short
 FUNCS += functions/gnutls_credentials_set
+FUNCS += functions/gnutls_credentials_set.short
 FUNCS += functions/gnutls_anon_free_server_credentials
+FUNCS += functions/gnutls_anon_free_server_credentials.short
 FUNCS += functions/gnutls_anon_allocate_server_credentials
+FUNCS += functions/gnutls_anon_allocate_server_credentials.short
 FUNCS += functions/gnutls_anon_set_server_dh_params
+FUNCS += functions/gnutls_anon_set_server_dh_params.short
 FUNCS += functions/gnutls_anon_set_server_params_function
+FUNCS += functions/gnutls_anon_set_server_params_function.short
 FUNCS += functions/gnutls_anon_free_client_credentials
+FUNCS += functions/gnutls_anon_free_client_credentials.short
 FUNCS += functions/gnutls_anon_allocate_client_credentials
+FUNCS += functions/gnutls_anon_allocate_client_credentials.short
 FUNCS += functions/gnutls_certificate_free_credentials
+FUNCS += functions/gnutls_certificate_free_credentials.short
 FUNCS += functions/gnutls_certificate_allocate_credentials
+FUNCS += functions/gnutls_certificate_allocate_credentials.short
 FUNCS += functions/gnutls_certificate_get_issuer
+FUNCS += functions/gnutls_certificate_get_issuer.short
 FUNCS += functions/gnutls_certificate_free_keys
+FUNCS += functions/gnutls_certificate_free_keys.short
 FUNCS += functions/gnutls_certificate_free_cas
+FUNCS += functions/gnutls_certificate_free_cas.short
 FUNCS += functions/gnutls_certificate_free_ca_names
+FUNCS += functions/gnutls_certificate_free_ca_names.short
 FUNCS += functions/gnutls_certificate_free_crls
+FUNCS += functions/gnutls_certificate_free_crls.short
 FUNCS += functions/gnutls_certificate_set_dh_params
+FUNCS += functions/gnutls_certificate_set_dh_params.short
 FUNCS += functions/gnutls_certificate_set_verify_flags
+FUNCS += functions/gnutls_certificate_set_verify_flags.short
 FUNCS += functions/gnutls_certificate_set_verify_limits
+FUNCS += functions/gnutls_certificate_set_verify_limits.short
 FUNCS += functions/gnutls_certificate_set_x509_system_trust
+FUNCS += functions/gnutls_certificate_set_x509_system_trust.short
 FUNCS += functions/gnutls_certificate_set_x509_trust_file
+FUNCS += functions/gnutls_certificate_set_x509_trust_file.short
 FUNCS += functions/gnutls_certificate_set_x509_trust_mem
+FUNCS += functions/gnutls_certificate_set_x509_trust_mem.short
 FUNCS += functions/gnutls_certificate_set_x509_crl_file
+FUNCS += functions/gnutls_certificate_set_x509_crl_file.short
 FUNCS += functions/gnutls_certificate_set_x509_crl_mem
+FUNCS += functions/gnutls_certificate_set_x509_crl_mem.short
 FUNCS += functions/gnutls_certificate_set_x509_key_file
+FUNCS += functions/gnutls_certificate_set_x509_key_file.short
 FUNCS += functions/gnutls_certificate_set_x509_key_mem
+FUNCS += functions/gnutls_certificate_set_x509_key_mem.short
 FUNCS += functions/gnutls_certificate_send_x509_rdn_sequence
+FUNCS += functions/gnutls_certificate_send_x509_rdn_sequence.short
 FUNCS += functions/gnutls_certificate_set_x509_simple_pkcs12_file
+FUNCS += functions/gnutls_certificate_set_x509_simple_pkcs12_file.short
 FUNCS += functions/gnutls_certificate_set_x509_simple_pkcs12_mem
+FUNCS += functions/gnutls_certificate_set_x509_simple_pkcs12_mem.short
 FUNCS += functions/gnutls_certificate_set_x509_key
+FUNCS += functions/gnutls_certificate_set_x509_key.short
 FUNCS += functions/gnutls_certificate_set_x509_trust
+FUNCS += functions/gnutls_certificate_set_x509_trust.short
 FUNCS += functions/gnutls_certificate_set_x509_crl
+FUNCS += functions/gnutls_certificate_set_x509_crl.short
 FUNCS += functions/gnutls_global_init
+FUNCS += functions/gnutls_global_init.short
 FUNCS += functions/gnutls_global_deinit
+FUNCS += functions/gnutls_global_deinit.short
 FUNCS += functions/gnutls_global_set_mutex
+FUNCS += functions/gnutls_global_set_mutex.short
 FUNCS += functions/gnutls_global_set_mem_functions
+FUNCS += functions/gnutls_global_set_mem_functions.short
 FUNCS += functions/gnutls_global_set_time_function
+FUNCS += functions/gnutls_global_set_time_function.short
 FUNCS += functions/gnutls_global_set_log_function
+FUNCS += functions/gnutls_global_set_log_function.short
 FUNCS += functions/gnutls_global_set_audit_log_function
+FUNCS += functions/gnutls_global_set_audit_log_function.short
 FUNCS += functions/gnutls_global_set_log_level
+FUNCS += functions/gnutls_global_set_log_level.short
 FUNCS += functions/gnutls_dh_params_init
+FUNCS += functions/gnutls_dh_params_init.short
 FUNCS += functions/gnutls_dh_params_deinit
+FUNCS += functions/gnutls_dh_params_deinit.short
 FUNCS += functions/gnutls_dh_params_import_raw
+FUNCS += functions/gnutls_dh_params_import_raw.short
 FUNCS += functions/gnutls_dh_params_import_pkcs3
+FUNCS += functions/gnutls_dh_params_import_pkcs3.short
 FUNCS += functions/gnutls_dh_params_generate2
+FUNCS += functions/gnutls_dh_params_generate2.short
 FUNCS += functions/gnutls_dh_params_export_pkcs3
+FUNCS += functions/gnutls_dh_params_export_pkcs3.short
 FUNCS += functions/gnutls_dh_params_export_raw
+FUNCS += functions/gnutls_dh_params_export_raw.short
 FUNCS += functions/gnutls_dh_params_cpy
+FUNCS += functions/gnutls_dh_params_cpy.short
 FUNCS += functions/gnutls_transport_set_ptr
+FUNCS += functions/gnutls_transport_set_ptr.short
 FUNCS += functions/gnutls_transport_set_ptr2
+FUNCS += functions/gnutls_transport_set_ptr2.short
 FUNCS += functions/gnutls_transport_get_ptr
+FUNCS += functions/gnutls_transport_get_ptr.short
 FUNCS += functions/gnutls_transport_get_ptr2
+FUNCS += functions/gnutls_transport_get_ptr2.short
 FUNCS += functions/gnutls_transport_set_vec_push_function
+FUNCS += functions/gnutls_transport_set_vec_push_function.short
 FUNCS += functions/gnutls_transport_set_push_function
+FUNCS += functions/gnutls_transport_set_push_function.short
 FUNCS += functions/gnutls_transport_set_pull_function
+FUNCS += functions/gnutls_transport_set_pull_function.short
 FUNCS += functions/gnutls_transport_set_pull_timeout_function
+FUNCS += functions/gnutls_transport_set_pull_timeout_function.short
 FUNCS += functions/gnutls_transport_set_errno_function
+FUNCS += functions/gnutls_transport_set_errno_function.short
 FUNCS += functions/gnutls_transport_set_errno
+FUNCS += functions/gnutls_transport_set_errno.short
 FUNCS += functions/gnutls_session_set_ptr
+FUNCS += functions/gnutls_session_set_ptr.short
 FUNCS += functions/gnutls_session_get_ptr
+FUNCS += functions/gnutls_session_get_ptr.short
 FUNCS += functions/gnutls_openpgp_send_cert
+FUNCS += functions/gnutls_openpgp_send_cert.short
 FUNCS += functions/gnutls_fingerprint
+FUNCS += functions/gnutls_fingerprint.short
 FUNCS += functions/gnutls_random_art
+FUNCS += functions/gnutls_random_art.short
 FUNCS += functions/gnutls_srp_free_client_credentials
+FUNCS += functions/gnutls_srp_free_client_credentials.short
 FUNCS += functions/gnutls_srp_allocate_client_credentials
+FUNCS += functions/gnutls_srp_allocate_client_credentials.short
 FUNCS += functions/gnutls_srp_set_client_credentials
+FUNCS += functions/gnutls_srp_set_client_credentials.short
 FUNCS += functions/gnutls_srp_free_server_credentials
+FUNCS += functions/gnutls_srp_free_server_credentials.short
 FUNCS += functions/gnutls_srp_allocate_server_credentials
+FUNCS += functions/gnutls_srp_allocate_server_credentials.short
 FUNCS += functions/gnutls_srp_set_server_credentials_file
+FUNCS += functions/gnutls_srp_set_server_credentials_file.short
 FUNCS += functions/gnutls_srp_server_get_username
+FUNCS += functions/gnutls_srp_server_get_username.short
 FUNCS += functions/gnutls_srp_set_prime_bits
+FUNCS += functions/gnutls_srp_set_prime_bits.short
 FUNCS += functions/gnutls_srp_verifier
+FUNCS += functions/gnutls_srp_verifier.short
 FUNCS += functions/gnutls_srp_set_server_credentials_function
+FUNCS += functions/gnutls_srp_set_server_credentials_function.short
 FUNCS += functions/gnutls_srp_set_client_credentials_function
+FUNCS += functions/gnutls_srp_set_client_credentials_function.short
 FUNCS += functions/gnutls_srp_base64_encode
+FUNCS += functions/gnutls_srp_base64_encode.short
 FUNCS += functions/gnutls_srp_base64_encode_alloc
+FUNCS += functions/gnutls_srp_base64_encode_alloc.short
 FUNCS += functions/gnutls_srp_base64_decode
+FUNCS += functions/gnutls_srp_base64_decode.short
 FUNCS += functions/gnutls_srp_base64_decode_alloc
+FUNCS += functions/gnutls_srp_base64_decode_alloc.short
 FUNCS += functions/gnutls_psk_free_client_credentials
+FUNCS += functions/gnutls_psk_free_client_credentials.short
 FUNCS += functions/gnutls_psk_allocate_client_credentials
+FUNCS += functions/gnutls_psk_allocate_client_credentials.short
 FUNCS += functions/gnutls_psk_set_client_credentials
+FUNCS += functions/gnutls_psk_set_client_credentials.short
 FUNCS += functions/gnutls_psk_free_server_credentials
+FUNCS += functions/gnutls_psk_free_server_credentials.short
 FUNCS += functions/gnutls_psk_allocate_server_credentials
+FUNCS += functions/gnutls_psk_allocate_server_credentials.short
 FUNCS += functions/gnutls_psk_set_server_credentials_file
+FUNCS += functions/gnutls_psk_set_server_credentials_file.short
 FUNCS += functions/gnutls_psk_set_server_credentials_hint
+FUNCS += functions/gnutls_psk_set_server_credentials_hint.short
 FUNCS += functions/gnutls_psk_server_get_username
+FUNCS += functions/gnutls_psk_server_get_username.short
 FUNCS += functions/gnutls_psk_client_get_hint
+FUNCS += functions/gnutls_psk_client_get_hint.short
 FUNCS += functions/gnutls_psk_set_server_credentials_function
+FUNCS += functions/gnutls_psk_set_server_credentials_function.short
 FUNCS += functions/gnutls_psk_set_client_credentials_function
+FUNCS += functions/gnutls_psk_set_client_credentials_function.short
 FUNCS += functions/gnutls_hex_encode
+FUNCS += functions/gnutls_hex_encode.short
 FUNCS += functions/gnutls_hex_decode
+FUNCS += functions/gnutls_hex_decode.short
 FUNCS += functions/gnutls_psk_set_server_dh_params
+FUNCS += functions/gnutls_psk_set_server_dh_params.short
 FUNCS += functions/gnutls_psk_set_server_params_function
+FUNCS += functions/gnutls_psk_set_server_params_function.short
 FUNCS += functions/gnutls_auth_get_type
+FUNCS += functions/gnutls_auth_get_type.short
 FUNCS += functions/gnutls_auth_server_get_type
+FUNCS += functions/gnutls_auth_server_get_type.short
 FUNCS += functions/gnutls_auth_client_get_type
+FUNCS += functions/gnutls_auth_client_get_type.short
 FUNCS += functions/gnutls_dh_set_prime_bits
+FUNCS += functions/gnutls_dh_set_prime_bits.short
 FUNCS += functions/gnutls_dh_get_secret_bits
+FUNCS += functions/gnutls_dh_get_secret_bits.short
 FUNCS += functions/gnutls_dh_get_peers_public_bits
+FUNCS += functions/gnutls_dh_get_peers_public_bits.short
 FUNCS += functions/gnutls_dh_get_prime_bits
+FUNCS += functions/gnutls_dh_get_prime_bits.short
 FUNCS += functions/gnutls_dh_get_group
+FUNCS += functions/gnutls_dh_get_group.short
 FUNCS += functions/gnutls_dh_get_pubkey
+FUNCS += functions/gnutls_dh_get_pubkey.short
 FUNCS += functions/gnutls_certificate_set_retrieve_function
+FUNCS += functions/gnutls_certificate_set_retrieve_function.short
 FUNCS += functions/gnutls_certificate_set_verify_function
+FUNCS += functions/gnutls_certificate_set_verify_function.short
 FUNCS += functions/gnutls_certificate_server_set_request
+FUNCS += functions/gnutls_certificate_server_set_request.short
 FUNCS += functions/gnutls_certificate_get_peers
+FUNCS += functions/gnutls_certificate_get_peers.short
 FUNCS += functions/gnutls_certificate_get_ours
+FUNCS += functions/gnutls_certificate_get_ours.short
 FUNCS += functions/gnutls_certificate_activation_time_peers
+FUNCS += functions/gnutls_certificate_activation_time_peers.short
 FUNCS += functions/gnutls_certificate_expiration_time_peers
+FUNCS += functions/gnutls_certificate_expiration_time_peers.short
 FUNCS += functions/gnutls_certificate_client_get_request_status
+FUNCS += functions/gnutls_certificate_client_get_request_status.short
 FUNCS += functions/gnutls_certificate_verify_peers2
+FUNCS += functions/gnutls_certificate_verify_peers2.short
 FUNCS += functions/gnutls_pem_base64_encode
+FUNCS += functions/gnutls_pem_base64_encode.short
 FUNCS += functions/gnutls_pem_base64_decode
+FUNCS += functions/gnutls_pem_base64_decode.short
 FUNCS += functions/gnutls_pem_base64_encode_alloc
+FUNCS += functions/gnutls_pem_base64_encode_alloc.short
 FUNCS += functions/gnutls_pem_base64_decode_alloc
+FUNCS += functions/gnutls_pem_base64_decode_alloc.short
 FUNCS += functions/gnutls_certificate_set_params_function
+FUNCS += functions/gnutls_certificate_set_params_function.short
 FUNCS += functions/gnutls_anon_set_params_function
+FUNCS += functions/gnutls_anon_set_params_function.short
 FUNCS += functions/gnutls_psk_set_params_function
+FUNCS += functions/gnutls_psk_set_params_function.short
 FUNCS += functions/gnutls_hex2bin
+FUNCS += functions/gnutls_hex2bin.short
 FUNCS += functions/gnutls_tdb_init
+FUNCS += functions/gnutls_tdb_init.short
 FUNCS += functions/gnutls_tdb_set_store_func
+FUNCS += functions/gnutls_tdb_set_store_func.short
 FUNCS += functions/gnutls_tdb_set_store_commitment_func
+FUNCS += functions/gnutls_tdb_set_store_commitment_func.short
 FUNCS += functions/gnutls_tdb_set_verify_func
+FUNCS += functions/gnutls_tdb_set_verify_func.short
 FUNCS += functions/gnutls_tdb_deinit
+FUNCS += functions/gnutls_tdb_deinit.short
 FUNCS += functions/gnutls_verify_stored_pubkey
+FUNCS += functions/gnutls_verify_stored_pubkey.short
 FUNCS += functions/gnutls_store_commitment
+FUNCS += functions/gnutls_store_commitment.short
 FUNCS += functions/gnutls_store_pubkey
+FUNCS += functions/gnutls_store_pubkey.short
 FUNCS += functions/gnutls_load_file
+FUNCS += functions/gnutls_load_file.short
 FUNCS += functions/gnutls_url_is_supported
+FUNCS += functions/gnutls_url_is_supported.short
 FUNCS += functions/gnutls_certificate_set_pin_function
+FUNCS += functions/gnutls_certificate_set_pin_function.short
 FUNCS += functions/gnutls_ocsp_req_init
+FUNCS += functions/gnutls_ocsp_req_init.short
 FUNCS += functions/gnutls_ocsp_req_deinit
+FUNCS += functions/gnutls_ocsp_req_deinit.short
 FUNCS += functions/gnutls_ocsp_req_import
+FUNCS += functions/gnutls_ocsp_req_import.short
 FUNCS += functions/gnutls_ocsp_req_export
+FUNCS += functions/gnutls_ocsp_req_export.short
 FUNCS += functions/gnutls_ocsp_req_print
+FUNCS += functions/gnutls_ocsp_req_print.short
 FUNCS += functions/gnutls_ocsp_req_get_version
+FUNCS += functions/gnutls_ocsp_req_get_version.short
 FUNCS += functions/gnutls_ocsp_req_get_cert_id
+FUNCS += functions/gnutls_ocsp_req_get_cert_id.short
 FUNCS += functions/gnutls_ocsp_req_add_cert_id
+FUNCS += functions/gnutls_ocsp_req_add_cert_id.short
 FUNCS += functions/gnutls_ocsp_req_add_cert
+FUNCS += functions/gnutls_ocsp_req_add_cert.short
 FUNCS += functions/gnutls_ocsp_req_get_extension
+FUNCS += functions/gnutls_ocsp_req_get_extension.short
 FUNCS += functions/gnutls_ocsp_req_set_extension
+FUNCS += functions/gnutls_ocsp_req_set_extension.short
 FUNCS += functions/gnutls_ocsp_req_get_nonce
+FUNCS += functions/gnutls_ocsp_req_get_nonce.short
 FUNCS += functions/gnutls_ocsp_req_set_nonce
+FUNCS += functions/gnutls_ocsp_req_set_nonce.short
 FUNCS += functions/gnutls_ocsp_req_randomize_nonce
+FUNCS += functions/gnutls_ocsp_req_randomize_nonce.short
 FUNCS += functions/gnutls_ocsp_resp_init
+FUNCS += functions/gnutls_ocsp_resp_init.short
 FUNCS += functions/gnutls_ocsp_resp_deinit
+FUNCS += functions/gnutls_ocsp_resp_deinit.short
 FUNCS += functions/gnutls_ocsp_resp_import
+FUNCS += functions/gnutls_ocsp_resp_import.short
 FUNCS += functions/gnutls_ocsp_resp_export
+FUNCS += functions/gnutls_ocsp_resp_export.short
 FUNCS += functions/gnutls_ocsp_resp_print
+FUNCS += functions/gnutls_ocsp_resp_print.short
 FUNCS += functions/gnutls_ocsp_resp_get_status
+FUNCS += functions/gnutls_ocsp_resp_get_status.short
 FUNCS += functions/gnutls_ocsp_resp_get_response
+FUNCS += functions/gnutls_ocsp_resp_get_response.short
 FUNCS += functions/gnutls_ocsp_resp_get_version
+FUNCS += functions/gnutls_ocsp_resp_get_version.short
 FUNCS += functions/gnutls_ocsp_resp_get_responder
+FUNCS += functions/gnutls_ocsp_resp_get_responder.short
 FUNCS += functions/gnutls_ocsp_resp_get_produced
+FUNCS += functions/gnutls_ocsp_resp_get_produced.short
 FUNCS += functions/gnutls_ocsp_resp_get_single
+FUNCS += functions/gnutls_ocsp_resp_get_single.short
 FUNCS += functions/gnutls_ocsp_resp_get_extension
+FUNCS += functions/gnutls_ocsp_resp_get_extension.short
 FUNCS += functions/gnutls_ocsp_resp_get_nonce
+FUNCS += functions/gnutls_ocsp_resp_get_nonce.short
 FUNCS += functions/gnutls_ocsp_resp_get_signature_algorithm
+FUNCS += functions/gnutls_ocsp_resp_get_signature_algorithm.short
 FUNCS += functions/gnutls_ocsp_resp_get_signature
+FUNCS += functions/gnutls_ocsp_resp_get_signature.short
 FUNCS += functions/gnutls_ocsp_resp_get_certs
+FUNCS += functions/gnutls_ocsp_resp_get_certs.short
 FUNCS += functions/gnutls_ocsp_resp_verify_direct
+FUNCS += functions/gnutls_ocsp_resp_verify_direct.short
 FUNCS += functions/gnutls_ocsp_resp_verify
+FUNCS += functions/gnutls_ocsp_resp_verify.short
 FUNCS += functions/gnutls_openpgp_crt_init
+FUNCS += functions/gnutls_openpgp_crt_init.short
 FUNCS += functions/gnutls_openpgp_crt_deinit
+FUNCS += functions/gnutls_openpgp_crt_deinit.short
 FUNCS += functions/gnutls_openpgp_crt_import
+FUNCS += functions/gnutls_openpgp_crt_import.short
 FUNCS += functions/gnutls_openpgp_crt_export
+FUNCS += functions/gnutls_openpgp_crt_export.short
 FUNCS += functions/gnutls_openpgp_crt_print
+FUNCS += functions/gnutls_openpgp_crt_print.short
 FUNCS += functions/gnutls_openpgp_crt_get_key_usage
+FUNCS += functions/gnutls_openpgp_crt_get_key_usage.short
 FUNCS += functions/gnutls_openpgp_crt_get_fingerprint
+FUNCS += functions/gnutls_openpgp_crt_get_fingerprint.short
 FUNCS += functions/gnutls_openpgp_crt_get_subkey_fingerprint
+FUNCS += functions/gnutls_openpgp_crt_get_subkey_fingerprint.short
 FUNCS += functions/gnutls_openpgp_crt_get_name
+FUNCS += functions/gnutls_openpgp_crt_get_name.short
 FUNCS += functions/gnutls_openpgp_crt_get_pk_algorithm
+FUNCS += functions/gnutls_openpgp_crt_get_pk_algorithm.short
 FUNCS += functions/gnutls_openpgp_crt_get_version
+FUNCS += functions/gnutls_openpgp_crt_get_version.short
 FUNCS += functions/gnutls_openpgp_crt_get_creation_time
+FUNCS += functions/gnutls_openpgp_crt_get_creation_time.short
 FUNCS += functions/gnutls_openpgp_crt_get_expiration_time
+FUNCS += functions/gnutls_openpgp_crt_get_expiration_time.short
 FUNCS += functions/gnutls_openpgp_crt_get_key_id
+FUNCS += functions/gnutls_openpgp_crt_get_key_id.short
 FUNCS += functions/gnutls_openpgp_crt_check_hostname
+FUNCS += functions/gnutls_openpgp_crt_check_hostname.short
 FUNCS += functions/gnutls_openpgp_crt_get_revoked_status
+FUNCS += functions/gnutls_openpgp_crt_get_revoked_status.short
 FUNCS += functions/gnutls_openpgp_crt_get_subkey_count
+FUNCS += functions/gnutls_openpgp_crt_get_subkey_count.short
 FUNCS += functions/gnutls_openpgp_crt_get_subkey_idx
+FUNCS += functions/gnutls_openpgp_crt_get_subkey_idx.short
 FUNCS += functions/gnutls_openpgp_crt_get_subkey_revoked_status
+FUNCS += functions/gnutls_openpgp_crt_get_subkey_revoked_status.short
 FUNCS += functions/gnutls_openpgp_crt_get_subkey_pk_algorithm
+FUNCS += functions/gnutls_openpgp_crt_get_subkey_pk_algorithm.short
 FUNCS += functions/gnutls_openpgp_crt_get_subkey_creation_time
+FUNCS += functions/gnutls_openpgp_crt_get_subkey_creation_time.short
 FUNCS += functions/gnutls_openpgp_crt_get_subkey_expiration_time
+FUNCS += functions/gnutls_openpgp_crt_get_subkey_expiration_time.short
 FUNCS += functions/gnutls_openpgp_crt_get_subkey_id
+FUNCS += functions/gnutls_openpgp_crt_get_subkey_id.short
 FUNCS += functions/gnutls_openpgp_crt_get_subkey_usage
+FUNCS += functions/gnutls_openpgp_crt_get_subkey_usage.short
 FUNCS += functions/gnutls_openpgp_crt_get_subkey_pk_dsa_raw
+FUNCS += functions/gnutls_openpgp_crt_get_subkey_pk_dsa_raw.short
 FUNCS += functions/gnutls_openpgp_crt_get_subkey_pk_rsa_raw
+FUNCS += functions/gnutls_openpgp_crt_get_subkey_pk_rsa_raw.short
 FUNCS += functions/gnutls_openpgp_crt_get_pk_dsa_raw
+FUNCS += functions/gnutls_openpgp_crt_get_pk_dsa_raw.short
 FUNCS += functions/gnutls_openpgp_crt_get_pk_rsa_raw
+FUNCS += functions/gnutls_openpgp_crt_get_pk_rsa_raw.short
 FUNCS += functions/gnutls_openpgp_crt_get_preferred_key_id
+FUNCS += functions/gnutls_openpgp_crt_get_preferred_key_id.short
 FUNCS += functions/gnutls_openpgp_crt_set_preferred_key_id
+FUNCS += functions/gnutls_openpgp_crt_set_preferred_key_id.short
 FUNCS += functions/gnutls_openpgp_privkey_init
+FUNCS += functions/gnutls_openpgp_privkey_init.short
 FUNCS += functions/gnutls_openpgp_privkey_deinit
+FUNCS += functions/gnutls_openpgp_privkey_deinit.short
 FUNCS += functions/gnutls_openpgp_privkey_get_pk_algorithm
+FUNCS += functions/gnutls_openpgp_privkey_get_pk_algorithm.short
 FUNCS += functions/gnutls_openpgp_privkey_sec_param
+FUNCS += functions/gnutls_openpgp_privkey_sec_param.short
 FUNCS += functions/gnutls_openpgp_privkey_import
+FUNCS += functions/gnutls_openpgp_privkey_import.short
 FUNCS += functions/gnutls_openpgp_privkey_get_fingerprint
+FUNCS += functions/gnutls_openpgp_privkey_get_fingerprint.short
 FUNCS += functions/gnutls_openpgp_privkey_get_subkey_fingerprint
+FUNCS += functions/gnutls_openpgp_privkey_get_subkey_fingerprint.short
 FUNCS += functions/gnutls_openpgp_privkey_get_key_id
+FUNCS += functions/gnutls_openpgp_privkey_get_key_id.short
 FUNCS += functions/gnutls_openpgp_privkey_get_subkey_count
+FUNCS += functions/gnutls_openpgp_privkey_get_subkey_count.short
 FUNCS += functions/gnutls_openpgp_privkey_get_subkey_idx
+FUNCS += functions/gnutls_openpgp_privkey_get_subkey_idx.short
 FUNCS += functions/gnutls_openpgp_privkey_get_subkey_revoked_status
+FUNCS += functions/gnutls_openpgp_privkey_get_subkey_revoked_status.short
 FUNCS += functions/gnutls_openpgp_privkey_get_revoked_status
+FUNCS += functions/gnutls_openpgp_privkey_get_revoked_status.short
 FUNCS += functions/gnutls_openpgp_privkey_get_subkey_pk_algorithm
+FUNCS += functions/gnutls_openpgp_privkey_get_subkey_pk_algorithm.short
 FUNCS += functions/gnutls_openpgp_privkey_get_subkey_id
+FUNCS += functions/gnutls_openpgp_privkey_get_subkey_id.short
 FUNCS += functions/gnutls_openpgp_privkey_get_subkey_creation_time
+FUNCS += functions/gnutls_openpgp_privkey_get_subkey_creation_time.short
 FUNCS += functions/gnutls_openpgp_privkey_export_subkey_dsa_raw
+FUNCS += functions/gnutls_openpgp_privkey_export_subkey_dsa_raw.short
 FUNCS += functions/gnutls_openpgp_privkey_export_subkey_rsa_raw
+FUNCS += functions/gnutls_openpgp_privkey_export_subkey_rsa_raw.short
 FUNCS += functions/gnutls_openpgp_privkey_export_dsa_raw
+FUNCS += functions/gnutls_openpgp_privkey_export_dsa_raw.short
 FUNCS += functions/gnutls_openpgp_privkey_export_rsa_raw
+FUNCS += functions/gnutls_openpgp_privkey_export_rsa_raw.short
 FUNCS += functions/gnutls_openpgp_privkey_export
+FUNCS += functions/gnutls_openpgp_privkey_export.short
 FUNCS += functions/gnutls_openpgp_privkey_set_preferred_key_id
+FUNCS += functions/gnutls_openpgp_privkey_set_preferred_key_id.short
 FUNCS += functions/gnutls_openpgp_privkey_get_preferred_key_id
+FUNCS += functions/gnutls_openpgp_privkey_get_preferred_key_id.short
 FUNCS += functions/gnutls_openpgp_crt_get_auth_subkey
+FUNCS += functions/gnutls_openpgp_crt_get_auth_subkey.short
 FUNCS += functions/gnutls_openpgp_keyring_init
+FUNCS += functions/gnutls_openpgp_keyring_init.short
 FUNCS += functions/gnutls_openpgp_keyring_deinit
+FUNCS += functions/gnutls_openpgp_keyring_deinit.short
 FUNCS += functions/gnutls_openpgp_keyring_import
+FUNCS += functions/gnutls_openpgp_keyring_import.short
 FUNCS += functions/gnutls_openpgp_keyring_check_id
+FUNCS += functions/gnutls_openpgp_keyring_check_id.short
 FUNCS += functions/gnutls_openpgp_crt_verify_ring
+FUNCS += functions/gnutls_openpgp_crt_verify_ring.short
 FUNCS += functions/gnutls_openpgp_crt_verify_self
+FUNCS += functions/gnutls_openpgp_crt_verify_self.short
 FUNCS += functions/gnutls_openpgp_keyring_get_crt
+FUNCS += functions/gnutls_openpgp_keyring_get_crt.short
 FUNCS += functions/gnutls_openpgp_keyring_get_crt_count
+FUNCS += functions/gnutls_openpgp_keyring_get_crt_count.short
 FUNCS += functions/gnutls_openpgp_set_recv_key_function
+FUNCS += functions/gnutls_openpgp_set_recv_key_function.short
 FUNCS += functions/gnutls_certificate_set_openpgp_key
+FUNCS += functions/gnutls_certificate_set_openpgp_key.short
 FUNCS += functions/gnutls_certificate_set_openpgp_key_file
+FUNCS += functions/gnutls_certificate_set_openpgp_key_file.short
 FUNCS += functions/gnutls_certificate_set_openpgp_key_mem
+FUNCS += functions/gnutls_certificate_set_openpgp_key_mem.short
 FUNCS += functions/gnutls_certificate_set_openpgp_key_file2
+FUNCS += functions/gnutls_certificate_set_openpgp_key_file2.short
 FUNCS += functions/gnutls_certificate_set_openpgp_key_mem2
+FUNCS += functions/gnutls_certificate_set_openpgp_key_mem2.short
 FUNCS += functions/gnutls_certificate_set_openpgp_keyring_mem
+FUNCS += functions/gnutls_certificate_set_openpgp_keyring_mem.short
 FUNCS += functions/gnutls_certificate_set_openpgp_keyring_file
+FUNCS += functions/gnutls_certificate_set_openpgp_keyring_file.short
 FUNCS += functions/gnutls_pkcs11_init
+FUNCS += functions/gnutls_pkcs11_init.short
 FUNCS += functions/gnutls_pkcs11_reinit
+FUNCS += functions/gnutls_pkcs11_reinit.short
 FUNCS += functions/gnutls_pkcs11_deinit
+FUNCS += functions/gnutls_pkcs11_deinit.short
 FUNCS += functions/gnutls_pkcs11_set_token_function
+FUNCS += functions/gnutls_pkcs11_set_token_function.short
 FUNCS += functions/gnutls_pkcs11_set_pin_function
+FUNCS += functions/gnutls_pkcs11_set_pin_function.short
 FUNCS += functions/gnutls_pkcs11_get_pin_function
+FUNCS += functions/gnutls_pkcs11_get_pin_function.short
 FUNCS += functions/gnutls_pkcs11_add_provider
+FUNCS += functions/gnutls_pkcs11_add_provider.short
 FUNCS += functions/gnutls_pkcs11_obj_init
+FUNCS += functions/gnutls_pkcs11_obj_init.short
 FUNCS += functions/gnutls_pkcs11_obj_set_pin_function
+FUNCS += functions/gnutls_pkcs11_obj_set_pin_function.short
 FUNCS += functions/gnutls_pkcs11_obj_import_url
+FUNCS += functions/gnutls_pkcs11_obj_import_url.short
 FUNCS += functions/gnutls_pkcs11_obj_export_url
+FUNCS += functions/gnutls_pkcs11_obj_export_url.short
 FUNCS += functions/gnutls_pkcs11_obj_deinit
+FUNCS += functions/gnutls_pkcs11_obj_deinit.short
 FUNCS += functions/gnutls_pkcs11_obj_export
+FUNCS += functions/gnutls_pkcs11_obj_export.short
 FUNCS += functions/gnutls_pkcs11_copy_x509_crt
+FUNCS += functions/gnutls_pkcs11_copy_x509_crt.short
 FUNCS += functions/gnutls_pkcs11_copy_x509_privkey
+FUNCS += functions/gnutls_pkcs11_copy_x509_privkey.short
 FUNCS += functions/gnutls_pkcs11_delete_url
+FUNCS += functions/gnutls_pkcs11_delete_url.short
 FUNCS += functions/gnutls_pkcs11_copy_secret_key
+FUNCS += functions/gnutls_pkcs11_copy_secret_key.short
 FUNCS += functions/gnutls_pkcs11_obj_get_info
+FUNCS += functions/gnutls_pkcs11_obj_get_info.short
 FUNCS += functions/gnutls_pkcs11_token_init
+FUNCS += functions/gnutls_pkcs11_token_init.short
 FUNCS += functions/gnutls_pkcs11_token_get_mechanism
+FUNCS += functions/gnutls_pkcs11_token_get_mechanism.short
 FUNCS += functions/gnutls_pkcs11_token_set_pin
+FUNCS += functions/gnutls_pkcs11_token_set_pin.short
 FUNCS += functions/gnutls_pkcs11_token_get_url
+FUNCS += functions/gnutls_pkcs11_token_get_url.short
 FUNCS += functions/gnutls_pkcs11_token_get_info
+FUNCS += functions/gnutls_pkcs11_token_get_info.short
 FUNCS += functions/gnutls_pkcs11_token_get_flags
+FUNCS += functions/gnutls_pkcs11_token_get_flags.short
 FUNCS += functions/gnutls_pkcs11_obj_list_import_url
+FUNCS += functions/gnutls_pkcs11_obj_list_import_url.short
 FUNCS += functions/gnutls_pkcs11_obj_list_import_url2
+FUNCS += functions/gnutls_pkcs11_obj_list_import_url2.short
 FUNCS += functions/gnutls_x509_crt_import_pkcs11
+FUNCS += functions/gnutls_x509_crt_import_pkcs11.short
 FUNCS += functions/gnutls_x509_crt_import_pkcs11_url
+FUNCS += functions/gnutls_x509_crt_import_pkcs11_url.short
 FUNCS += functions/gnutls_pkcs11_obj_get_type
+FUNCS += functions/gnutls_pkcs11_obj_get_type.short
 FUNCS += functions/gnutls_pkcs11_type_get_name
+FUNCS += functions/gnutls_pkcs11_type_get_name.short
 FUNCS += functions/gnutls_x509_crt_list_import_pkcs11
+FUNCS += functions/gnutls_x509_crt_list_import_pkcs11.short
 FUNCS += functions/gnutls_pkcs11_privkey_init
+FUNCS += functions/gnutls_pkcs11_privkey_init.short
 FUNCS += functions/gnutls_pkcs11_privkey_set_pin_function
+FUNCS += functions/gnutls_pkcs11_privkey_set_pin_function.short
 FUNCS += functions/gnutls_pkcs11_privkey_deinit
+FUNCS += functions/gnutls_pkcs11_privkey_deinit.short
 FUNCS += functions/gnutls_pkcs11_privkey_get_pk_algorithm
+FUNCS += functions/gnutls_pkcs11_privkey_get_pk_algorithm.short
 FUNCS += functions/gnutls_pkcs11_privkey_get_info
+FUNCS += functions/gnutls_pkcs11_privkey_get_info.short
 FUNCS += functions/gnutls_pkcs11_privkey_import_url
+FUNCS += functions/gnutls_pkcs11_privkey_import_url.short
 FUNCS += functions/gnutls_pkcs11_privkey_export_url
+FUNCS += functions/gnutls_pkcs11_privkey_export_url.short
 FUNCS += functions/gnutls_pkcs11_privkey_generate
+FUNCS += functions/gnutls_pkcs11_privkey_generate.short
 FUNCS += functions/gnutls_pkcs12_init
+FUNCS += functions/gnutls_pkcs12_init.short
 FUNCS += functions/gnutls_pkcs12_deinit
+FUNCS += functions/gnutls_pkcs12_deinit.short
 FUNCS += functions/gnutls_pkcs12_import
+FUNCS += functions/gnutls_pkcs12_import.short
 FUNCS += functions/gnutls_pkcs12_export
+FUNCS += functions/gnutls_pkcs12_export.short
 FUNCS += functions/gnutls_pkcs12_get_bag
+FUNCS += functions/gnutls_pkcs12_get_bag.short
 FUNCS += functions/gnutls_pkcs12_set_bag
+FUNCS += functions/gnutls_pkcs12_set_bag.short
 FUNCS += functions/gnutls_pkcs12_generate_mac
+FUNCS += functions/gnutls_pkcs12_generate_mac.short
 FUNCS += functions/gnutls_pkcs12_verify_mac
+FUNCS += functions/gnutls_pkcs12_verify_mac.short
 FUNCS += functions/gnutls_pkcs12_bag_decrypt
+FUNCS += functions/gnutls_pkcs12_bag_decrypt.short
 FUNCS += functions/gnutls_pkcs12_bag_encrypt
+FUNCS += functions/gnutls_pkcs12_bag_encrypt.short
 FUNCS += functions/gnutls_pkcs12_simple_parse
+FUNCS += functions/gnutls_pkcs12_simple_parse.short
 FUNCS += functions/gnutls_pkcs12_bag_get_type
+FUNCS += functions/gnutls_pkcs12_bag_get_type.short
 FUNCS += functions/gnutls_pkcs12_bag_get_data
+FUNCS += functions/gnutls_pkcs12_bag_get_data.short
 FUNCS += functions/gnutls_pkcs12_bag_set_data
+FUNCS += functions/gnutls_pkcs12_bag_set_data.short
 FUNCS += functions/gnutls_pkcs12_bag_set_crl
+FUNCS += functions/gnutls_pkcs12_bag_set_crl.short
 FUNCS += functions/gnutls_pkcs12_bag_set_crt
+FUNCS += functions/gnutls_pkcs12_bag_set_crt.short
 FUNCS += functions/gnutls_pkcs12_bag_init
+FUNCS += functions/gnutls_pkcs12_bag_init.short
 FUNCS += functions/gnutls_pkcs12_bag_deinit
+FUNCS += functions/gnutls_pkcs12_bag_deinit.short
 FUNCS += functions/gnutls_pkcs12_bag_get_count
+FUNCS += functions/gnutls_pkcs12_bag_get_count.short
 FUNCS += functions/gnutls_pkcs12_bag_get_key_id
+FUNCS += functions/gnutls_pkcs12_bag_get_key_id.short
 FUNCS += functions/gnutls_pkcs12_bag_set_key_id
+FUNCS += functions/gnutls_pkcs12_bag_set_key_id.short
 FUNCS += functions/gnutls_pkcs12_bag_get_friendly_name
+FUNCS += functions/gnutls_pkcs12_bag_get_friendly_name.short
 FUNCS += functions/gnutls_pkcs12_bag_set_friendly_name
+FUNCS += functions/gnutls_pkcs12_bag_set_friendly_name.short
 FUNCS += functions/gnutls_tpm_privkey_generate
+FUNCS += functions/gnutls_tpm_privkey_generate.short
 FUNCS += functions/gnutls_tpm_key_list_deinit
+FUNCS += functions/gnutls_tpm_key_list_deinit.short
 FUNCS += functions/gnutls_tpm_key_list_get_url
+FUNCS += functions/gnutls_tpm_key_list_get_url.short
 FUNCS += functions/gnutls_tpm_get_registered
+FUNCS += functions/gnutls_tpm_get_registered.short
 FUNCS += functions/gnutls_tpm_privkey_delete
+FUNCS += functions/gnutls_tpm_privkey_delete.short
 FUNCS += functions/gnutls_x509_crt_init
+FUNCS += functions/gnutls_x509_crt_init.short
 FUNCS += functions/gnutls_x509_crt_deinit
+FUNCS += functions/gnutls_x509_crt_deinit.short
 FUNCS += functions/gnutls_x509_crt_import
+FUNCS += functions/gnutls_x509_crt_import.short
 FUNCS += functions/gnutls_x509_crt_list_import2
+FUNCS += functions/gnutls_x509_crt_list_import2.short
 FUNCS += functions/gnutls_x509_crt_list_import
+FUNCS += functions/gnutls_x509_crt_list_import.short
 FUNCS += functions/gnutls_x509_crt_export
+FUNCS += functions/gnutls_x509_crt_export.short
 FUNCS += functions/gnutls_x509_crt_get_private_key_usage_period
+FUNCS += functions/gnutls_x509_crt_get_private_key_usage_period.short
 FUNCS += functions/gnutls_x509_crt_get_issuer_dn
+FUNCS += functions/gnutls_x509_crt_get_issuer_dn.short
 FUNCS += functions/gnutls_x509_crt_get_issuer_dn_oid
+FUNCS += functions/gnutls_x509_crt_get_issuer_dn_oid.short
 FUNCS += functions/gnutls_x509_crt_get_issuer_dn_by_oid
+FUNCS += functions/gnutls_x509_crt_get_issuer_dn_by_oid.short
 FUNCS += functions/gnutls_x509_crt_get_dn
+FUNCS += functions/gnutls_x509_crt_get_dn.short
 FUNCS += functions/gnutls_x509_crt_get_dn_oid
+FUNCS += functions/gnutls_x509_crt_get_dn_oid.short
 FUNCS += functions/gnutls_x509_crt_get_dn_by_oid
+FUNCS += functions/gnutls_x509_crt_get_dn_by_oid.short
 FUNCS += functions/gnutls_x509_crt_check_hostname
+FUNCS += functions/gnutls_x509_crt_check_hostname.short
 FUNCS += functions/gnutls_x509_crt_get_signature_algorithm
+FUNCS += functions/gnutls_x509_crt_get_signature_algorithm.short
 FUNCS += functions/gnutls_x509_crt_get_signature
+FUNCS += functions/gnutls_x509_crt_get_signature.short
 FUNCS += functions/gnutls_x509_crt_get_version
+FUNCS += functions/gnutls_x509_crt_get_version.short
 FUNCS += functions/gnutls_x509_crt_get_key_id
+FUNCS += functions/gnutls_x509_crt_get_key_id.short
 FUNCS += functions/gnutls_x509_crt_set_private_key_usage_period
+FUNCS += functions/gnutls_x509_crt_set_private_key_usage_period.short
 FUNCS += functions/gnutls_x509_crt_set_authority_key_id
+FUNCS += functions/gnutls_x509_crt_set_authority_key_id.short
 FUNCS += functions/gnutls_x509_crt_get_authority_key_id
+FUNCS += functions/gnutls_x509_crt_get_authority_key_id.short
 FUNCS += functions/gnutls_x509_crt_get_authority_key_gn_serial
+FUNCS += functions/gnutls_x509_crt_get_authority_key_gn_serial.short
 FUNCS += functions/gnutls_x509_crt_get_subject_key_id
+FUNCS += functions/gnutls_x509_crt_get_subject_key_id.short
 FUNCS += functions/gnutls_x509_crt_get_subject_unique_id
+FUNCS += functions/gnutls_x509_crt_get_subject_unique_id.short
 FUNCS += functions/gnutls_x509_crt_get_issuer_unique_id
+FUNCS += functions/gnutls_x509_crt_get_issuer_unique_id.short
 FUNCS += functions/gnutls_x509_crt_set_pin_function
+FUNCS += functions/gnutls_x509_crt_set_pin_function.short
 FUNCS += functions/gnutls_x509_crt_get_authority_info_access
+FUNCS += functions/gnutls_x509_crt_get_authority_info_access.short
 FUNCS += functions/gnutls_x509_crt_get_crl_dist_points
+FUNCS += functions/gnutls_x509_crt_get_crl_dist_points.short
 FUNCS += functions/gnutls_x509_crt_set_crl_dist_points2
+FUNCS += functions/gnutls_x509_crt_set_crl_dist_points2.short
 FUNCS += functions/gnutls_x509_crt_set_crl_dist_points
+FUNCS += functions/gnutls_x509_crt_set_crl_dist_points.short
 FUNCS += functions/gnutls_x509_crt_cpy_crl_dist_points
+FUNCS += functions/gnutls_x509_crt_cpy_crl_dist_points.short
 FUNCS += functions/gnutls_x509_crl_sign2
+FUNCS += functions/gnutls_x509_crl_sign2.short
 FUNCS += functions/gnutls_x509_crt_get_activation_time
+FUNCS += functions/gnutls_x509_crt_get_activation_time.short
 FUNCS += functions/gnutls_x509_crt_get_expiration_time
+FUNCS += functions/gnutls_x509_crt_get_expiration_time.short
 FUNCS += functions/gnutls_x509_crt_get_serial
+FUNCS += functions/gnutls_x509_crt_get_serial.short
 FUNCS += functions/gnutls_x509_crt_get_pk_algorithm
+FUNCS += functions/gnutls_x509_crt_get_pk_algorithm.short
 FUNCS += functions/gnutls_x509_crt_get_pk_rsa_raw
+FUNCS += functions/gnutls_x509_crt_get_pk_rsa_raw.short
 FUNCS += functions/gnutls_x509_crt_get_pk_dsa_raw
+FUNCS += functions/gnutls_x509_crt_get_pk_dsa_raw.short
 FUNCS += functions/gnutls_x509_crt_get_subject_alt_name
+FUNCS += functions/gnutls_x509_crt_get_subject_alt_name.short
 FUNCS += functions/gnutls_x509_crt_get_subject_alt_name2
+FUNCS += functions/gnutls_x509_crt_get_subject_alt_name2.short
 FUNCS += functions/gnutls_x509_crt_get_subject_alt_othername_oid
+FUNCS += functions/gnutls_x509_crt_get_subject_alt_othername_oid.short
 FUNCS += functions/gnutls_x509_crt_get_issuer_alt_name
+FUNCS += functions/gnutls_x509_crt_get_issuer_alt_name.short
 FUNCS += functions/gnutls_x509_crt_get_issuer_alt_name2
+FUNCS += functions/gnutls_x509_crt_get_issuer_alt_name2.short
 FUNCS += functions/gnutls_x509_crt_get_issuer_alt_othername_oid
+FUNCS += functions/gnutls_x509_crt_get_issuer_alt_othername_oid.short
 FUNCS += functions/gnutls_x509_crt_get_ca_status
+FUNCS += functions/gnutls_x509_crt_get_ca_status.short
 FUNCS += functions/gnutls_x509_crt_get_basic_constraints
+FUNCS += functions/gnutls_x509_crt_get_basic_constraints.short
 FUNCS += functions/gnutls_x509_crt_get_key_usage
+FUNCS += functions/gnutls_x509_crt_get_key_usage.short
 FUNCS += functions/gnutls_x509_crt_set_key_usage
+FUNCS += functions/gnutls_x509_crt_set_key_usage.short
 FUNCS += functions/gnutls_x509_crt_set_authority_info_access
+FUNCS += functions/gnutls_x509_crt_set_authority_info_access.short
 FUNCS += functions/gnutls_x509_crt_get_proxy
+FUNCS += functions/gnutls_x509_crt_get_proxy.short
 FUNCS += functions/gnutls_x509_dn_oid_known
+FUNCS += functions/gnutls_x509_dn_oid_known.short
 FUNCS += functions/gnutls_x509_dn_oid_name
+FUNCS += functions/gnutls_x509_dn_oid_name.short
 FUNCS += functions/gnutls_x509_crt_get_extension_oid
+FUNCS += functions/gnutls_x509_crt_get_extension_oid.short
 FUNCS += functions/gnutls_x509_crt_get_extension_by_oid
+FUNCS += functions/gnutls_x509_crt_get_extension_by_oid.short
 FUNCS += functions/gnutls_x509_crt_get_extension_info
+FUNCS += functions/gnutls_x509_crt_get_extension_info.short
 FUNCS += functions/gnutls_x509_crt_get_extension_data
+FUNCS += functions/gnutls_x509_crt_get_extension_data.short
 FUNCS += functions/gnutls_x509_crt_set_extension_by_oid
+FUNCS += functions/gnutls_x509_crt_set_extension_by_oid.short
 FUNCS += functions/gnutls_x509_crt_set_dn_by_oid
+FUNCS += functions/gnutls_x509_crt_set_dn_by_oid.short
 FUNCS += functions/gnutls_x509_crt_set_issuer_dn_by_oid
+FUNCS += functions/gnutls_x509_crt_set_issuer_dn_by_oid.short
 FUNCS += functions/gnutls_x509_crt_set_version
+FUNCS += functions/gnutls_x509_crt_set_version.short
 FUNCS += functions/gnutls_x509_crt_set_key
+FUNCS += functions/gnutls_x509_crt_set_key.short
 FUNCS += functions/gnutls_x509_crt_set_ca_status
+FUNCS += functions/gnutls_x509_crt_set_ca_status.short
 FUNCS += functions/gnutls_x509_crt_set_basic_constraints
+FUNCS += functions/gnutls_x509_crt_set_basic_constraints.short
 FUNCS += functions/gnutls_x509_crt_set_subject_alternative_name
+FUNCS += functions/gnutls_x509_crt_set_subject_alternative_name.short
 FUNCS += functions/gnutls_x509_crt_set_subject_alt_name
+FUNCS += functions/gnutls_x509_crt_set_subject_alt_name.short
 FUNCS += functions/gnutls_x509_crt_sign
+FUNCS += functions/gnutls_x509_crt_sign.short
 FUNCS += functions/gnutls_x509_crt_sign2
+FUNCS += functions/gnutls_x509_crt_sign2.short
 FUNCS += functions/gnutls_x509_crt_set_activation_time
+FUNCS += functions/gnutls_x509_crt_set_activation_time.short
 FUNCS += functions/gnutls_x509_crt_set_expiration_time
+FUNCS += functions/gnutls_x509_crt_set_expiration_time.short
 FUNCS += functions/gnutls_x509_crt_set_serial
+FUNCS += functions/gnutls_x509_crt_set_serial.short
 FUNCS += functions/gnutls_x509_crt_set_subject_key_id
+FUNCS += functions/gnutls_x509_crt_set_subject_key_id.short
 FUNCS += functions/gnutls_x509_crt_set_proxy_dn
+FUNCS += functions/gnutls_x509_crt_set_proxy_dn.short
 FUNCS += functions/gnutls_x509_crt_set_proxy
+FUNCS += functions/gnutls_x509_crt_set_proxy.short
 FUNCS += functions/gnutls_x509_crt_print
+FUNCS += functions/gnutls_x509_crt_print.short
 FUNCS += functions/gnutls_x509_crl_print
+FUNCS += functions/gnutls_x509_crl_print.short
 FUNCS += functions/gnutls_x509_crt_get_raw_issuer_dn
+FUNCS += functions/gnutls_x509_crt_get_raw_issuer_dn.short
 FUNCS += functions/gnutls_x509_crt_get_raw_dn
+FUNCS += functions/gnutls_x509_crt_get_raw_dn.short
 FUNCS += functions/gnutls_x509_rdn_get
+FUNCS += functions/gnutls_x509_rdn_get.short
 FUNCS += functions/gnutls_x509_rdn_get_oid
+FUNCS += functions/gnutls_x509_rdn_get_oid.short
 FUNCS += functions/gnutls_x509_rdn_get_by_oid
+FUNCS += functions/gnutls_x509_rdn_get_by_oid.short
 FUNCS += functions/gnutls_x509_crt_get_subject
+FUNCS += functions/gnutls_x509_crt_get_subject.short
 FUNCS += functions/gnutls_x509_crt_get_issuer
+FUNCS += functions/gnutls_x509_crt_get_issuer.short
 FUNCS += functions/gnutls_x509_dn_get_rdn_ava
+FUNCS += functions/gnutls_x509_dn_get_rdn_ava.short
 FUNCS += functions/gnutls_x509_dn_init
+FUNCS += functions/gnutls_x509_dn_init.short
 FUNCS += functions/gnutls_x509_dn_import
+FUNCS += functions/gnutls_x509_dn_import.short
 FUNCS += functions/gnutls_x509_dn_export
+FUNCS += functions/gnutls_x509_dn_export.short
 FUNCS += functions/gnutls_x509_dn_deinit
+FUNCS += functions/gnutls_x509_dn_deinit.short
 FUNCS += functions/gnutls_x509_crl_init
+FUNCS += functions/gnutls_x509_crl_init.short
 FUNCS += functions/gnutls_x509_crl_deinit
+FUNCS += functions/gnutls_x509_crl_deinit.short
 FUNCS += functions/gnutls_x509_crl_import
+FUNCS += functions/gnutls_x509_crl_import.short
 FUNCS += functions/gnutls_x509_crl_export
+FUNCS += functions/gnutls_x509_crl_export.short
 FUNCS += functions/gnutls_x509_crl_get_raw_issuer_dn
+FUNCS += functions/gnutls_x509_crl_get_raw_issuer_dn.short
 FUNCS += functions/gnutls_x509_crl_get_issuer_dn
+FUNCS += functions/gnutls_x509_crl_get_issuer_dn.short
 FUNCS += functions/gnutls_x509_crl_get_issuer_dn_by_oid
+FUNCS += functions/gnutls_x509_crl_get_issuer_dn_by_oid.short
 FUNCS += functions/gnutls_x509_crl_get_dn_oid
+FUNCS += functions/gnutls_x509_crl_get_dn_oid.short
 FUNCS += functions/gnutls_x509_crl_get_signature_algorithm
+FUNCS += functions/gnutls_x509_crl_get_signature_algorithm.short
 FUNCS += functions/gnutls_x509_crl_get_signature
+FUNCS += functions/gnutls_x509_crl_get_signature.short
 FUNCS += functions/gnutls_x509_crl_get_version
+FUNCS += functions/gnutls_x509_crl_get_version.short
 FUNCS += functions/gnutls_x509_crl_get_this_update
+FUNCS += functions/gnutls_x509_crl_get_this_update.short
 FUNCS += functions/gnutls_x509_crl_get_next_update
+FUNCS += functions/gnutls_x509_crl_get_next_update.short
 FUNCS += functions/gnutls_x509_crl_get_crt_count
+FUNCS += functions/gnutls_x509_crl_get_crt_count.short
 FUNCS += functions/gnutls_x509_crl_get_crt_serial
+FUNCS += functions/gnutls_x509_crl_get_crt_serial.short
 FUNCS += functions/gnutls_x509_crl_check_issuer
+FUNCS += functions/gnutls_x509_crl_check_issuer.short
 FUNCS += functions/gnutls_x509_crl_list_import2
+FUNCS += functions/gnutls_x509_crl_list_import2.short
 FUNCS += functions/gnutls_x509_crl_list_import
+FUNCS += functions/gnutls_x509_crl_list_import.short
 FUNCS += functions/gnutls_x509_crl_set_version
+FUNCS += functions/gnutls_x509_crl_set_version.short
 FUNCS += functions/gnutls_x509_crl_set_this_update
+FUNCS += functions/gnutls_x509_crl_set_this_update.short
 FUNCS += functions/gnutls_x509_crl_set_next_update
+FUNCS += functions/gnutls_x509_crl_set_next_update.short
 FUNCS += functions/gnutls_x509_crl_set_crt_serial
+FUNCS += functions/gnutls_x509_crl_set_crt_serial.short
 FUNCS += functions/gnutls_x509_crl_set_crt
+FUNCS += functions/gnutls_x509_crl_set_crt.short
 FUNCS += functions/gnutls_x509_crl_get_authority_key_id
+FUNCS += functions/gnutls_x509_crl_get_authority_key_id.short
 FUNCS += functions/gnutls_x509_crl_get_authority_key_gn_serial
+FUNCS += functions/gnutls_x509_crl_get_authority_key_gn_serial.short
 FUNCS += functions/gnutls_x509_crl_get_number
+FUNCS += functions/gnutls_x509_crl_get_number.short
 FUNCS += functions/gnutls_x509_crl_get_extension_oid
+FUNCS += functions/gnutls_x509_crl_get_extension_oid.short
 FUNCS += functions/gnutls_x509_crl_get_extension_info
+FUNCS += functions/gnutls_x509_crl_get_extension_info.short
 FUNCS += functions/gnutls_x509_crl_get_extension_data
+FUNCS += functions/gnutls_x509_crl_get_extension_data.short
 FUNCS += functions/gnutls_x509_crl_set_authority_key_id
+FUNCS += functions/gnutls_x509_crl_set_authority_key_id.short
 FUNCS += functions/gnutls_x509_crl_set_number
+FUNCS += functions/gnutls_x509_crl_set_number.short
 FUNCS += functions/gnutls_pkcs7_init
+FUNCS += functions/gnutls_pkcs7_init.short
 FUNCS += functions/gnutls_pkcs7_deinit
+FUNCS += functions/gnutls_pkcs7_deinit.short
 FUNCS += functions/gnutls_pkcs7_import
+FUNCS += functions/gnutls_pkcs7_import.short
 FUNCS += functions/gnutls_pkcs7_export
+FUNCS += functions/gnutls_pkcs7_export.short
 FUNCS += functions/gnutls_pkcs7_get_crt_count
+FUNCS += functions/gnutls_pkcs7_get_crt_count.short
 FUNCS += functions/gnutls_pkcs7_get_crt_raw
+FUNCS += functions/gnutls_pkcs7_get_crt_raw.short
 FUNCS += functions/gnutls_pkcs7_set_crt_raw
+FUNCS += functions/gnutls_pkcs7_set_crt_raw.short
 FUNCS += functions/gnutls_pkcs7_set_crt
+FUNCS += functions/gnutls_pkcs7_set_crt.short
 FUNCS += functions/gnutls_pkcs7_delete_crt
+FUNCS += functions/gnutls_pkcs7_delete_crt.short
 FUNCS += functions/gnutls_pkcs7_get_crl_raw
+FUNCS += functions/gnutls_pkcs7_get_crl_raw.short
 FUNCS += functions/gnutls_pkcs7_get_crl_count
+FUNCS += functions/gnutls_pkcs7_get_crl_count.short
 FUNCS += functions/gnutls_pkcs7_set_crl_raw
+FUNCS += functions/gnutls_pkcs7_set_crl_raw.short
 FUNCS += functions/gnutls_pkcs7_set_crl
+FUNCS += functions/gnutls_pkcs7_set_crl.short
 FUNCS += functions/gnutls_pkcs7_delete_crl
+FUNCS += functions/gnutls_pkcs7_delete_crl.short
 FUNCS += functions/gnutls_x509_crt_check_issuer
+FUNCS += functions/gnutls_x509_crt_check_issuer.short
 FUNCS += functions/gnutls_x509_crt_list_verify
+FUNCS += functions/gnutls_x509_crt_list_verify.short
 FUNCS += functions/gnutls_x509_crt_verify
+FUNCS += functions/gnutls_x509_crt_verify.short
 FUNCS += functions/gnutls_x509_crl_verify
+FUNCS += functions/gnutls_x509_crl_verify.short
 FUNCS += functions/gnutls_x509_crt_check_revocation
+FUNCS += functions/gnutls_x509_crt_check_revocation.short
 FUNCS += functions/gnutls_x509_crt_get_fingerprint
+FUNCS += functions/gnutls_x509_crt_get_fingerprint.short
 FUNCS += functions/gnutls_x509_crt_get_key_purpose_oid
+FUNCS += functions/gnutls_x509_crt_get_key_purpose_oid.short
 FUNCS += functions/gnutls_x509_crt_set_key_purpose_oid
+FUNCS += functions/gnutls_x509_crt_set_key_purpose_oid.short
 FUNCS += functions/gnutls_x509_privkey_init
+FUNCS += functions/gnutls_x509_privkey_init.short
 FUNCS += functions/gnutls_x509_privkey_deinit
+FUNCS += functions/gnutls_x509_privkey_deinit.short
 FUNCS += functions/gnutls_x509_privkey_sec_param
+FUNCS += functions/gnutls_x509_privkey_sec_param.short
 FUNCS += functions/gnutls_x509_privkey_cpy
+FUNCS += functions/gnutls_x509_privkey_cpy.short
 FUNCS += functions/gnutls_x509_privkey_import
+FUNCS += functions/gnutls_x509_privkey_import.short
 FUNCS += functions/gnutls_x509_privkey_import_pkcs8
+FUNCS += functions/gnutls_x509_privkey_import_pkcs8.short
 FUNCS += functions/gnutls_x509_privkey_import_openssl
+FUNCS += functions/gnutls_x509_privkey_import_openssl.short
 FUNCS += functions/gnutls_x509_privkey_import2
+FUNCS += functions/gnutls_x509_privkey_import2.short
 FUNCS += functions/gnutls_x509_privkey_import_rsa_raw
+FUNCS += functions/gnutls_x509_privkey_import_rsa_raw.short
 FUNCS += functions/gnutls_x509_privkey_import_rsa_raw2
+FUNCS += functions/gnutls_x509_privkey_import_rsa_raw2.short
 FUNCS += functions/gnutls_x509_privkey_import_ecc_raw
+FUNCS += functions/gnutls_x509_privkey_import_ecc_raw.short
 FUNCS += functions/gnutls_x509_privkey_fix
+FUNCS += functions/gnutls_x509_privkey_fix.short
 FUNCS += functions/gnutls_x509_privkey_export_dsa_raw
+FUNCS += functions/gnutls_x509_privkey_export_dsa_raw.short
 FUNCS += functions/gnutls_x509_privkey_import_dsa_raw
+FUNCS += functions/gnutls_x509_privkey_import_dsa_raw.short
 FUNCS += functions/gnutls_x509_privkey_get_pk_algorithm
+FUNCS += functions/gnutls_x509_privkey_get_pk_algorithm.short
 FUNCS += functions/gnutls_x509_privkey_get_key_id
+FUNCS += functions/gnutls_x509_privkey_get_key_id.short
 FUNCS += functions/gnutls_x509_privkey_generate
+FUNCS += functions/gnutls_x509_privkey_generate.short
 FUNCS += functions/gnutls_x509_privkey_verify_params
+FUNCS += functions/gnutls_x509_privkey_verify_params.short
 FUNCS += functions/gnutls_x509_privkey_export
+FUNCS += functions/gnutls_x509_privkey_export.short
 FUNCS += functions/gnutls_x509_privkey_export_pkcs8
+FUNCS += functions/gnutls_x509_privkey_export_pkcs8.short
 FUNCS += functions/gnutls_x509_privkey_export_rsa_raw2
+FUNCS += functions/gnutls_x509_privkey_export_rsa_raw2.short
 FUNCS += functions/gnutls_x509_privkey_export_rsa_raw
+FUNCS += functions/gnutls_x509_privkey_export_rsa_raw.short
 FUNCS += functions/gnutls_x509_privkey_export_ecc_raw
+FUNCS += functions/gnutls_x509_privkey_export_ecc_raw.short
 FUNCS += functions/gnutls_x509_crq_sign2
+FUNCS += functions/gnutls_x509_crq_sign2.short
 FUNCS += functions/gnutls_x509_crq_print
+FUNCS += functions/gnutls_x509_crq_print.short
 FUNCS += functions/gnutls_x509_crq_verify
+FUNCS += functions/gnutls_x509_crq_verify.short
 FUNCS += functions/gnutls_x509_crq_init
+FUNCS += functions/gnutls_x509_crq_init.short
 FUNCS += functions/gnutls_x509_crq_deinit
+FUNCS += functions/gnutls_x509_crq_deinit.short
 FUNCS += functions/gnutls_x509_crq_import
+FUNCS += functions/gnutls_x509_crq_import.short
 FUNCS += functions/gnutls_x509_crq_get_private_key_usage_period
+FUNCS += functions/gnutls_x509_crq_get_private_key_usage_period.short
 FUNCS += functions/gnutls_x509_crq_get_dn
+FUNCS += functions/gnutls_x509_crq_get_dn.short
 FUNCS += functions/gnutls_x509_crq_get_dn_oid
+FUNCS += functions/gnutls_x509_crq_get_dn_oid.short
 FUNCS += functions/gnutls_x509_crq_get_dn_by_oid
+FUNCS += functions/gnutls_x509_crq_get_dn_by_oid.short
 FUNCS += functions/gnutls_x509_crq_set_dn_by_oid
+FUNCS += functions/gnutls_x509_crq_set_dn_by_oid.short
 FUNCS += functions/gnutls_x509_crq_set_version
+FUNCS += functions/gnutls_x509_crq_set_version.short
 FUNCS += functions/gnutls_x509_crq_get_version
+FUNCS += functions/gnutls_x509_crq_get_version.short
 FUNCS += functions/gnutls_x509_crq_set_key
+FUNCS += functions/gnutls_x509_crq_set_key.short
 FUNCS += functions/gnutls_x509_crq_set_challenge_password
+FUNCS += functions/gnutls_x509_crq_set_challenge_password.short
 FUNCS += functions/gnutls_x509_crq_get_challenge_password
+FUNCS += functions/gnutls_x509_crq_get_challenge_password.short
 FUNCS += functions/gnutls_x509_crq_set_attribute_by_oid
+FUNCS += functions/gnutls_x509_crq_set_attribute_by_oid.short
 FUNCS += functions/gnutls_x509_crq_get_attribute_by_oid
+FUNCS += functions/gnutls_x509_crq_get_attribute_by_oid.short
 FUNCS += functions/gnutls_x509_crq_export
+FUNCS += functions/gnutls_x509_crq_export.short
 FUNCS += functions/gnutls_x509_crt_set_crq
+FUNCS += functions/gnutls_x509_crt_set_crq.short
 FUNCS += functions/gnutls_x509_crt_set_crq_extensions
+FUNCS += functions/gnutls_x509_crt_set_crq_extensions.short
 FUNCS += functions/gnutls_x509_crq_set_private_key_usage_period
+FUNCS += functions/gnutls_x509_crq_set_private_key_usage_period.short
 FUNCS += functions/gnutls_x509_crq_set_key_rsa_raw
+FUNCS += functions/gnutls_x509_crq_set_key_rsa_raw.short
 FUNCS += functions/gnutls_x509_crq_set_subject_alt_name
+FUNCS += functions/gnutls_x509_crq_set_subject_alt_name.short
 FUNCS += functions/gnutls_x509_crq_set_key_usage
+FUNCS += functions/gnutls_x509_crq_set_key_usage.short
 FUNCS += functions/gnutls_x509_crq_set_basic_constraints
+FUNCS += functions/gnutls_x509_crq_set_basic_constraints.short
 FUNCS += functions/gnutls_x509_crq_set_key_purpose_oid
+FUNCS += functions/gnutls_x509_crq_set_key_purpose_oid.short
 FUNCS += functions/gnutls_x509_crq_get_key_purpose_oid
+FUNCS += functions/gnutls_x509_crq_get_key_purpose_oid.short
 FUNCS += functions/gnutls_x509_crq_get_extension_data
+FUNCS += functions/gnutls_x509_crq_get_extension_data.short
 FUNCS += functions/gnutls_x509_crq_get_extension_info
+FUNCS += functions/gnutls_x509_crq_get_extension_info.short
 FUNCS += functions/gnutls_x509_crq_get_attribute_data
+FUNCS += functions/gnutls_x509_crq_get_attribute_data.short
 FUNCS += functions/gnutls_x509_crq_get_attribute_info
+FUNCS += functions/gnutls_x509_crq_get_attribute_info.short
 FUNCS += functions/gnutls_x509_crq_get_pk_algorithm
+FUNCS += functions/gnutls_x509_crq_get_pk_algorithm.short
 FUNCS += functions/gnutls_x509_crq_get_key_id
+FUNCS += functions/gnutls_x509_crq_get_key_id.short
 FUNCS += functions/gnutls_x509_crq_get_key_rsa_raw
+FUNCS += functions/gnutls_x509_crq_get_key_rsa_raw.short
 FUNCS += functions/gnutls_x509_crq_get_key_usage
+FUNCS += functions/gnutls_x509_crq_get_key_usage.short
 FUNCS += functions/gnutls_x509_crq_get_basic_constraints
+FUNCS += functions/gnutls_x509_crq_get_basic_constraints.short
 FUNCS += functions/gnutls_x509_crq_get_subject_alt_name
+FUNCS += functions/gnutls_x509_crq_get_subject_alt_name.short
 FUNCS += functions/gnutls_x509_crq_get_subject_alt_othername_oid
+FUNCS += functions/gnutls_x509_crq_get_subject_alt_othername_oid.short
 FUNCS += functions/gnutls_x509_crq_get_extension_by_oid
+FUNCS += functions/gnutls_x509_crq_get_extension_by_oid.short
 FUNCS += functions/gnutls_x509_trust_list_init
+FUNCS += functions/gnutls_x509_trust_list_init.short
 FUNCS += functions/gnutls_x509_trust_list_deinit
+FUNCS += functions/gnutls_x509_trust_list_deinit.short
 FUNCS += functions/gnutls_x509_trust_list_get_issuer
+FUNCS += functions/gnutls_x509_trust_list_get_issuer.short
 FUNCS += functions/gnutls_x509_trust_list_add_cas
+FUNCS += functions/gnutls_x509_trust_list_add_cas.short
 FUNCS += functions/gnutls_x509_trust_list_add_named_crt
+FUNCS += functions/gnutls_x509_trust_list_add_named_crt.short
 FUNCS += functions/gnutls_x509_trust_list_add_crls
+FUNCS += functions/gnutls_x509_trust_list_add_crls.short
 FUNCS += functions/gnutls_x509_trust_list_verify_named_crt
+FUNCS += functions/gnutls_x509_trust_list_verify_named_crt.short
 FUNCS += functions/gnutls_x509_trust_list_verify_crt
+FUNCS += functions/gnutls_x509_trust_list_verify_crt.short
 FUNCS += functions/gnutls_x509_trust_list_add_trust_mem
+FUNCS += functions/gnutls_x509_trust_list_add_trust_mem.short
 FUNCS += functions/gnutls_x509_trust_list_add_trust_file
+FUNCS += functions/gnutls_x509_trust_list_add_trust_file.short
 FUNCS += functions/gnutls_x509_trust_list_add_system_trust
+FUNCS += functions/gnutls_x509_trust_list_add_system_trust.short
diff --git a/doc/cha-gtls-app.texi b/doc/cha-gtls-app.texi
index ea2dfb8..45d4ef0 100644
--- a/doc/cha-gtls-app.texi
+++ b/doc/cha-gtls-app.texi
@@ -733,6 +733,8 @@ exchange.
 
 @showfuncdesc{gnutls_handshake}
 
address@hidden
+
 The handshake process doesn't ensure the verification
 of the peer's identity. When certificates are in use,
 this can be done, either after the handshake is complete, or during 
diff --git a/doc/cha-shared-key.texi b/doc/cha-shared-key.texi
index 1d3186a..b2e7f06 100644
--- a/doc/cha-shared-key.texi
+++ b/doc/cha-shared-key.texi
@@ -73,7 +73,7 @@ authenticated using a certificate with RSA parameters.
 
 @showfuncdesc{gnutls_srp_verifier}
 
address@hidden,gnutls_srp_base64_decode}
address@hidden,gnutls_srp_base64_decode_alloc}
 
 @include invoke-srptool.texi
 
diff --git a/doc/cha-upgrade.texi b/doc/cha-upgrade.texi
index de5e32f..e52ce29 100644
--- a/doc/cha-upgrade.texi
+++ b/doc/cha-upgrade.texi
@@ -23,7 +23,7 @@ function @funcref{gnutls_record_check_pending} has to be used 
to achieve the sam
 functionality as described in @ref{Asynchronous operation}.
 @end itemize
 
address@hidden Upgrading to 3.0.x from previous versions
address@hidden Upgrading to 3.0.x from 2.12.x
 
 GnuTLS 3.0.x is source compatible with previous versions except for the 
functions
 listed below.
@@ -72,3 +72,21 @@ They are replaced by the safer function 
@funcref{gnutls_session_get_random}
 
 @end multitable
 
address@hidden Upgrading to 3.1.x from 3.0.x
+
+GnuTLS 3.1.x is source and binary compatible with GnuTLS 3.0.x releases. Few
+functions have been deprecated and are listed below.
+
address@hidden @columnfractions .30 .60
address@hidden Old function @tab Replacement
+
address@hidden @funcintref{gnutls_pubkey_verify_hash} 
address@hidden The function @funcref{gnutls_pubkey_verify_hash2} is provided and
+is functionally equivalent and safer to use.
+
address@hidden @funcintref{gnutls_pubkey_verify_data} 
address@hidden The function @funcref{gnutls_pubkey_verify_data2} is provided and
+is functionally equivalent and safer to use.
+
address@hidden multitable
+
diff --git a/doc/examples/ex-client-anon.c b/doc/examples/ex-client-anon.c
index ba56934..b4befa8 100644
--- a/doc/examples/ex-client-anon.c
+++ b/doc/examples/ex-client-anon.c
@@ -57,7 +57,7 @@ main (void)
    */
   do
     {
-      ret = gnutls_handshake (session);
+      ret = gnutls_handshake_timeout (session, 
GNUTLS_DEFAULT_HANDSHAKE_TIMEOUT);
     }
   while (ret < 0 && gnutls_error_is_fatal (ret) == 0);
 
diff --git a/doc/examples/ex-client-dtls.c b/doc/examples/ex-client-dtls.c
index 21e7244..6b97ba6 100644
--- a/doc/examples/ex-client-dtls.c
+++ b/doc/examples/ex-client-dtls.c
@@ -73,7 +73,7 @@ main (void)
   /* Perform the TLS handshake */
   do
     {
-      ret = gnutls_handshake (session);
+      ret = gnutls_handshake_timeout (session, 
GNUTLS_DEFAULT_HANDSHAKE_TIMEOUT);
     }
   while (ret < 0 && gnutls_error_is_fatal (ret) == 0);
 
diff --git a/doc/examples/ex-client-psk.c b/doc/examples/ex-client-psk.c
index 63366c2..f77e3a3 100644
--- a/doc/examples/ex-client-psk.c
+++ b/doc/examples/ex-client-psk.c
@@ -67,7 +67,7 @@ main (void)
    */
   do
     {
-      ret = gnutls_handshake (session);
+      ret = gnutls_handshake_timeout (session, 
GNUTLS_DEFAULT_HANDSHAKE_TIMEOUT);
     }
   while (ret < 0 && gnutls_error_is_fatal (ret) == 0);
 
diff --git a/doc/examples/ex-client-resume.c b/doc/examples/ex-client-resume.c
index c094950..13b42e4 100644
--- a/doc/examples/ex-client-resume.c
+++ b/doc/examples/ex-client-resume.c
@@ -65,7 +65,7 @@ main (void)
        */
       do
         {
-          ret = gnutls_handshake (session);
+          ret = gnutls_handshake_timeout (session, 
GNUTLS_DEFAULT_HANDSHAKE_TIMEOUT);
         }
       while (ret < 0 && gnutls_error_is_fatal (ret) == 0);
 
diff --git a/doc/examples/ex-client-srp.c b/doc/examples/ex-client-srp.c
index 7784075..afc6c09 100644
--- a/doc/examples/ex-client-srp.c
+++ b/doc/examples/ex-client-srp.c
@@ -64,7 +64,7 @@ main (void)
    */
   do
     {
-      ret = gnutls_handshake (session);
+      ret = gnutls_handshake_timeout (session, 
GNUTLS_DEFAULT_HANDSHAKE_TIMEOUT);
     }
   while (ret < 0 && gnutls_error_is_fatal (ret) == 0);
 
diff --git a/doc/examples/ex-client-x509.c b/doc/examples/ex-client-x509.c
index 2a78e2d..2535230 100644
--- a/doc/examples/ex-client-x509.c
+++ b/doc/examples/ex-client-x509.c
@@ -82,7 +82,7 @@ int main (void)
    */
   do
     {
-      ret = gnutls_handshake (session);
+      ret = gnutls_handshake_timeout (session, 
GNUTLS_DEFAULT_HANDSHAKE_TIMEOUT);
     }
   while (ret < 0 && gnutls_error_is_fatal (ret) == 0);
 
diff --git a/doc/gnutls.texi b/doc/gnutls.texi
index 986f924..2a1b11b 100644
--- a/doc/gnutls.texi
+++ b/doc/gnutls.texi
@@ -76,52 +76,52 @@ Documentation License''.
 
 @macro showfuncA{ref}
 @table @code
address@hidden functions.short/\ref\
address@hidden functions/\ref\.short
 @end table
 @end macro
 
 @macro showfuncB{ref1,ref2}
 @table @code
address@hidden functions.short/\ref1\
address@hidden functions.short/\ref2\
address@hidden functions/\ref1\.short
address@hidden functions/\ref2\.short
 @end table
 @end macro
 
 @macro showfuncC{ref1,ref2,ref3}
 @table @code
address@hidden functions.short/\ref1\
address@hidden functions.short/\ref2\
address@hidden functions.short/\ref3\
address@hidden functions/\ref1\.short
address@hidden functions/\ref2\.short
address@hidden functions/\ref3\.short
 @end table
 @end macro
 
 @macro showfuncD{ref1,ref2,ref3,ref4}
 @table @code
address@hidden functions.short/\ref1\
address@hidden functions.short/\ref2\
address@hidden functions.short/\ref3\
address@hidden functions.short/\ref4\
address@hidden functions/\ref1\.short
address@hidden functions/\ref2\.short
address@hidden functions/\ref3\.short
address@hidden functions/\ref4\.short
 @end table
 @end macro
 
 @macro showfuncE{ref1,ref2,ref3,ref4,ref5}
 @table @code
address@hidden functions.short/\ref1\
address@hidden functions.short/\ref2\
address@hidden functions.short/\ref3\
address@hidden functions.short/\ref4\
address@hidden functions.short/\ref5\
address@hidden functions/\ref1\.short
address@hidden functions/\ref2\.short
address@hidden functions/\ref3\.short
address@hidden functions/\ref4\.short
address@hidden functions/\ref5\.short
 @end table
 @end macro
 
 @macro showfuncF{ref1,ref2,ref3,ref4,ref5,ref6}
 @table @code
address@hidden functions.short/\ref1\
address@hidden functions.short/\ref2\
address@hidden functions.short/\ref3\
address@hidden functions.short/\ref4\
address@hidden functions.short/\ref5\
address@hidden functions.short/\ref6\
address@hidden functions/\ref1\.short
address@hidden functions/\ref2\.short
address@hidden functions/\ref3\.short
address@hidden functions/\ref4\.short
address@hidden functions/\ref5\.short
address@hidden functions/\ref6\.short
 @end table
 @end macro
 
diff --git a/lib/gnutls_buffers.c b/lib/gnutls_buffers.c
index 5d1f3f5..4c4f9e3 100644
--- a/lib/gnutls_buffers.c
+++ b/lib/gnutls_buffers.c
@@ -174,7 +174,7 @@ int errno_to_gerr(int err)
 
 static ssize_t
 _gnutls_dgram_read (gnutls_session_t session, mbuffer_st **bufel,
-                   gnutls_pull_func pull_func)
+                   gnutls_pull_func pull_func, unsigned int ms)
 {
   ssize_t i, ret;
   uint8_t *ptr;
@@ -185,14 +185,21 @@ _gnutls_dgram_read (gnutls_session_t session, mbuffer_st 
**bufel,
   if (recv_size > max_size)
     recv_size = max_size;
 
+  session->internals.direction = 0;
+
+  if (ms)
+    {
+      ret = _gnutls_io_check_recv(session, ms);
+      if (ret < 0)
+        return gnutls_assert_val(ret);
+    }
+
   *bufel = _mbuffer_alloc (0, max_size);
   if (*bufel == NULL)
     return gnutls_assert_val(GNUTLS_E_MEMORY_ERROR);
 
   ptr = (*bufel)->msg.data;
-
-  session->internals.direction = 0;
-
+  
   reset_errno (session);
   i = pull_func (fd, ptr, recv_size);
 
@@ -232,13 +239,18 @@ cleanup:
 
 static ssize_t
 _gnutls_stream_read (gnutls_session_t session, mbuffer_st **bufel,
-                    size_t size, gnutls_pull_func pull_func)
+                    size_t size, gnutls_pull_func pull_func, unsigned int ms)
 {
   size_t left;
   ssize_t i = 0;
   size_t max_size = _gnutls_get_max_decrypted_data(session);
   uint8_t *ptr;
   gnutls_transport_ptr_t fd = session->internals.transport_recv_ptr;
+  int ret;
+  struct timespec t1, t2;
+  unsigned int diff;
+
+  session->internals.direction = 0;
 
   *bufel = _mbuffer_alloc (0, MAX(max_size, size));
   if (!*bufel)
@@ -248,11 +260,18 @@ _gnutls_stream_read (gnutls_session_t session, mbuffer_st 
**bufel,
     }
   ptr = (*bufel)->msg.data;
 
-  session->internals.direction = 0;
-
   left = size;
   while (left > 0)
     {
+      if (ms)
+        {
+          ret = _gnutls_io_check_recv(session, ms);
+          if (ret < 0)
+            return gnutls_assert_val(ret);
+            
+          gettime(&t1);
+        }
+
       reset_errno (session);
 
       i = pull_func (fd, &ptr[size - left], left);
@@ -291,9 +310,19 @@ _gnutls_stream_read (gnutls_session_t session, mbuffer_st 
**bufel,
           if (i == 0)
             break;              /* EOF */
         }
-
+        
       left -= i;
       (*bufel)->msg.size += i;
+
+      if (ms && left)
+        {
+          gettime(&t2);
+          diff = _dtls_timespec_sub_ms(&t2, &t1);
+          if (diff < ms)
+            ms -= diff;
+          else
+            return gnutls_assert_val(GNUTLS_E_TIMEDOUT);
+        }
     }
 
 finish:
@@ -312,13 +341,13 @@ finish:
  */
 static ssize_t
 _gnutls_read (gnutls_session_t session, mbuffer_st **bufel,
-             size_t size, gnutls_pull_func pull_func)
+             size_t size, gnutls_pull_func pull_func, unsigned int ms)
 {
   if (IS_DTLS (session))
     /* Size is not passed, since a whole datagram will be read. */
-    return _gnutls_dgram_read (session, bufel, pull_func);
+    return _gnutls_dgram_read (session, bufel, pull_func, ms);
   else
-    return _gnutls_stream_read (session, bufel, size, pull_func);
+    return _gnutls_stream_read (session, bufel, size, pull_func, ms);
 }
 
 static ssize_t
@@ -381,10 +410,13 @@ _gnutls_writev (gnutls_session_t session, const giovec_t 
* giovec,
  * This is not a general purpose function. It returns EXACTLY the data 
requested,
  * which are stored in a local (in the session) buffer.
  *
+ * If the @ms parameter is non zero then this function will return before
+ * the given amount of milliseconds or return GNUTLS_E_TIMEDOUT.
+ *
  */
 ssize_t
 _gnutls_io_read_buffered (gnutls_session_t session, size_t total,
-                          content_type_t recv_type)
+                          content_type_t recv_type, unsigned int ms)
 {
   ssize_t ret = 0;
   size_t min;
@@ -440,7 +472,7 @@ _gnutls_io_read_buffered (gnutls_session_t session, size_t 
total,
     {
       ret =
         _gnutls_read (session, &bufel, readsize,
-                      session->internals.pull_func);
+                      session->internals.pull_func, ms);
 
       /* return immediately if we got an interrupt or eagain
        * error.
@@ -1145,6 +1177,7 @@ _gnutls_handshake_io_recv_int (gnutls_session_t session,
                                handshake_buffer_st * hsk, unsigned int 
optional)
 {
   int ret;
+  time_t tleft = 0;
 
   ret = get_last_packet(session, htype, hsk, optional);
   if (ret != GNUTLS_E_AGAIN && ret != GNUTLS_E_INTERRUPTED && ret != 
GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE)
diff --git a/lib/gnutls_buffers.h b/lib/gnutls_buffers.h
index 04a89eb..52106ac 100644
--- a/lib/gnutls_buffers.h
+++ b/lib/gnutls_buffers.h
@@ -53,7 +53,7 @@ record_check_unprocessed (gnutls_session_t session)
 int _gnutls_record_buffer_get (content_type_t type,
                                gnutls_session_t session, uint8_t * data,
                                size_t length, uint8_t seq[8]);
-ssize_t _gnutls_io_read_buffered (gnutls_session_t, size_t n, content_type_t);
+ssize_t _gnutls_io_read_buffered (gnutls_session_t, size_t n, content_type_t, 
unsigned int ms);
 int _gnutls_io_clear_peeked_data (gnutls_session_t session);
 
 ssize_t _gnutls_io_write_buffered (gnutls_session_t session,
@@ -109,7 +109,7 @@ _gnutls_parse_record_buffered_msgs (gnutls_session_t 
session);
 
 ssize_t
 _gnutls_recv_in_buffers (gnutls_session_t session, content_type_t type,
-                  gnutls_handshake_description_t htype);
+                         gnutls_handshake_description_t htype);
 
 #define _gnutls_handshake_io_buffer_clear( session) \
         _mbuffer_head_clear( &session->internals.handshake_send_buffer); \
diff --git a/lib/gnutls_handshake.c b/lib/gnutls_handshake.c
index dc2da48..3f30e52 100644
--- a/lib/gnutls_handshake.c
+++ b/lib/gnutls_handshake.c
@@ -2364,9 +2364,31 @@ cleanup:
 int
 gnutls_handshake (gnutls_session_t session)
 {
+  return gnutls_handshake_timeout( session, 0);
+}
+
+/**
+ * gnutls_handshake_timeout:
+ * @session: is a #gnutls_session_t structure.
+ * @sec: is a timeout value in seconds
+ *
+ * This function is identical to the gnutls_handshake() but
+ * it also ensures that the handshake is completed within
+ * the provided timeout value.
+ *
+ * Returns: %GNUTLS_E_SUCCESS on success, %GNUTLS_E_TIMED_OUT on timeout, 
otherwise a negative error code.
+ **/
+int
+gnutls_handshake_timeout (gnutls_session_t session, unsigned int sec)
+{
   int ret;
   record_parameters_st *params;
   
+  if (sec > 0)
+    session->internals.handshake_endtime = gnutls_time(0) + sec;
+  else
+    session->internals.handshake_endtime = 0;
+  
   /* sanity check. Verify that there are priorities setup.
    */
   if (session->internals.priorities.protocol.algorithms == 0)
diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h
index 0f8f8c1..e0b324b 100644
--- a/lib/gnutls_int.h
+++ b/lib/gnutls_int.h
@@ -876,6 +876,8 @@ typedef struct
 
   unsigned int cb_tls_unique_len;
   unsigned char cb_tls_unique[MAX_VERIFY_DATA_SIZE];
+  
+  unsigned int handshake_endtime; /* end time in seconds */
 
   /* If you add anything here, check _gnutls_handshake_internal_state_clear().
    */
diff --git a/lib/gnutls_record.c b/lib/gnutls_record.c
index fbb84a1..4eaa79f 100644
--- a/lib/gnutls_record.c
+++ b/lib/gnutls_record.c
@@ -861,7 +861,9 @@ record_read_headers (gnutls_session_t session,
 
 
 static int recv_headers( gnutls_session_t session, content_type_t type, 
-  gnutls_handshake_description_t htype, struct tls_record_st* record)
+                         gnutls_handshake_description_t htype, 
+                         struct tls_record_st* record,
+                         unsigned int ms)
 {
 int ret;
 gnutls_datum_t raw; /* raw headers */
@@ -870,7 +872,7 @@ gnutls_datum_t raw; /* raw headers */
   record->header_size = record->packet_size = RECORD_HEADER_SIZE(session);
 
   if ((ret =
-       _gnutls_io_read_buffered (session, record->header_size, -1)) != 
record->header_size)
+       _gnutls_io_read_buffered (session, record->header_size, -1, ms)) != 
record->header_size)
     {
       if (ret < 0 && gnutls_error_is_fatal (ret) == 0)
         return ret;
@@ -941,6 +943,9 @@ gnutls_datum_t raw; /* raw headers */
 
 /* This will receive record layer packets and add them to 
  * application_data_buffer and handshake_data_buffer.
+ *
+ * If the htype is not -1 then handshake timeouts
+ * will be enforced.
  */
 ssize_t
 _gnutls_recv_in_buffers (gnutls_session_t session, content_type_t type,
@@ -954,6 +959,7 @@ _gnutls_recv_in_buffers (gnutls_session_t session, 
content_type_t type,
   record_parameters_st *record_params;
   record_state_st *record_state;
   struct tls_record_st record;
+  time_t now, tleft = 0;
 
 begin:
 
@@ -986,8 +992,17 @@ begin:
 
   record_state = &record_params->read;
 
+  if (htype != -1 && session->internals.handshake_endtime > 0)
+    {
+      now = gnutls_time(0);
+      if (now < session->internals.handshake_endtime)
+        tleft = (session->internals.handshake_endtime - now) * 1000;
+      else
+        return gnutls_assert_val(GNUTLS_E_TIMEDOUT);
+    }
+
   /* receive headers */
-  ret = recv_headers(session, type, htype, &record);
+  ret = recv_headers(session, type, htype, &record, tleft);
   if (ret < 0)
     {
       ret = gnutls_assert_val_fatal(ret);
@@ -999,11 +1014,20 @@ begin:
   else
     packet_sequence = &record_state->sequence_number;
 
+  if (htype != -1 && session->internals.handshake_endtime > 0)
+    {
+      now = gnutls_time(0);
+      if (now < session->internals.handshake_endtime)
+        tleft = (session->internals.handshake_endtime - now) * 1000;
+      else
+        return gnutls_assert_val(GNUTLS_E_TIMEDOUT);
+    }
+
   /* Read the packet data and insert it to record_recv_buffer.
    */
   ret =
        _gnutls_io_read_buffered (session, record.packet_size,
-                                 record.type);
+                                 record.type, tleft);
   if (ret != record.packet_size)
     {
       gnutls_assert();
diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index 25cb1ea..823f1d7 100644
--- a/lib/includes/gnutls/gnutls.h.in
+++ b/lib/includes/gnutls/gnutls.h.in
@@ -751,6 +751,9 @@ typedef enum
   int gnutls_bye (gnutls_session_t session, gnutls_close_request_t how);
 
   int gnutls_handshake (gnutls_session_t session);
+
+#define GNUTLS_DEFAULT_HANDSHAKE_TIMEOUT 60
+  int gnutls_handshake_timeout (gnutls_session_t session, unsigned int sec);
   int gnutls_rehandshake (gnutls_session_t session);
 
   gnutls_alert_description_t gnutls_alert_get (gnutls_session_t session);
diff --git a/lib/libgnutls.map b/lib/libgnutls.map
index 19f63c3..801c635 100644
--- a/lib/libgnutls.map
+++ b/lib/libgnutls.map
@@ -825,6 +825,7 @@ GNUTLS_3_1_0 {
        gnutls_pkcs11_privkey_set_pin_function;
        gnutls_certificate_set_pin_function;
        gnutls_x509_crt_set_pin_function;
+       gnutls_handshake_timeout;
 } GNUTLS_3_0_0;
 
 GNUTLS_PRIVATE {
diff --git a/src/cli.c b/src/cli.c
index 106c617..755ca1f 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -1183,7 +1183,7 @@ do_handshake (socket_st * socket)
                             gl_fd_to_handle (socket->fd));
   do
     {
-      ret = gnutls_handshake (socket->session);
+      ret = gnutls_handshake_timeout (socket->session, 
GNUTLS_DEFAULT_HANDSHAKE_TIMEOUT);
 
       if (ret < 0)
         {


hooks/post-receive
-- 
GNU gnutls



reply via email to

[Prev in Thread] Current Thread [Next in Thread]