Update to 3.2.1.

* Version 3.2.1 (released 2013-06-01)

** libgnutls: Allow ECC when in SSL 3.0 to work-around a bug in certain
openssl versions.

** libgnutls: Fixes in interrupted function resumption. Report
and patch by Tim Kosse.

** libgnutls: Corrected issue when receiving client hello verify requests
in DTLS.

** libgnutls: Fixes in DTLS record overhead size calculations.

** libgnutls: gnutls_handshake_get_last_in() was fixed. Reported
by Mann Ern Kang.

** API and ABI modifications:
gnutls_session_set_id: Added


* Version 3.2.0 (released 2013-05-10)

** libgnutls: Use nettle's elliptic curve implementation.

** libgnutls: Added Salsa20 cipher

** libgnutls: Added UMAC-96 and UMAC-128

** libgnutls: Added ciphersuites involving Salsa20 and UMAC-96.
As they are not standardized they are defined using private ciphersuite
numbers.

** libgnutls: Added support for DTLS 1.2.

** libgnutls: Added support for the Application Layer Protocol Negotiation
(ALPN) extension.

** libgnutls: Removed support for the RSA-EXPORT ciphersuites.

** libgnutls: Avoid linking to librt (that also avoids unnecessary
linking to pthreads if p11-kit isn't used).

** API and ABI modifications:
gnutls_cipher_get_iv_size: Added
gnutls_hmac_set_nonce: Added
gnutls_mac_get_nonce_size: Added


* Version 3.1.10 (released 2013-03-22)

** certtool: When generating PKCS #12 files use by default the
ARCFOUR (RC4) cipher to be compatible with devices that don't
support AES with PKCS #12.

** libgnutls: Load CA certificates in android 4.x systems.

** libgnutls: Optimized CA certificate loading.

** libgnutls: Private keys are overwritten on deinitialization.

** libgnutls: PKCS #11 slots are scanned only when needed, not
on initialization. This speeds up gnutls initialization when smart
cards are present.

** libgnutls: Corrected issue in the (deprecated) external key
signing interface, when used with TLS 1.2. Reported by Bjorn H. Christensen.

** libgnutls: Fixes in openpgp handshake with fingerprints. Reported by
Joke de Buhr.

** libgnutls-dane: Updated DANE verification options.

** configure: Trust store file must be explicitly set or unset when
cross compiling.

** API and ABI modifications:
gnutls_x509_crt_get_issuer_dn2: Added
gnutls_x509_crt_get_dn2: Added
gnutls_x509_crl_get_issuer_dn2: Added
gnutls_x509_crq_get_dn2: Added
gnutls_x509_trust_list_remove_trust_mem: Added
gnutls_x509_trust_list_remove_trust_file: Added
gnutls_x509_trust_list_remove_cas: Added
gnutls_session_get_desc: Added
gnutls_privkey_sign_raw_data: Added
gnutls_privkey_status: Added





* Version 3.1.9 (released 2013-02-27)

** certtool: Option --to-p12 will now ask for a password to generate
a PKCS #12 file from an encrypted key file. Reported by Yan Fiz.

** libgnutls: Corrected issue in gnutls_pubkey_verify_data().

** libgnutls: Corrected parsing issue in XMPP within a subject
alternative name. Reported by James Cloos.

** libgnutls: gnutls_pkcs11_reinit() will reinitialize all PKCS #11
modules, and not only the ones loaded via p11-kit.

** libgnutls: Added function to check whether the private key is
still available (inserted).

** libgnutls: Try to detect fork even during nonce generation.

** API and ABI modifications:
gnutls_handshake_set_random: Added
gnutls_transport_set_int2: Added
gnutls_transport_get_int2: Added
gnutls_transport_get_int: Added
gnutls_record_cork: Exported
gnutls_record_uncork: Exported
gnutls_pkcs11_privkey_status: Added


* Version 3.1.8 (released 2013-02-10)

** libgnutls: Fixed issue in gnutls_x509_privkey_import2() which didn't return
GNUTLS_E_DECRYPTION_FAILED in all cases, and affect certtool operation
with encrypted keys. Reported by Yan Fiz.

** libgnutls: The minimum DH bits accepted by priorities NORMAL and
PERFORMANCE was set to previous defaults 727 bits. Reported by Diego
Elio Petteno.

** libgnutls: Corrected issue which prevented gnutls_pubkey_verify_hash()
to operate with long keys. Reported by Erik A Jensen.

** API and ABI modifications:
No changes since last version.


* Version 3.1.7 (released 2013-02-04)

** certtool: Added option "dn" which allows to directly set the DN
in a template from an RFC4514 string.

** danetool: Added options: --dlv and --insecure. Suggested by Paul Wouters.

** libgnutls-xssl: Added a new library to simplify GnuTLS usage.

** libgnutls-dane: Added function to specify a DLV file.

** libgnutls: Heartbeat code was made optional.

** libgnutls: Fixes in server side of DTLS-0.9.

** libgnutls: DN variable 'T' was expanded to 'title'.

** libgnutls: Fixes in record padding parsing to prevent a timing attack.
Issue reported by Kenny Paterson and Nadhem Alfardan.

** libgnutls: Added functions to directly set the DN in a certificate
or request from an RFC4514 string.

** libgnutls: Optimizations in the random generator. The re-seeding of
it is now explicitly done on every session deinit.

** libgnutls: Simplified the DTLS sliding window implementation.

** libgnutls: The minimum DH bits accepted by a client are now set
by the specified priority string. The current values correspond to the
previous defaults (727 bits), except for the SECURE128 and SECURE192
strings which increase the minimum to 1248 and 1776 respectively.

** libgnutls: Added the gnutls_record_cork() and uncork API to enable
buffering in sending application data.

** libgnutls: Removed default random padding, and added a length-hiding interface
instead.  Both the server and the client must support this extension. Whether
length-hiding can be used on a given session can be checked using
gnutls_record_can_use_length_hiding(). Contributed by Alfredo Pironti.

** libgnutls: Added the experimental %NEW_PADDING priority string. It enables
a new padding mechanism in TLS allowing arbitrary padding in TLS records
in all ciphersuites, which makes length-hiding more efficient and solves
the issues with timing attacks on CBC ciphersuites.

** libgnutls: Corrected gnutls_cipher_decrypt2() when used with AEAD
ciphers (i.e., AES-GCM). Reported by William McGovern.

** API and ABI modifications:
gnutls_db_check_entry_time: Added
gnutls_record_set_timeout: Added
gnutls_record_get_random_padding_status: Added
gnutls_x509_crt_set_dn: Added
gnutls_x509_crt_set_issuer_dn: Added
gnutls_x509_crq_set_dn: Added
gnutls_range_split: Added
gnutls_record_send_range: Added
gnutls_record_set_max_empty_records: Added
gnutls_record_can_use_length_hiding: Added
gnutls_rnd_refresh: Added
xssl_deinit: Added
xssl_flush: Added
xssl_read: Added
xssl_getdelim: Added
xssl_write: Added
xssl_printf: Added
xssl_sinit: Added
xssl_client_init: Added
xssl_server_init: Added
xssl_get_session: Added
xssl_get_verify_status: Added
xssl_cred_init: Added
xssl_cred_deinit: Added
dane_state_set_dlv_file: Added
GNUTLS_SEC_PARAM_EXPORT: Added
GNUTLS_SEC_PARAM_VERY_WEAK: Added


* Version 3.1.6 (released 2013-01-02)

** libgnutls: Fixed record padding parsing issue. Reported by Kenny
Patterson and Nadhem Alfardan.

** libgnutls: Several updates in the ASN.1 string handling subsystem.

** libgnutls: gnutls_x509_crt_get_policy() allows for a list of zero
policy qualifiers.

** libgnutls: Ignore heartbeat messages when received out-of-order,
instead of issuing an error.

** libgnutls: Stricter RSA PKCS #1 1.5 encoding and decoding. Reported
by Kikuchi Masashi.

** libgnutls: TPM support is disabled by default because GPL programs
cannot link with it. Use --with-tpm to enable it.

** libgnutls-guile: Fixed parallel compilation issue.

** gnutls-cli: It will try to connect to all possible returned addresses
before failing.

** API and ABI modifications:
No changes since last version.


* Version 3.1.5 (released 2012-11-24)

** libgnutls: Added functions to parse the certificates policies
extension.

** libgnutls: Handle BMPString (UCS-2) encoding in the Distinguished
Name by translating it to UTF-8 (works on windows or systems with iconv).

** libgnutls: Added PKCS #11 key generation function that returns the
public key on generation.

** libgnutls: Corrected bug in priority string parsing, that mostly
affected combined levels. Patch by Tim Kosse.

** certtool: The --pubkey-info option can be combined with the
--load-privkey or --load-request to print the corresponding public keys.

** certtool: It is able to set certificate policies via a template.

** certtool: Added --hex-numbers option which prints big numbers in
an easier to parse format.

** p11tool: After key generation, outputs the public key (useful in
tokens that do not store the public key).

** danetool: It is being built even without libgnutls-dane (the
--check functionality is disabled though).

** API and ABI modifications:
gnutls_pkcs11_privkey_generate2: Added
gnutls_x509_crt_get_policy: Added
gnutls_x509_crt_set_policy: Added
gnutls_x509_policy_release: Added
gnutls_pubkey_import_x509_crq: Added
gnutls_pubkey_print: Added
GNUTLS_CRT_PRINT_FULL_NUMBERS: Added


* Version 3.1.4 (released 2012-11-10)

** libgnutls: gnutls_certificate_verify_peers2() will set flags depending on
the available revocation data validity.

** libgnutls: Added gnutls_certificate_verification_status_print(),
a function to print the verification status code in human readable text.

** libgnutls: Added priority string %VERIFY_DISABLE_CRL_CHECKS.

** libgnutls: Simplified certificate verification by adding
gnutls_certificate_verify_peers3().

** libgnutls: Added support for extension to establish keys for SRTP.
Contributed by Martin Storsjo.

** libgnutls: The X.509 verification functions check the key
usage bits and pathlen constraints and on failure output
GNUTLS_CERT_SIGNER_CONSTRAINTS_FAILURE.

** libgnutls: gnutls_x509_crl_verify() includes the time checks.

** libgnutls: Added verification flag GNUTLS_VERIFY_DO_NOT_ALLOW_UNSORTED_CHAIN
and made GNUTLS_VERIFY_ALLOW_UNSORTED_CHAIN the default.

** libgnutls: Always tolerate key usage violation errors from the side
of the peer, but also notify via an audit message.

** gnutls-cli: Added --local-dns option.

** danetool: Corrected bug that prevented loading PEM files.

** danetool: Added --check option to allow querying and verifying
a site's DANE data.

** libgnutls-dane: Added pkg-config file for the library.

** API and ABI modifications:
gnutls_session_get_id2: Added
gnutls_sign_is_secure: Added
gnutls_certificate_verify_peers3: Added
gnutls_ocsp_status_request_is_checked: Added
gnutls_certificate_verification_status_print: Added
gnutls_srtp_set_profile: Added
gnutls_srtp_set_profile_direct: Added
gnutls_srtp_get_selected_profile: Added
gnutls_srtp_get_profile_name: Added
gnutls_srtp_get_profile_id: Added
gnutls_srtp_get_keys: Added
gnutls_srtp_get_mki: Added
gnutls_srtp_set_mki: Added
gnutls_srtp_profile_t: Added
dane_cert_type_name: Added
dane_match_type_name: Added
dane_cert_usage_name: Added
dane_verification_status_print: Added
GNUTLS_CERT_REVOCATION_DATA_SUPERSEDED: Added
GNUTLS_CERT_REVOCATION_DATA_ISSUED_IN_FUTURE: Added
GNUTLS_CERT_SIGNER_CONSTRAINTS_FAILURE: Added
GNUTLS_CERT_UNEXPECTED_OWNER: Added
GNUTLS_VERIFY_DO_NOT_ALLOW_UNSORTED_CHAIN: Added


* Version 3.1.3 (released 2012-10-12)

** libgnutls: Added support for the OCSP Certificate Status
extension.

** libgnutls: gnutls_certificate_verify_peers2() will use the OCSP
certificate status extension in verification.

** libgnutls: Bug fixes in gnutls_x509_privkey_import_openssl().

** libgnutls: Increased maximum password length in the PKCS #12
functions.

** libgnutls: Fixed the receipt of session tickets during session resumption.
Reported by danblack at http://savannah.gnu.org/support/?108146

** libgnutls: Added functions to export structures in an allocated buffer.

** libgnutls: Added gnutls_ocsp_resp_check_crt() to check whether the OCSP
response corresponds to the given certificate.

** libgnutls: In client side gnutls_init() enables the session ticket and
OCSP certificate status request extensions by default. The flag
GNUTLS_NO_EXTENSIONS can be used to prevent that.

** libgnutls: Several updates in the OpenPGP code. The generating code
is fully RFC6091 compliant and RFC5081 support is only supported in client
mode.

** libgnutls-dane: Added. It is a library to provide DANE with DNSSEC
certificate verification.

** gnutls-cli: Added --dane option to enable DANE certificate verification.

** danetool: Added tool to generate DANE TLSA Resource Records (RR).

** API and ABI modifications:
gnutls_certificate_get_peers_subkey_id: Added
gnutls_certificate_set_ocsp_status_request_function: Added
gnutls_certificate_set_ocsp_status_request_file: Added
gnutls_ocsp_status_request_enable_client: Added
gnutls_ocsp_status_request_get: Added
gnutls_ocsp_resp_check_crt: Added
gnutls_dh_params_export2_pkcs3: Added
gnutls_pubkey_export2: Added
gnutls_x509_crt_export2: Added
gnutls_x509_dn_export2: Added
gnutls_x509_crl_export2: Added
gnutls_pkcs7_export2: Added
gnutls_x509_privkey_export2: Added
gnutls_x509_privkey_export2_pkcs8: Added
gnutls_x509_crq_export2: Added
gnutls_openpgp_crt_export2: Added
gnutls_openpgp_privkey_export2: Added
gnutls_pkcs11_obj_export2: Added
gnutls_pkcs12_export2: Added
gnutls_pubkey_import_openpgp_raw: Added
gnutls_pubkey_import_x509_raw: Added
dane_state_init: Added
dane_state_deinit: Added
dane_query_tlsa: Added
dane_query_status: Added
dane_query_entries: Added
dane_query_data: Added
dane_query_deinit: Added
dane_verify_session_crt: Added
dane_verify_crt: Added
dane_strerror: Added


* Version 3.1.2 (released 2012-09-26)

** libgnutls: Fixed bug in gnutls_x509_trust_list_add_system_trust()
and gnutls_x509_trust_list_add_trust_mem() that prevented the loading
of certificates in the windows platform.

** libgnutls: Corrected bug in OpenPGP subpacket encoding.

** libgnutls: Added support for DTLS/TLS heartbeats by Olga Smolenchuk.
(the work was done during Google Summer of Code).

** libgnutls: Added X.509 certificate verification flag
GNUTLS_VERIFY_ALLOW_UNSORTED_CHAIN. This flag allows the verification
of unsorted certificate chains and is enabled by default for
TLS certificate verification (if gnutls_certificate_set_verify_flags()
does not override it).

** libgnutls: Prints warning on certificates that contain keys of
an insecure level. If the %COMPAT priority flag is not specified
the TLS connection fails.

** libgnutls: Correctly restore gnutls_record_recv() in DTLS mode
if interrupted during the retrasmition of handshake data.

** libgnutls: Better mingw32 support (patch by LRN).

** libgnutls: The %COMPAT keyword, if specified, will tolerate
key usage violation errors (they are far too common to ignore).

** libgnutls: Added GNUTLS_STATELESS_COMPRESSION flag to gnutls_init(),
which provides a tool to counter compression-related attacks where
parts of the data are controlled by the attacker _and_ are placed in
separate records (use with care - do not use compression if not sure).

** libgnutls: Depends on libtasn1 2.14 or later.

** certtool: Prints the number of bits of the public key algorithm
parameter in a private key.

** API and ABI modifications:
gnutls_x509_privkey_get_pk_algorithm2: Added
gnutls_heartbeat_ping: Added
gnutls_heartbeat_pong: Added
gnutls_heartbeat_allowed: Added
gnutls_heartbeat_enable: Added
gnutls_heartbeat_set_timeouts: Added
gnutls_heartbeat_get_timeout: Added
GNUTLS_SEC_PARAM_WEAK: Added
GNUTLS_SEC_PARAM_INSECURE: Added

* Version 3.1.1 (released 2012-09-02)

** gnutls-serv: Listens on IPv6. Patch by Bernhard R. Link.

** certtool: Changes in password handling of certtool.
Ask password when required and only if the '--password' option is not
given. If the '--password' option is given during key generation then
assume the PKCS #8 file format, instead of ignoring the password.

** tpmtool: No longer asks for key password in registered keys.

** libgnutls: Elliptic curve code was optimized by Ilya Tumaykin.
wmNAF is now used for point multiplication and other optimizations.
(the major part of the work was done during Google Summer of Code).

** libgnutls: The default pull_timeout_function only uses select
instead of a combination of select() and recv() to prevent issues
when used in stream sockets in some systems.

** libgnutls: Be tolerant in ECDSA signature violations (e.g. using
SHA256 with a SECP384 curve instead of SHA-384), to interoperate with
openssl.

** libgnutls: Fixed DSA and ECDSA signature generation in smart
cards. Thanks to Andreas Schwier from cardcontact.de for providing
me with ECDSA capable smart cards.

** API and ABI modifications:
gnutls_sign_algorithm_get: Added
gnutls_sign_get_hash_algorithm: Added
gnutls_sign_get_pk_algorithm: Added


* Version 3.1.0 (released 2012-08-15)

** libgnutls: Added direct support for TPM as a cryptographic module
in gnutls/tpm.h. TPM keys can be used in functions accepting files
using URLs of the following types:
  tpmkey:file=/path/to/file
  tpmkey:uuid=7f468c16-cb7f-11e1-824d-b3a4f4b20343;storage=user

** libgnutls: Priority string level keywords can be combined.
For example the string "SECURE256:+SUITEB128" is now allowed.

** libgnutls: requires libnettle 2.5.

** libgnutls: Use the PKCS #1 1.5 encoding provided by nettle (2.5)
for encryption and signatures.

** libgnutls: Added GNUTLS_CERT_SIGNATURE_FAILURE to differentiate between
generic errors and signature verification errors in the verification
functions.

** libgnutls: Added gnutls_pkcs12_simple_parse() as a helper function
to simplify parsing in most PKCS #12 use cases.

** libgnutls: gnutls_certificate_set_x509_simple_pkcs12_file() adds
the whole certificate chain (if any) to the credentials structure, instead
of only the end-user certificate.

** libgnutls: Key import functions such as gnutls_pkcs12_simple_parse()
and gnutls_x509_privkey_import_pkcs8(), return consistently
GNUTLS_E_DECRYPTION_FAILED if the input structure is encrypted but no
password was provided.

** libgnutls: Added gnutls_handshake_set_timeout() a function that
allows to set the maximum time spent in a handshake.

** 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:
GNUTLS_CERT_SIGNATURE_FAILURE: Added
GNUTLS_CAMELLIA_192_CBC: Added
GNUTLS_PKCS_NULL_PASSWORD: Added
gnutls_url_is_supported: Added
gnutls_pkcs11_obj_list_import_url2: Added
gnutls_pkcs11_obj_set_pin_function: Added
gnutls_pkcs11_privkey_set_pin_function: Added
gnutls_pkcs11_get_pin_function: Added
gnutls_privkey_import_tpm_raw: Added
gnutls_privkey_import_tpm_url: Added
gnutls_privkey_import_pkcs11_url: Added
gnutls_privkey_import_openpgp_raw: Added
gnutls_privkey_import_x509_raw: Added
gnutls_privkey_import_ext2: Added
gnutls_privkey_import_url: Added
gnutls_privkey_set_pin_function: Added
gnutls_tpm_privkey_generate: Added
gnutls_tpm_key_list_deinit: Added
gnutls_tpm_key_list_get_url: Added
gnutls_tpm_get_registered: Added
gnutls_tpm_privkey_delete: Added
gnutls_pubkey_import_tpm_raw: Added
gnutls_pubkey_import_tpm_url: Added
gnutls_pubkey_import_url: Added
gnutls_pubkey_verify_hash2: Added
gnutls_pubkey_set_pin_function: Added
gnutls_x509_privkey_import2: Added
gnutls_x509_privkey_import_openssl: Added
gnutls_x509_crt_set_pin_function: Added
gnutls_load_file: Added
gnutls_pkcs12_simple_parse: Added
gnutls_certificate_set_x509_system_trust: Added
gnutls_certificate_set_pin_function: Added
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_set_timeout: Added
gnutls_pubkey_verify_hash: Deprecated (use gnutls_pubkey_verify_hash2)
gnutls_pubkey_verify_data: Deprecated (use gnutls_pubkey_verify_data2)

5 files changed, 165 insertions, 9 deletions

diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index 4d7fd985bbd..235c51be6bb 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.126 2013/05/31 12:41:51 wiz Exp $
+# $NetBSD: Makefile,v 1.127 2013/07/08 08:30:01 wiz Exp $
 
-DISTNAME=	gnutls-3.0.29
-PKGREVISION=	1
+DISTNAME=	gnutls-3.2.1
 CATEGORIES=	security devel
-MASTER_SITES=	ftp://ftp.gnutls.org/gcrypt/gnutls/v3.0/
+MASTER_SITES=	ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -50,6 +49,7 @@ post-install:
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libcfg+/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../devel/gmp/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libtasn1+=	libtasn1>=0.3.4
 .include "../../security/libtasn1/buildlink3.mk"
 .include "../../security/nettle/buildlink3.mk"
diff --git a/security/gnutls/PLIST b/security/gnutls/PLIST
index f29858a9dc5..a8558f5da05 100644
--- a/security/gnutls/PLIST
+++ b/security/gnutls/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.43 2012/10/10 11:44:31 drochner Exp $
+@comment $NetBSD: PLIST,v 1.44 2013/07/08 08:30:01 wiz Exp $
 bin/certtool
+bin/danetool
 bin/gnutls-cli
 bin/gnutls-cli-debug
 bin/gnutls-serv
@@ -16,7 +17,9 @@ include/gnutls/ocsp.h
 include/gnutls/openpgp.h
 include/gnutls/pkcs11.h
 include/gnutls/pkcs12.h
+include/gnutls/tpm.h
 include/gnutls/x509.h
+include/gnutls/xssl.h
 info/gnutls-client-server-use-case.png
 info/gnutls-guile.info
 info/gnutls-handshake-sequence.png
@@ -29,6 +32,7 @@ info/gnutls-pgp.png
 info/gnutls-x509.png
 info/gnutls.info
 info/pkcs11-vision.png
+lib/libgnutls-xssl.la
 lib/libgnutls.la
 lib/libgnutlsxx.la
 lib/pkgconfig/gnutls.pc
@@ -40,11 +44,14 @@ man/man1/ocsptool.1
 man/man1/p11tool.1
 man/man1/psktool.1
 man/man1/srptool.1
+man/man1/tpmtool.1
 man/man3/gnutls_alert_get.3
 man/man3/gnutls_alert_get_name.3
 man/man3/gnutls_alert_get_strname.3
 man/man3/gnutls_alert_send.3
 man/man3/gnutls_alert_send_appropriate.3
+man/man3/gnutls_alpn_get_selected_protocol.3
+man/man3/gnutls_alpn_set_protocols.3
 man/man3/gnutls_anon_allocate_client_credentials.3
 man/man3/gnutls_anon_allocate_server_credentials.3
 man/man3/gnutls_anon_free_client_credentials.3
@@ -68,10 +75,13 @@ man/man3/gnutls_certificate_free_keys.3
 man/man3/gnutls_certificate_get_issuer.3
 man/man3/gnutls_certificate_get_ours.3
 man/man3/gnutls_certificate_get_peers.3
+man/man3/gnutls_certificate_get_peers_subkey_id.3
 man/man3/gnutls_certificate_send_x509_rdn_sequence.3
 man/man3/gnutls_certificate_server_set_request.3
 man/man3/gnutls_certificate_set_dh_params.3
 man/man3/gnutls_certificate_set_key.3
+man/man3/gnutls_certificate_set_ocsp_status_request_file.3
+man/man3/gnutls_certificate_set_ocsp_status_request_function.3
 man/man3/gnutls_certificate_set_openpgp_key.3
 man/man3/gnutls_certificate_set_openpgp_key_file.3
 man/man3/gnutls_certificate_set_openpgp_key_file2.3
@@ -80,6 +90,7 @@ man/man3/gnutls_certificate_set_openpgp_key_mem2.3
 man/man3/gnutls_certificate_set_openpgp_keyring_file.3
 man/man3/gnutls_certificate_set_openpgp_keyring_mem.3
 man/man3/gnutls_certificate_set_params_function.3
+man/man3/gnutls_certificate_set_pin_function.3
 man/man3/gnutls_certificate_set_retrieve_function.3
 man/man3/gnutls_certificate_set_retrieve_function2.3
 man/man3/gnutls_certificate_set_rsa_export_params.3
@@ -91,7 +102,9 @@ man/man3/gnutls_certificate_set_x509_crl_file.3
 man/man3/gnutls_certificate_set_x509_crl_mem.3
 man/man3/gnutls_certificate_set_x509_key.3
 man/man3/gnutls_certificate_set_x509_key_file.3
+man/man3/gnutls_certificate_set_x509_key_file2.3
 man/man3/gnutls_certificate_set_x509_key_mem.3
+man/man3/gnutls_certificate_set_x509_key_mem2.3
 man/man3/gnutls_certificate_set_x509_simple_pkcs12_file.3
 man/man3/gnutls_certificate_set_x509_simple_pkcs12_mem.3
 man/man3/gnutls_certificate_set_x509_system_trust.3
@@ -103,7 +116,9 @@ man/man3/gnutls_certificate_type_get_id.3
 man/man3/gnutls_certificate_type_get_name.3
 man/man3/gnutls_certificate_type_list.3
 man/man3/gnutls_certificate_type_set_priority.3
+man/man3/gnutls_certificate_verification_status_print.3
 man/man3/gnutls_certificate_verify_peers2.3
+man/man3/gnutls_certificate_verify_peers3.3
 man/man3/gnutls_check_version.3
 man/man3/gnutls_cipher_add_auth.3
 man/man3/gnutls_cipher_decrypt.3
@@ -114,6 +129,7 @@ man/man3/gnutls_cipher_encrypt2.3
 man/man3/gnutls_cipher_get.3
 man/man3/gnutls_cipher_get_block_size.3
 man/man3/gnutls_cipher_get_id.3
+man/man3/gnutls_cipher_get_iv_size.3
 man/man3/gnutls_cipher_get_key_size.3
 man/man3/gnutls_cipher_get_name.3
 man/man3/gnutls_cipher_init.3
@@ -131,6 +147,7 @@ man/man3/gnutls_compression_set_priority.3
 man/man3/gnutls_credentials_clear.3
 man/man3/gnutls_credentials_set.3
 man/man3/gnutls_db_check_entry.3
+man/man3/gnutls_db_check_entry_time.3
 man/man3/gnutls_db_get_ptr.3
 man/man3/gnutls_db_remove_session.3
 man/man3/gnutls_db_set_cache_expiration.3
@@ -146,6 +163,7 @@ man/man3/gnutls_dh_get_pubkey.3
 man/man3/gnutls_dh_get_secret_bits.3
 man/man3/gnutls_dh_params_cpy.3
 man/man3/gnutls_dh_params_deinit.3
+man/man3/gnutls_dh_params_export2_pkcs3.3
 man/man3/gnutls_dh_params_export_pkcs3.3
 man/man3/gnutls_dh_params_export_raw.3
 man/man3/gnutls_dh_params_generate2.3
@@ -183,12 +201,20 @@ man/man3/gnutls_handshake_get_last_out.3
 man/man3/gnutls_handshake_set_max_packet_length.3
 man/man3/gnutls_handshake_set_post_client_hello_function.3
 man/man3/gnutls_handshake_set_private_extensions.3
+man/man3/gnutls_handshake_set_random.3
+man/man3/gnutls_handshake_set_timeout.3
 man/man3/gnutls_hash.3
 man/man3/gnutls_hash_deinit.3
 man/man3/gnutls_hash_fast.3
 man/man3/gnutls_hash_get_len.3
 man/man3/gnutls_hash_init.3
 man/man3/gnutls_hash_output.3
+man/man3/gnutls_heartbeat_allowed.3
+man/man3/gnutls_heartbeat_enable.3
+man/man3/gnutls_heartbeat_get_timeout.3
+man/man3/gnutls_heartbeat_ping.3
+man/man3/gnutls_heartbeat_pong.3
+man/man3/gnutls_heartbeat_set_timeouts.3
 man/man3/gnutls_hex2bin.3
 man/man3/gnutls_hex_decode.3
 man/man3/gnutls_hex_encode.3
@@ -198,6 +224,7 @@ man/man3/gnutls_hmac_fast.3
 man/man3/gnutls_hmac_get_len.3
 man/man3/gnutls_hmac_init.3
 man/man3/gnutls_hmac_output.3
+man/man3/gnutls_hmac_set_nonce.3
 man/man3/gnutls_init.3
 man/man3/gnutls_key_generate.3
 man/man3/gnutls_kx_get.3
@@ -205,10 +232,12 @@ man/man3/gnutls_kx_get_id.3
 man/man3/gnutls_kx_get_name.3
 man/man3/gnutls_kx_list.3
 man/man3/gnutls_kx_set_priority.3
+man/man3/gnutls_load_file.3
 man/man3/gnutls_mac_get.3
 man/man3/gnutls_mac_get_id.3
 man/man3/gnutls_mac_get_key_size.3
 man/man3/gnutls_mac_get_name.3
+man/man3/gnutls_mac_get_nonce_size.3
 man/man3/gnutls_mac_list.3
 man/man3/gnutls_mac_set_priority.3
 man/man3/gnutls_ocsp_req_add_cert.3
@@ -225,6 +254,7 @@ man/man3/gnutls_ocsp_req_print.3
 man/man3/gnutls_ocsp_req_randomize_nonce.3
 man/man3/gnutls_ocsp_req_set_extension.3
 man/man3/gnutls_ocsp_req_set_nonce.3
+man/man3/gnutls_ocsp_resp_check_crt.3
 man/man3/gnutls_ocsp_resp_deinit.3
 man/man3/gnutls_ocsp_resp_export.3
 man/man3/gnutls_ocsp_resp_get_certs.3
@@ -243,9 +273,13 @@ man/man3/gnutls_ocsp_resp_init.3
 man/man3/gnutls_ocsp_resp_print.3
 man/man3/gnutls_ocsp_resp_verify.3
 man/man3/gnutls_ocsp_resp_verify_direct.3
+man/man3/gnutls_ocsp_status_request_enable_client.3
+man/man3/gnutls_ocsp_status_request_get.3
+man/man3/gnutls_ocsp_status_request_is_checked.3
 man/man3/gnutls_openpgp_crt_check_hostname.3
 man/man3/gnutls_openpgp_crt_deinit.3
 man/man3/gnutls_openpgp_crt_export.3
+man/man3/gnutls_openpgp_crt_export2.3
 man/man3/gnutls_openpgp_crt_get_auth_subkey.3
 man/man3/gnutls_openpgp_crt_get_creation_time.3
 man/man3/gnutls_openpgp_crt_get_expiration_time.3
@@ -284,6 +318,7 @@ man/man3/gnutls_openpgp_keyring_import.3
 man/man3/gnutls_openpgp_keyring_init.3
 man/man3/gnutls_openpgp_privkey_deinit.3
 man/man3/gnutls_openpgp_privkey_export.3
+man/man3/gnutls_openpgp_privkey_export2.3
 man/man3/gnutls_openpgp_privkey_export_dsa_raw.3
 man/man3/gnutls_openpgp_privkey_export_rsa_raw.3
 man/man3/gnutls_openpgp_privkey_export_subkey_dsa_raw.3
@@ -330,22 +365,29 @@ man/man3/gnutls_pkcs11_copy_x509_crt.3
 man/man3/gnutls_pkcs11_copy_x509_privkey.3
 man/man3/gnutls_pkcs11_deinit.3
 man/man3/gnutls_pkcs11_delete_url.3
+man/man3/gnutls_pkcs11_get_pin_function.3
 man/man3/gnutls_pkcs11_init.3
 man/man3/gnutls_pkcs11_obj_deinit.3
 man/man3/gnutls_pkcs11_obj_export.3
+man/man3/gnutls_pkcs11_obj_export2.3
 man/man3/gnutls_pkcs11_obj_export_url.3
 man/man3/gnutls_pkcs11_obj_get_info.3
 man/man3/gnutls_pkcs11_obj_get_type.3
 man/man3/gnutls_pkcs11_obj_import_url.3
 man/man3/gnutls_pkcs11_obj_init.3
 man/man3/gnutls_pkcs11_obj_list_import_url.3
+man/man3/gnutls_pkcs11_obj_list_import_url2.3
+man/man3/gnutls_pkcs11_obj_set_pin_function.3
 man/man3/gnutls_pkcs11_privkey_deinit.3
 man/man3/gnutls_pkcs11_privkey_export_url.3
 man/man3/gnutls_pkcs11_privkey_generate.3
+man/man3/gnutls_pkcs11_privkey_generate2.3
 man/man3/gnutls_pkcs11_privkey_get_info.3
 man/man3/gnutls_pkcs11_privkey_get_pk_algorithm.3
 man/man3/gnutls_pkcs11_privkey_import_url.3
 man/man3/gnutls_pkcs11_privkey_init.3
+man/man3/gnutls_pkcs11_privkey_set_pin_function.3
+man/man3/gnutls_pkcs11_privkey_status.3
 man/man3/gnutls_pkcs11_reinit.3
 man/man3/gnutls_pkcs11_set_pin_function.3
 man/man3/gnutls_pkcs11_set_token_function.3
@@ -372,16 +414,19 @@ man/man3/gnutls_pkcs12_bag_set_friendly_name.3
 man/man3/gnutls_pkcs12_bag_set_key_id.3
 man/man3/gnutls_pkcs12_deinit.3
 man/man3/gnutls_pkcs12_export.3
+man/man3/gnutls_pkcs12_export2.3
 man/man3/gnutls_pkcs12_generate_mac.3
 man/man3/gnutls_pkcs12_get_bag.3
 man/man3/gnutls_pkcs12_import.3
 man/man3/gnutls_pkcs12_init.3
 man/man3/gnutls_pkcs12_set_bag.3
+man/man3/gnutls_pkcs12_simple_parse.3
 man/man3/gnutls_pkcs12_verify_mac.3
 man/man3/gnutls_pkcs7_deinit.3
 man/man3/gnutls_pkcs7_delete_crl.3
 man/man3/gnutls_pkcs7_delete_crt.3
 man/man3/gnutls_pkcs7_export.3
+man/man3/gnutls_pkcs7_export2.3
 man/man3/gnutls_pkcs7_get_crl_count.3
 man/man3/gnutls_pkcs7_get_crl_raw.3
 man/man3/gnutls_pkcs7_get_crt_count.3
@@ -409,12 +454,22 @@ man/man3/gnutls_privkey_deinit.3
 man/man3/gnutls_privkey_get_pk_algorithm.3
 man/man3/gnutls_privkey_get_type.3
 man/man3/gnutls_privkey_import_ext.3
+man/man3/gnutls_privkey_import_ext2.3
 man/man3/gnutls_privkey_import_openpgp.3
+man/man3/gnutls_privkey_import_openpgp_raw.3
 man/man3/gnutls_privkey_import_pkcs11.3
+man/man3/gnutls_privkey_import_pkcs11_url.3
+man/man3/gnutls_privkey_import_tpm_raw.3
+man/man3/gnutls_privkey_import_tpm_url.3
+man/man3/gnutls_privkey_import_url.3
 man/man3/gnutls_privkey_import_x509.3
+man/man3/gnutls_privkey_import_x509_raw.3
 man/man3/gnutls_privkey_init.3
+man/man3/gnutls_privkey_set_pin_function.3
 man/man3/gnutls_privkey_sign_data.3
 man/man3/gnutls_privkey_sign_hash.3
+man/man3/gnutls_privkey_sign_raw_data.3
+man/man3/gnutls_privkey_status.3
 man/man3/gnutls_protocol_get_id.3
 man/man3/gnutls_protocol_get_name.3
 man/man3/gnutls_protocol_get_version.3
@@ -437,6 +492,7 @@ man/man3/gnutls_psk_set_server_params_function.3
 man/man3/gnutls_pubkey_deinit.3
 man/man3/gnutls_pubkey_encrypt_data.3
 man/man3/gnutls_pubkey_export.3
+man/man3/gnutls_pubkey_export2.3
 man/man3/gnutls_pubkey_get_key_id.3
 man/man3/gnutls_pubkey_get_key_usage.3
 man/man3/gnutls_pubkey_get_openpgp_key_id.3
@@ -452,19 +508,30 @@ man/man3/gnutls_pubkey_import_dsa_raw.3
 man/man3/gnutls_pubkey_import_ecc_raw.3
 man/man3/gnutls_pubkey_import_ecc_x962.3
 man/man3/gnutls_pubkey_import_openpgp.3
+man/man3/gnutls_pubkey_import_openpgp_raw.3
 man/man3/gnutls_pubkey_import_pkcs11.3
 man/man3/gnutls_pubkey_import_pkcs11_url.3
 man/man3/gnutls_pubkey_import_privkey.3
 man/man3/gnutls_pubkey_import_rsa_raw.3
+man/man3/gnutls_pubkey_import_tpm_raw.3
+man/man3/gnutls_pubkey_import_tpm_url.3
+man/man3/gnutls_pubkey_import_url.3
 man/man3/gnutls_pubkey_import_x509.3
+man/man3/gnutls_pubkey_import_x509_crq.3
+man/man3/gnutls_pubkey_import_x509_raw.3
 man/man3/gnutls_pubkey_init.3
+man/man3/gnutls_pubkey_print.3
 man/man3/gnutls_pubkey_set_key_usage.3
+man/man3/gnutls_pubkey_set_pin_function.3
 man/man3/gnutls_pubkey_verify_data.3
 man/man3/gnutls_pubkey_verify_data2.3
 man/man3/gnutls_pubkey_verify_hash.3
 man/man3/gnutls_pubkey_verify_hash2.3
 man/man3/gnutls_random_art.3
+man/man3/gnutls_range_split.3
+man/man3/gnutls_record_can_use_length_hiding.3
 man/man3/gnutls_record_check_pending.3
+man/man3/gnutls_record_cork.3
 man/man3/gnutls_record_disable_padding.3
 man/man3/gnutls_record_get_direction.3
 man/man3/gnutls_record_get_discarded.3
@@ -472,9 +539,14 @@ man/man3/gnutls_record_get_max_size.3
 man/man3/gnutls_record_recv.3
 man/man3/gnutls_record_recv_seq.3
 man/man3/gnutls_record_send.3
+man/man3/gnutls_record_send_range.3
+man/man3/gnutls_record_set_max_empty_records.3
 man/man3/gnutls_record_set_max_size.3
+man/man3/gnutls_record_set_timeout.3
+man/man3/gnutls_record_uncork.3
 man/man3/gnutls_rehandshake.3
 man/man3/gnutls_rnd.3
+man/man3/gnutls_rnd_refresh.3
 man/man3/gnutls_rsa_export_get_modulus_bits.3
 man/man3/gnutls_rsa_export_get_pubkey.3
 man/man3/gnutls_rsa_params_cpy.3
@@ -492,14 +564,18 @@ man/man3/gnutls_server_name_get.3
 man/man3/gnutls_server_name_set.3
 man/man3/gnutls_session_channel_binding.3
 man/man3/gnutls_session_enable_compatibility_mode.3
+man/man3/gnutls_session_force_valid.3
 man/man3/gnutls_session_get_data.3
 man/man3/gnutls_session_get_data2.3
+man/man3/gnutls_session_get_desc.3
 man/man3/gnutls_session_get_id.3
+man/man3/gnutls_session_get_id2.3
 man/man3/gnutls_session_get_ptr.3
 man/man3/gnutls_session_get_random.3
 man/man3/gnutls_session_is_resumed.3
 man/man3/gnutls_session_resumption_requested.3
 man/man3/gnutls_session_set_data.3
+man/man3/gnutls_session_set_id.3
 man/man3/gnutls_session_set_premaster.3
 man/man3/gnutls_session_set_ptr.3
 man/man3/gnutls_session_ticket_enable_client.3
@@ -507,11 +583,16 @@ man/man3/gnutls_session_ticket_enable_server.3
 man/man3/gnutls_session_ticket_key_generate.3
 man/man3/gnutls_set_default_export_priority.3
 man/man3/gnutls_set_default_priority.3
+man/man3/gnutls_sign_algorithm_get.3
+man/man3/gnutls_sign_algorithm_get_client.3
 man/man3/gnutls_sign_algorithm_get_requested.3
 man/man3/gnutls_sign_callback_get.3
 man/man3/gnutls_sign_callback_set.3
+man/man3/gnutls_sign_get_hash_algorithm.3
 man/man3/gnutls_sign_get_id.3
 man/man3/gnutls_sign_get_name.3
+man/man3/gnutls_sign_get_pk_algorithm.3
+man/man3/gnutls_sign_is_secure.3
 man/man3/gnutls_sign_list.3
 man/man3/gnutls_srp_allocate_client_credentials.3
 man/man3/gnutls_srp_allocate_server_credentials.3
@@ -528,6 +609,14 @@ man/man3/gnutls_srp_set_prime_bits.3
 man/man3/gnutls_srp_set_server_credentials_file.3
 man/man3/gnutls_srp_set_server_credentials_function.3
 man/man3/gnutls_srp_verifier.3
+man/man3/gnutls_srtp_get_keys.3
+man/man3/gnutls_srtp_get_mki.3
+man/man3/gnutls_srtp_get_profile_id.3
+man/man3/gnutls_srtp_get_profile_name.3
+man/man3/gnutls_srtp_get_selected_profile.3
+man/man3/gnutls_srtp_set_mki.3
+man/man3/gnutls_srtp_set_profile.3
+man/man3/gnutls_srtp_set_profile_direct.3
 man/man3/gnutls_store_commitment.3
 man/man3/gnutls_store_pubkey.3
 man/man3/gnutls_strerror.3
@@ -538,20 +627,31 @@ man/man3/gnutls_tdb_init.3
 man/man3/gnutls_tdb_set_store_commitment_func.3
 man/man3/gnutls_tdb_set_store_func.3
 man/man3/gnutls_tdb_set_verify_func.3
+man/man3/gnutls_tpm_get_registered.3
+man/man3/gnutls_tpm_key_list_deinit.3
+man/man3/gnutls_tpm_key_list_get_url.3
+man/man3/gnutls_tpm_privkey_delete.3
+man/man3/gnutls_tpm_privkey_generate.3
+man/man3/gnutls_transport_get_int.3
+man/man3/gnutls_transport_get_int2.3
 man/man3/gnutls_transport_get_ptr.3
 man/man3/gnutls_transport_get_ptr2.3
 man/man3/gnutls_transport_set_errno.3
 man/man3/gnutls_transport_set_errno_function.3
+man/man3/gnutls_transport_set_int.3
+man/man3/gnutls_transport_set_int2.3
 man/man3/gnutls_transport_set_ptr.3
 man/man3/gnutls_transport_set_ptr2.3
 man/man3/gnutls_transport_set_pull_function.3
 man/man3/gnutls_transport_set_pull_timeout_function.3
 man/man3/gnutls_transport_set_push_function.3
 man/man3/gnutls_transport_set_vec_push_function.3
+man/man3/gnutls_url_is_supported.3
 man/man3/gnutls_verify_stored_pubkey.3
 man/man3/gnutls_x509_crl_check_issuer.3
 man/man3/gnutls_x509_crl_deinit.3
 man/man3/gnutls_x509_crl_export.3
+man/man3/gnutls_x509_crl_export2.3
 man/man3/gnutls_x509_crl_get_authority_key_gn_serial.3
 man/man3/gnutls_x509_crl_get_authority_key_id.3
 man/man3/gnutls_x509_crl_get_crt_count.3
@@ -561,6 +661,7 @@ man/man3/gnutls_x509_crl_get_extension_data.3
 man/man3/gnutls_x509_crl_get_extension_info.3
 man/man3/gnutls_x509_crl_get_extension_oid.3
 man/man3/gnutls_x509_crl_get_issuer_dn.3
+man/man3/gnutls_x509_crl_get_issuer_dn2.3
 man/man3/gnutls_x509_crl_get_issuer_dn_by_oid.3
 man/man3/gnutls_x509_crl_get_next_update.3
 man/man3/gnutls_x509_crl_get_number.3
@@ -587,12 +688,14 @@ man/man3/gnutls_x509_crl_sign2.3
 man/man3/gnutls_x509_crl_verify.3
 man/man3/gnutls_x509_crq_deinit.3
 man/man3/gnutls_x509_crq_export.3
+man/man3/gnutls_x509_crq_export2.3
 man/man3/gnutls_x509_crq_get_attribute_by_oid.3
 man/man3/gnutls_x509_crq_get_attribute_data.3
 man/man3/gnutls_x509_crq_get_attribute_info.3
 man/man3/gnutls_x509_crq_get_basic_constraints.3
 man/man3/gnutls_x509_crq_get_challenge_password.3
 man/man3/gnutls_x509_crq_get_dn.3
+man/man3/gnutls_x509_crq_get_dn2.3
 man/man3/gnutls_x509_crq_get_dn_by_oid.3
 man/man3/gnutls_x509_crq_get_dn_oid.3
 man/man3/gnutls_x509_crq_get_extension_by_oid.3
@@ -614,6 +717,7 @@ man/man3/gnutls_x509_crq_privkey_sign.3
 man/man3/gnutls_x509_crq_set_attribute_by_oid.3
 man/man3/gnutls_x509_crq_set_basic_constraints.3
 man/man3/gnutls_x509_crq_set_challenge_password.3
+man/man3/gnutls_x509_crq_set_dn.3
 man/man3/gnutls_x509_crq_set_dn_by_oid.3
 man/man3/gnutls_x509_crq_set_key.3
 man/man3/gnutls_x509_crq_set_key_purpose_oid.3
@@ -632,6 +736,7 @@ man/man3/gnutls_x509_crt_check_revocation.3
 man/man3/gnutls_x509_crt_cpy_crl_dist_points.3
 man/man3/gnutls_x509_crt_deinit.3
 man/man3/gnutls_x509_crt_export.3
+man/man3/gnutls_x509_crt_export2.3
 man/man3/gnutls_x509_crt_get_activation_time.3
 man/man3/gnutls_x509_crt_get_authority_info_access.3
 man/man3/gnutls_x509_crt_get_authority_key_gn_serial.3
@@ -640,6 +745,7 @@ man/man3/gnutls_x509_crt_get_basic_constraints.3
 man/man3/gnutls_x509_crt_get_ca_status.3
 man/man3/gnutls_x509_crt_get_crl_dist_points.3
 man/man3/gnutls_x509_crt_get_dn.3
+man/man3/gnutls_x509_crt_get_dn2.3
 man/man3/gnutls_x509_crt_get_dn_by_oid.3
 man/man3/gnutls_x509_crt_get_dn_oid.3
 man/man3/gnutls_x509_crt_get_expiration_time.3
@@ -653,6 +759,7 @@ man/man3/gnutls_x509_crt_get_issuer_alt_name.3
 man/man3/gnutls_x509_crt_get_issuer_alt_name2.3
 man/man3/gnutls_x509_crt_get_issuer_alt_othername_oid.3
 man/man3/gnutls_x509_crt_get_issuer_dn.3
+man/man3/gnutls_x509_crt_get_issuer_dn2.3
 man/man3/gnutls_x509_crt_get_issuer_dn_by_oid.3
 man/man3/gnutls_x509_crt_get_issuer_dn_oid.3
 man/man3/gnutls_x509_crt_get_issuer_unique_id.3
@@ -662,6 +769,7 @@ man/man3/gnutls_x509_crt_get_key_usage.3
 man/man3/gnutls_x509_crt_get_pk_algorithm.3
 man/man3/gnutls_x509_crt_get_pk_dsa_raw.3
 man/man3/gnutls_x509_crt_get_pk_rsa_raw.3
+man/man3/gnutls_x509_crt_get_policy.3
 man/man3/gnutls_x509_crt_get_preferred_hash_algorithm.3
 man/man3/gnutls_x509_crt_get_private_key_usage_period.3
 man/man3/gnutls_x509_crt_get_proxy.3
@@ -697,13 +805,17 @@ man/man3/gnutls_x509_crt_set_crl_dist_points.3
 man/man3/gnutls_x509_crt_set_crl_dist_points2.3
 man/man3/gnutls_x509_crt_set_crq.3
 man/man3/gnutls_x509_crt_set_crq_extensions.3
+man/man3/gnutls_x509_crt_set_dn.3
 man/man3/gnutls_x509_crt_set_dn_by_oid.3
 man/man3/gnutls_x509_crt_set_expiration_time.3
 man/man3/gnutls_x509_crt_set_extension_by_oid.3
+man/man3/gnutls_x509_crt_set_issuer_dn.3
 man/man3/gnutls_x509_crt_set_issuer_dn_by_oid.3
 man/man3/gnutls_x509_crt_set_key.3
 man/man3/gnutls_x509_crt_set_key_purpose_oid.3
 man/man3/gnutls_x509_crt_set_key_usage.3
+man/man3/gnutls_x509_crt_set_pin_function.3
+man/man3/gnutls_x509_crt_set_policy.3
 man/man3/gnutls_x509_crt_set_private_key_usage_period.3
 man/man3/gnutls_x509_crt_set_proxy.3
 man/man3/gnutls_x509_crt_set_proxy_dn.3
@@ -720,14 +832,18 @@ man/man3/gnutls_x509_crt_verify_data.3
 man/man3/gnutls_x509_crt_verify_hash.3
 man/man3/gnutls_x509_dn_deinit.3
 man/man3/gnutls_x509_dn_export.3
+man/man3/gnutls_x509_dn_export2.3
 man/man3/gnutls_x509_dn_get_rdn_ava.3
 man/man3/gnutls_x509_dn_import.3
 man/man3/gnutls_x509_dn_init.3
 man/man3/gnutls_x509_dn_oid_known.3
 man/man3/gnutls_x509_dn_oid_name.3
+man/man3/gnutls_x509_policy_release.3
 man/man3/gnutls_x509_privkey_cpy.3
 man/man3/gnutls_x509_privkey_deinit.3
 man/man3/gnutls_x509_privkey_export.3
+man/man3/gnutls_x509_privkey_export2.3
+man/man3/gnutls_x509_privkey_export2_pkcs8.3
 man/man3/gnutls_x509_privkey_export_dsa_raw.3
 man/man3/gnutls_x509_privkey_export_ecc_raw.3
 man/man3/gnutls_x509_privkey_export_pkcs8.3
@@ -737,9 +853,12 @@ man/man3/gnutls_x509_privkey_fix.3
 man/man3/gnutls_x509_privkey_generate.3
 man/man3/gnutls_x509_privkey_get_key_id.3
 man/man3/gnutls_x509_privkey_get_pk_algorithm.3
+man/man3/gnutls_x509_privkey_get_pk_algorithm2.3
 man/man3/gnutls_x509_privkey_import.3
+man/man3/gnutls_x509_privkey_import2.3
 man/man3/gnutls_x509_privkey_import_dsa_raw.3
 man/man3/gnutls_x509_privkey_import_ecc_raw.3
+man/man3/gnutls_x509_privkey_import_openssl.3
 man/man3/gnutls_x509_privkey_import_pkcs8.3
 man/man3/gnutls_x509_privkey_import_rsa_raw.3
 man/man3/gnutls_x509_privkey_import_rsa_raw2.3
@@ -754,9 +873,15 @@ man/man3/gnutls_x509_rdn_get_oid.3
 man/man3/gnutls_x509_trust_list_add_cas.3
 man/man3/gnutls_x509_trust_list_add_crls.3
 man/man3/gnutls_x509_trust_list_add_named_crt.3
+man/man3/gnutls_x509_trust_list_add_system_trust.3
+man/man3/gnutls_x509_trust_list_add_trust_file.3
+man/man3/gnutls_x509_trust_list_add_trust_mem.3
 man/man3/gnutls_x509_trust_list_deinit.3
 man/man3/gnutls_x509_trust_list_get_issuer.3
 man/man3/gnutls_x509_trust_list_init.3
+man/man3/gnutls_x509_trust_list_remove_cas.3
+man/man3/gnutls_x509_trust_list_remove_trust_file.3
+man/man3/gnutls_x509_trust_list_remove_trust_mem.3
 man/man3/gnutls_x509_trust_list_verify_crt.3
 man/man3/gnutls_x509_trust_list_verify_named_crt.3
 share/examples/gnutls/ex-alert.c
@@ -768,6 +893,8 @@ share/examples/gnutls/ex-client-psk.c
 share/examples/gnutls/ex-client-resume.c
 share/examples/gnutls/ex-client-srp.c
 share/examples/gnutls/ex-client-x509.c
+share/examples/gnutls/ex-client-xssl1.c
+share/examples/gnutls/ex-client-xssl2.c
 share/examples/gnutls/ex-crq.c
 share/examples/gnutls/ex-ocsp-client.c
 share/examples/gnutls/ex-pkcs11-list.c
@@ -790,6 +917,7 @@ share/locale/cs/LC_MESSAGES/gnutls.mo
 share/locale/de/LC_MESSAGES/gnutls.mo
 share/locale/en@boldquot/LC_MESSAGES/gnutls.mo
 share/locale/en@quot/LC_MESSAGES/gnutls.mo
+share/locale/eo/LC_MESSAGES/gnutls.mo
 share/locale/fi/LC_MESSAGES/gnutls.mo
 share/locale/fr/LC_MESSAGES/gnutls.mo
 share/locale/it/LC_MESSAGES/gnutls.mo
diff --git a/security/gnutls/distinfo b/security/gnutls/distinfo
index fd832d79072..1766d88f917 100644
--- a/security/gnutls/distinfo
+++ b/security/gnutls/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.93 2013/04/10 15:09:10 drochner Exp $
+$NetBSD: distinfo,v 1.94 2013/07/08 08:30:01 wiz Exp $
 
-SHA1 (gnutls-3.0.29.tar.xz) = d2baf351012f8ccff8e446b2d0bd12839872012a
-RMD160 (gnutls-3.0.29.tar.xz) = 5fca1e257c43be9965deda35293451c202718325
-Size (gnutls-3.0.29.tar.xz) = 4666764 bytes
+SHA1 (gnutls-3.2.1.tar.xz) = 477118eaffb8f16bd7fd511069c2c5d618f6e400
+RMD160 (gnutls-3.2.1.tar.xz) = 1a94b39f2209b9226035f4d90a88a16d3d17898b
+Size (gnutls-3.2.1.tar.xz) = 5127332 bytes
 SHA1 (patch-ae) = 71fbbeb43ac1689fca6fec7f8348d8534c1dc38a
 SHA1 (patch-gl_stdio.in.h) = b5802da2cccddd6fab73bd39c49f7d62bef58464
+SHA1 (patch-lib_Makefile.in) = e97a6229381c31be6486a6671a0b34a7b72af981
 SHA1 (patch-lib_nettle_egd.c) = b7e9769e8c620519c43ca7b7481a558e9d389c68
+SHA1 (patch-src_benchmark.h) = d1e6801b4b76cfb299be126185616bedf658660a
diff --git a/security/gnutls/patches/patch-lib_Makefile.in b/security/gnutls/patches/patch-lib_Makefile.in
new file mode 100644
index 00000000000..3dd3b9bf5fb
--- /dev/null
+++ b/security/gnutls/patches/patch-lib_Makefile.in
@@ -0,0 +1,13 @@
+$NetBSD: patch-lib_Makefile.in,v 1.1 2013/07/08 08:30:01 wiz Exp $
+
+--- lib/Makefile.in.orig	2013-07-07 13:37:03.000000000 +0000
++++ lib/Makefile.in
+@@ -350,7 +350,7 @@ am_libgnutls_la_OBJECTS = $(am__objects_
+ libgnutls_la_OBJECTS = $(am_libgnutls_la_OBJECTS)
+ libgnutls_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(libgnutls_la_LDFLAGS) $(LDFLAGS) -o $@
++	$(libgnutls_la_LDFLAGS) $(LDFLAGS) -lgmp -o $@
+ @ENABLE_CXX_TRUE@libgnutlsxx_la_DEPENDENCIES = libgnutls.la
+ am__libgnutlsxx_la_SOURCES_DIST = gnutlsxx.cpp
+ @ENABLE_CXX_TRUE@am_libgnutlsxx_la_OBJECTS =  \
diff --git a/security/gnutls/patches/patch-src_benchmark.h b/security/gnutls/patches/patch-src_benchmark.h
new file mode 100644
index 00000000000..797626c22d8
--- /dev/null
+++ b/security/gnutls/patches/patch-src_benchmark.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_benchmark.h,v 1.1 2013/07/08 08:30:01 wiz Exp $
+
+--- src/benchmark.h.orig	2013-05-25 11:06:37.000000000 +0000
++++ src/benchmark.h
+@@ -24,7 +24,7 @@
+ # include <windows.h>
+ #endif
+ 
+-#if defined(HAVE_CLOCK_GETTIME)
++#if defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_PROCESS_CPUTIME_ID)
+ # undef gettime
+ # define gettime(x) clock_gettime(CLOCK_PROCESS_CPUTIME_ID, x)
+ #else