Update to 3.5.8.

PR:		215909
Submitted by:	brnrd
Exp-run by:	antoine
MFH:		2017Q1
Security:	0c5369fc-d671-11e6-a9a5-b499baebfeaf

4 files changed, 71 insertions, 16 deletions

diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index b215eb3c50ed..1f31e361086e 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	gnutls
-PORTVERSION=	3.4.17
+PORTVERSION=	3.5.8
 CATEGORIES=	security net
 MASTER_SITES=	GNUPG/gnutls/v${PORTVERSION:R}
 
@@ -10,12 +10,13 @@ COMMENT=	GNU Transport Layer Security library
 
 LICENSE=	GPLv3 LGPL21
 LICENSE_COMB=	multi
-LICENSE_FILE_GPLv3=	${WRKSRC}/COPYING
-LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING.LESSER
+LICENSE_FILE_GPLv3=	${WRKSRC}/doc/COPYING
+LICENSE_FILE_LGPL21=	${WRKSRC}/doc/COPYING.LESSER
 
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libnettle.so:security/nettle \
-		libtasn1.so:security/libtasn1
+		libtasn1.so:security/libtasn1 \
+		libunistring.so:devel/libunistring
 BUILD_DEPENDS+=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 RUN_DEPENDS+=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
diff --git a/security/gnutls/distinfo b/security/gnutls/distinfo
index 54180c969a13..8ac132b43bc5 100644
--- a/security/gnutls/distinfo
+++ b/security/gnutls/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1481276012
-SHA256 (gnutls-3.4.17.tar.xz) = 9b50e8a670d5e950425d96935c7ddd415eb6f8079615a36df425f09a3143172e
-SIZE (gnutls-3.4.17.tar.xz) = 6709492
+TIMESTAMP = 1483969740
+SHA256 (gnutls-3.5.8.tar.xz) = 0e97f243ae72b70307d684b84c7fe679385aa7a7a0e37e5be810193dcc17d4ff
+SIZE (gnutls-3.5.8.tar.xz) = 7264448
diff --git a/security/gnutls/files/patch-lib-tpm.c b/security/gnutls/files/patch-lib-tpm.c
index 72057bfd6654..4044441a52b7 100644
--- a/security/gnutls/files/patch-lib-tpm.c
+++ b/security/gnutls/files/patch-lib-tpm.c
@@ -1,9 +1,9 @@
---- lib/tpm.c.orig	2015-09-26 12:02:10 UTC
+--- lib/tpm.c.orig	2016-12-19 14:10:59 UTC
 +++ lib/tpm.c
-@@ -71,7 +71,6 @@ typedef TSS_RESULT (*Tspi_DecodeBER_TssB
- typedef TSS_RESULT (*Tspi_Context_LoadKeyByBlob_func)(TSS_HCONTEXT, TSS_HKEY, UINT32, BYTE*, TSS_HKEY*);
+@@ -72,7 +72,6 @@ typedef TSS_RESULT (*Tspi_Context_LoadKe
  typedef TSS_RESULT (*Tspi_Policy_AssignToObject_func)(TSS_HPOLICY, TSS_HOBJECT);
  typedef TSS_RESULT (*Tspi_GetAttribData_func)(TSS_HOBJECT, TSS_FLAG, TSS_FLAG, UINT32*, BYTE**);
+ typedef TSS_RESULT (*Tspi_GetAttribUint32_func)(TSS_HOBJECT, TSS_FLAG, TSS_FLAG, UINT32*);
 -typedef TSS_RESULT (*Tspi_Context_GetTpmObject_func)(TSS_HCONTEXT, TSS_HTPM*);
  typedef TSS_RESULT (*Tspi_TPM_StirRandom_func)(TSS_HTPM, UINT32, BYTE*);
  typedef TSS_RESULT (*Tspi_SetAttribUint32_func)(TSS_HOBJECT, TSS_FLAG, TSS_FLAG, UINT32);
diff --git a/security/gnutls/pkg-plist b/security/gnutls/pkg-plist
index df9f50aad88a..9756b1feaf7d 100644
--- a/security/gnutls/pkg-plist
+++ b/security/gnutls/pkg-plist
@@ -21,6 +21,7 @@ include/gnutls/pkcs11.h
 include/gnutls/pkcs12.h
 include/gnutls/pkcs7.h
 include/gnutls/self-test.h
+include/gnutls/socket.h
 include/gnutls/system-keys.h
 include/gnutls/tpm.h
 include/gnutls/urls.h
@@ -41,7 +42,7 @@ info/pkcs11-vision.png
 %%DANE%%lib/libgnutls-dane.so.0.4.1
 lib/libgnutls.so
 lib/libgnutls.so.30
-lib/libgnutls.so.30.7.0
+lib/libgnutls.so.30.13.1
 lib/libgnutlsxx.so
 lib/libgnutlsxx.so.28
 lib/libgnutlsxx.so.28.1.0
@@ -92,6 +93,7 @@ man/man3/gnutls_anon_free_client_credentials.3.gz
 man/man3/gnutls_anon_free_server_credentials.3.gz
 man/man3/gnutls_anon_set_params_function.3.gz
 man/man3/gnutls_anon_set_server_dh_params.3.gz
+man/man3/gnutls_anon_set_server_known_dh_params.3.gz
 man/man3/gnutls_anon_set_server_params_function.3.gz
 man/man3/gnutls_auth_client_get_type.3.gz
 man/man3/gnutls_auth_get_type.3.gz
@@ -123,8 +125,10 @@ man/man3/gnutls_certificate_server_set_request.3.gz
 man/man3/gnutls_certificate_set_dh_params.3.gz
 man/man3/gnutls_certificate_set_flags.3.gz
 man/man3/gnutls_certificate_set_key.3.gz
+man/man3/gnutls_certificate_set_known_dh_params.3.gz
 man/man3/gnutls_certificate_set_ocsp_status_request_file.3.gz
 man/man3/gnutls_certificate_set_ocsp_status_request_function.3.gz
+man/man3/gnutls_certificate_set_ocsp_status_request_function2.3.gz
 man/man3/gnutls_certificate_set_openpgp_key.3.gz
 man/man3/gnutls_certificate_set_openpgp_key_file.3.gz
 man/man3/gnutls_certificate_set_openpgp_key_file2.3.gz
@@ -179,7 +183,6 @@ man/man3/gnutls_cipher_get_name.3.gz
 man/man3/gnutls_cipher_get_tag_size.3.gz
 man/man3/gnutls_cipher_init.3.gz
 man/man3/gnutls_cipher_list.3.gz
-man/man3/gnutls_cipher_self_test.3.gz
 man/man3/gnutls_cipher_set_iv.3.gz
 man/man3/gnutls_cipher_suite_get_name.3.gz
 man/man3/gnutls_cipher_suite_info.3.gz
@@ -205,6 +208,7 @@ man/man3/gnutls_db_set_ptr.3.gz
 man/man3/gnutls_db_set_remove_function.3.gz
 man/man3/gnutls_db_set_retrieve_function.3.gz
 man/man3/gnutls_db_set_store_function.3.gz
+man/man3/gnutls_decode_ber_digest_info.3.gz
 man/man3/gnutls_deinit.3.gz
 man/man3/gnutls_dh_get_group.3.gz
 man/man3/gnutls_dh_get_peers_public_bits.3.gz
@@ -217,6 +221,7 @@ man/man3/gnutls_dh_params_export2_pkcs3.3.gz
 man/man3/gnutls_dh_params_export_pkcs3.3.gz
 man/man3/gnutls_dh_params_export_raw.3.gz
 man/man3/gnutls_dh_params_generate2.3.gz
+man/man3/gnutls_dh_params_import_dsa.3.gz
 man/man3/gnutls_dh_params_import_pkcs3.3.gz
 man/man3/gnutls_dh_params_import_raw.3.gz
 man/man3/gnutls_dh_params_import_raw2.3.gz
@@ -226,7 +231,6 @@ man/man3/gnutls_digest_get_id.3.gz
 man/man3/gnutls_digest_get_name.3.gz
 man/man3/gnutls_digest_get_oid.3.gz
 man/man3/gnutls_digest_list.3.gz
-man/man3/gnutls_digest_self_test.3.gz
 man/man3/gnutls_dtls_cookie_send.3.gz
 man/man3/gnutls_dtls_cookie_verify.3.gz
 man/man3/gnutls_dtls_get_data_mtu.3.gz
@@ -240,12 +244,15 @@ man/man3/gnutls_ecc_curve_get.3.gz
 man/man3/gnutls_ecc_curve_get_id.3.gz
 man/man3/gnutls_ecc_curve_get_name.3.gz
 man/man3/gnutls_ecc_curve_get_oid.3.gz
+man/man3/gnutls_ecc_curve_get_pk.3.gz
 man/man3/gnutls_ecc_curve_get_size.3.gz
 man/man3/gnutls_ecc_curve_list.3.gz
+man/man3/gnutls_encode_ber_digest_info.3.gz
 man/man3/gnutls_error_is_fatal.3.gz
 man/man3/gnutls_error_to_alert.3.gz
 man/man3/gnutls_est_record_overhead_size.3.gz
 man/man3/gnutls_ext_get_data.3.gz
+man/man3/gnutls_ext_get_name.3.gz
 man/man3/gnutls_ext_register.3.gz
 man/man3/gnutls_ext_set_data.3.gz
 man/man3/gnutls_fingerprint.3.gz
@@ -305,7 +312,6 @@ man/man3/gnutls_mac_get_key_size.3.gz
 man/man3/gnutls_mac_get_name.3.gz
 man/man3/gnutls_mac_get_nonce_size.3.gz
 man/man3/gnutls_mac_list.3.gz
-man/man3/gnutls_mac_self_test.3.gz
 man/man3/gnutls_memcmp.3.gz
 man/man3/gnutls_memset.3.gz
 man/man3/gnutls_ocsp_req_add_cert.3.gz
@@ -330,6 +336,7 @@ man/man3/gnutls_ocsp_resp_get_extension.3.gz
 man/man3/gnutls_ocsp_resp_get_nonce.3.gz
 man/man3/gnutls_ocsp_resp_get_produced.3.gz
 man/man3/gnutls_ocsp_resp_get_responder.3.gz
+man/man3/gnutls_ocsp_resp_get_responder2.3.gz
 man/man3/gnutls_ocsp_resp_get_responder_raw_id.3.gz
 man/man3/gnutls_ocsp_resp_get_response.3.gz
 man/man3/gnutls_ocsp_resp_get_signature.3.gz
@@ -347,6 +354,7 @@ man/man3/gnutls_ocsp_status_request_get.3.gz
 man/man3/gnutls_ocsp_status_request_is_checked.3.gz
 man/man3/gnutls_oid_to_digest.3.gz
 man/man3/gnutls_oid_to_ecc_curve.3.gz
+man/man3/gnutls_oid_to_mac.3.gz
 man/man3/gnutls_oid_to_pk.3.gz
 man/man3/gnutls_oid_to_sign.3.gz
 man/man3/gnutls_openpgp_crt_check_email.3.gz
@@ -440,7 +448,6 @@ man/man3/gnutls_pk_get_id.3.gz
 man/man3/gnutls_pk_get_name.3.gz
 man/man3/gnutls_pk_get_oid.3.gz
 man/man3/gnutls_pk_list.3.gz
-man/man3/gnutls_pk_self_test.3.gz
 man/man3/gnutls_pk_to_sign.3.gz
 man/man3/gnutls_pkcs11_add_provider.3.gz
 man/man3/gnutls_pkcs11_copy_attached_extension.3.gz
@@ -584,7 +591,9 @@ man/man3/gnutls_privkey_export_pkcs11.3.gz
 man/man3/gnutls_privkey_export_rsa_raw.3.gz
 man/man3/gnutls_privkey_export_x509.3.gz
 man/man3/gnutls_privkey_generate.3.gz
+man/man3/gnutls_privkey_generate2.3.gz
 man/man3/gnutls_privkey_get_pk_algorithm.3.gz
+man/man3/gnutls_privkey_get_seed.3.gz
 man/man3/gnutls_privkey_get_type.3.gz
 man/man3/gnutls_privkey_import_dsa_raw.3.gz
 man/man3/gnutls_privkey_import_ecc_raw.3.gz
@@ -602,11 +611,13 @@ man/man3/gnutls_privkey_import_url.3.gz
 man/man3/gnutls_privkey_import_x509.3.gz
 man/man3/gnutls_privkey_import_x509_raw.3.gz
 man/man3/gnutls_privkey_init.3.gz
+man/man3/gnutls_privkey_set_flags.3.gz
 man/man3/gnutls_privkey_set_pin_function.3.gz
 man/man3/gnutls_privkey_sign_data.3.gz
 man/man3/gnutls_privkey_sign_hash.3.gz
 man/man3/gnutls_privkey_status.3.gz
 man/man3/gnutls_privkey_verify_params.3.gz
+man/man3/gnutls_privkey_verify_seed.3.gz
 man/man3/gnutls_protocol_get_id.3.gz
 man/man3/gnutls_protocol_get_name.3.gz
 man/man3/gnutls_protocol_get_version.3.gz
@@ -624,6 +635,7 @@ man/man3/gnutls_psk_set_server_credentials_file.3.gz
 man/man3/gnutls_psk_set_server_credentials_function.3.gz
 man/man3/gnutls_psk_set_server_credentials_hint.3.gz
 man/man3/gnutls_psk_set_server_dh_params.3.gz
+man/man3/gnutls_psk_set_server_known_dh_params.3.gz
 man/man3/gnutls_psk_set_server_params_function.3.gz
 man/man3/gnutls_pubkey_deinit.3.gz
 man/man3/gnutls_pubkey_encrypt_data.3.gz
@@ -696,12 +708,15 @@ man/man3/gnutls_session_channel_binding.3.gz
 man/man3/gnutls_session_enable_compatibility_mode.3.gz
 man/man3/gnutls_session_etm_status.3.gz
 man/man3/gnutls_session_ext_master_secret_status.3.gz
+man/man3/gnutls_session_ext_register.3.gz
 man/man3/gnutls_session_force_valid.3.gz
 man/man3/gnutls_session_get_data.3.gz
 man/man3/gnutls_session_get_data2.3.gz
 man/man3/gnutls_session_get_desc.3.gz
+man/man3/gnutls_session_get_flags.3.gz
 man/man3/gnutls_session_get_id.3.gz
 man/man3/gnutls_session_get_id2.3.gz
+man/man3/gnutls_session_get_master_secret.3.gz
 man/man3/gnutls_session_get_ptr.3.gz
 man/man3/gnutls_session_get_random.3.gz
 man/man3/gnutls_session_get_verify_cert_status.3.gz
@@ -714,6 +729,7 @@ man/man3/gnutls_session_set_ptr.3.gz
 man/man3/gnutls_session_set_verify_cert.3.gz
 man/man3/gnutls_session_set_verify_cert2.3.gz
 man/man3/gnutls_session_set_verify_function.3.gz
+man/man3/gnutls_session_supplemental_register.3.gz
 man/man3/gnutls_session_ticket_enable_client.3.gz
 man/man3/gnutls_session_ticket_enable_server.3.gz
 man/man3/gnutls_session_ticket_key_generate.3.gz
@@ -785,6 +801,7 @@ man/man3/gnutls_transport_get_ptr.3.gz
 man/man3/gnutls_transport_get_ptr2.3.gz
 man/man3/gnutls_transport_set_errno.3.gz
 man/man3/gnutls_transport_set_errno_function.3.gz
+man/man3/gnutls_transport_set_fastopen.3.gz
 man/man3/gnutls_transport_set_int.3.gz
 man/man3/gnutls_transport_set_int2.3.gz
 man/man3/gnutls_transport_set_ptr.3.gz
@@ -794,6 +811,7 @@ man/man3/gnutls_transport_set_pull_timeout_function.3.gz
 man/man3/gnutls_transport_set_push_function.3.gz
 man/man3/gnutls_transport_set_vec_push_function.3.gz
 man/man3/gnutls_url_is_supported.3.gz
+man/man3/gnutls_utf8_password_normalize.3.gz
 man/man3/gnutls_verify_stored_pubkey.3.gz
 man/man3/gnutls_x509_aia_deinit.3.gz
 man/man3/gnutls_x509_aia_get.3.gz
@@ -805,6 +823,7 @@ man/man3/gnutls_x509_aki_get_id.3.gz
 man/man3/gnutls_x509_aki_init.3.gz
 man/man3/gnutls_x509_aki_set_cert_issuer.3.gz
 man/man3/gnutls_x509_aki_set_id.3.gz
+man/man3/gnutls_x509_cidr_to_rfc5280.3.gz
 man/man3/gnutls_x509_crl_check_issuer.3.gz
 man/man3/gnutls_x509_crl_deinit.3.gz
 man/man3/gnutls_x509_crl_dist_points_deinit.3.gz
@@ -824,12 +843,14 @@ man/man3/gnutls_x509_crl_get_extension_info.3.gz
 man/man3/gnutls_x509_crl_get_extension_oid.3.gz
 man/man3/gnutls_x509_crl_get_issuer_dn.3.gz
 man/man3/gnutls_x509_crl_get_issuer_dn2.3.gz
+man/man3/gnutls_x509_crl_get_issuer_dn3.3.gz
 man/man3/gnutls_x509_crl_get_issuer_dn_by_oid.3.gz
 man/man3/gnutls_x509_crl_get_next_update.3.gz
 man/man3/gnutls_x509_crl_get_number.3.gz
 man/man3/gnutls_x509_crl_get_raw_issuer_dn.3.gz
 man/man3/gnutls_x509_crl_get_signature.3.gz
 man/man3/gnutls_x509_crl_get_signature_algorithm.3.gz
+man/man3/gnutls_x509_crl_get_signature_oid.3.gz
 man/man3/gnutls_x509_crl_get_this_update.3.gz
 man/man3/gnutls_x509_crl_get_version.3.gz
 man/man3/gnutls_x509_crl_import.3.gz
@@ -860,6 +881,7 @@ man/man3/gnutls_x509_crq_get_basic_constraints.3.gz
 man/man3/gnutls_x509_crq_get_challenge_password.3.gz
 man/man3/gnutls_x509_crq_get_dn.3.gz
 man/man3/gnutls_x509_crq_get_dn2.3.gz
+man/man3/gnutls_x509_crq_get_dn3.3.gz
 man/man3/gnutls_x509_crq_get_dn_by_oid.3.gz
 man/man3/gnutls_x509_crq_get_dn_oid.3.gz
 man/man3/gnutls_x509_crq_get_extension_by_oid.3.gz
@@ -872,10 +894,13 @@ man/man3/gnutls_x509_crq_get_key_purpose_oid.3.gz
 man/man3/gnutls_x509_crq_get_key_rsa_raw.3.gz
 man/man3/gnutls_x509_crq_get_key_usage.3.gz
 man/man3/gnutls_x509_crq_get_pk_algorithm.3.gz
+man/man3/gnutls_x509_crq_get_pk_oid.3.gz
 man/man3/gnutls_x509_crq_get_private_key_usage_period.3.gz
 man/man3/gnutls_x509_crq_get_signature_algorithm.3.gz
+man/man3/gnutls_x509_crq_get_signature_oid.3.gz
 man/man3/gnutls_x509_crq_get_subject_alt_name.3.gz
 man/man3/gnutls_x509_crq_get_subject_alt_othername_oid.3.gz
+man/man3/gnutls_x509_crq_get_tlsfeatures.3.gz
 man/man3/gnutls_x509_crq_get_version.3.gz
 man/man3/gnutls_x509_crq_import.3.gz
 man/man3/gnutls_x509_crq_init.3.gz
@@ -886,6 +911,7 @@ man/man3/gnutls_x509_crq_set_basic_constraints.3.gz
 man/man3/gnutls_x509_crq_set_challenge_password.3.gz
 man/man3/gnutls_x509_crq_set_dn.3.gz
 man/man3/gnutls_x509_crq_set_dn_by_oid.3.gz
+man/man3/gnutls_x509_crq_set_extension_by_oid.3.gz
 man/man3/gnutls_x509_crq_set_key.3.gz
 man/man3/gnutls_x509_crq_set_key_purpose_oid.3.gz
 man/man3/gnutls_x509_crq_set_key_rsa_raw.3.gz
@@ -893,6 +919,8 @@ man/man3/gnutls_x509_crq_set_key_usage.3.gz
 man/man3/gnutls_x509_crq_set_private_key_usage_period.3.gz
 man/man3/gnutls_x509_crq_set_pubkey.3.gz
 man/man3/gnutls_x509_crq_set_subject_alt_name.3.gz
+man/man3/gnutls_x509_crq_set_subject_alt_othername.3.gz
+man/man3/gnutls_x509_crq_set_tlsfeatures.3.gz
 man/man3/gnutls_x509_crq_set_version.3.gz
 man/man3/gnutls_x509_crq_sign.3.gz
 man/man3/gnutls_x509_crq_sign2.3.gz
@@ -901,9 +929,12 @@ man/man3/gnutls_x509_crt_check_email.3.gz
 man/man3/gnutls_x509_crt_check_hostname.3.gz
 man/man3/gnutls_x509_crt_check_hostname2.3.gz
 man/man3/gnutls_x509_crt_check_issuer.3.gz
+man/man3/gnutls_x509_crt_check_key_purpose.3.gz
 man/man3/gnutls_x509_crt_check_revocation.3.gz
 man/man3/gnutls_x509_crt_cpy_crl_dist_points.3.gz
 man/man3/gnutls_x509_crt_deinit.3.gz
+man/man3/gnutls_x509_crt_equals.3.gz
+man/man3/gnutls_x509_crt_equals2.3.gz
 man/man3/gnutls_x509_crt_export.3.gz
 man/man3/gnutls_x509_crt_export2.3.gz
 man/man3/gnutls_x509_crt_get_activation_time.3.gz
@@ -915,6 +946,7 @@ man/man3/gnutls_x509_crt_get_ca_status.3.gz
 man/man3/gnutls_x509_crt_get_crl_dist_points.3.gz
 man/man3/gnutls_x509_crt_get_dn.3.gz
 man/man3/gnutls_x509_crt_get_dn2.3.gz
+man/man3/gnutls_x509_crt_get_dn3.3.gz
 man/man3/gnutls_x509_crt_get_dn_by_oid.3.gz
 man/man3/gnutls_x509_crt_get_dn_oid.3.gz
 man/man3/gnutls_x509_crt_get_expiration_time.3.gz
@@ -931,6 +963,7 @@ man/man3/gnutls_x509_crt_get_issuer_alt_name2.3.gz
 man/man3/gnutls_x509_crt_get_issuer_alt_othername_oid.3.gz
 man/man3/gnutls_x509_crt_get_issuer_dn.3.gz
 man/man3/gnutls_x509_crt_get_issuer_dn2.3.gz
+man/man3/gnutls_x509_crt_get_issuer_dn3.3.gz
 man/man3/gnutls_x509_crt_get_issuer_dn_by_oid.3.gz
 man/man3/gnutls_x509_crt_get_issuer_dn_oid.3.gz
 man/man3/gnutls_x509_crt_get_issuer_unique_id.3.gz
@@ -941,6 +974,7 @@ man/man3/gnutls_x509_crt_get_name_constraints.3.gz
 man/man3/gnutls_x509_crt_get_pk_algorithm.3.gz
 man/man3/gnutls_x509_crt_get_pk_dsa_raw.3.gz
 man/man3/gnutls_x509_crt_get_pk_ecc_raw.3.gz
+man/man3/gnutls_x509_crt_get_pk_oid.3.gz
 man/man3/gnutls_x509_crt_get_pk_rsa_raw.3.gz
 man/man3/gnutls_x509_crt_get_policy.3.gz
 man/man3/gnutls_x509_crt_get_preferred_hash_algorithm.3.gz
@@ -951,12 +985,14 @@ man/man3/gnutls_x509_crt_get_raw_issuer_dn.3.gz
 man/man3/gnutls_x509_crt_get_serial.3.gz
 man/man3/gnutls_x509_crt_get_signature.3.gz
 man/man3/gnutls_x509_crt_get_signature_algorithm.3.gz
+man/man3/gnutls_x509_crt_get_signature_oid.3.gz
 man/man3/gnutls_x509_crt_get_subject.3.gz
 man/man3/gnutls_x509_crt_get_subject_alt_name.3.gz
 man/man3/gnutls_x509_crt_get_subject_alt_name2.3.gz
 man/man3/gnutls_x509_crt_get_subject_alt_othername_oid.3.gz
 man/man3/gnutls_x509_crt_get_subject_key_id.3.gz
 man/man3/gnutls_x509_crt_get_subject_unique_id.3.gz
+man/man3/gnutls_x509_crt_get_tlsfeatures.3.gz
 man/man3/gnutls_x509_crt_get_version.3.gz
 man/man3/gnutls_x509_crt_import.3.gz
 man/man3/gnutls_x509_crt_import_pkcs11.3.gz
@@ -976,12 +1012,14 @@ man/man3/gnutls_x509_crt_set_ca_status.3.gz
 man/man3/gnutls_x509_crt_set_crl_dist_points.3.gz
 man/man3/gnutls_x509_crt_set_crl_dist_points2.3.gz
 man/man3/gnutls_x509_crt_set_crq.3.gz
+man/man3/gnutls_x509_crt_set_crq_extension_by_oid.3.gz
 man/man3/gnutls_x509_crt_set_crq_extensions.3.gz
 man/man3/gnutls_x509_crt_set_dn.3.gz
 man/man3/gnutls_x509_crt_set_dn_by_oid.3.gz
 man/man3/gnutls_x509_crt_set_expiration_time.3.gz
 man/man3/gnutls_x509_crt_set_extension_by_oid.3.gz
 man/man3/gnutls_x509_crt_set_issuer_alt_name.3.gz
+man/man3/gnutls_x509_crt_set_issuer_alt_othername.3.gz
 man/man3/gnutls_x509_crt_set_issuer_dn.3.gz
 man/man3/gnutls_x509_crt_set_issuer_dn_by_oid.3.gz
 man/man3/gnutls_x509_crt_set_issuer_unique_id.3.gz
@@ -997,9 +1035,11 @@ man/man3/gnutls_x509_crt_set_proxy_dn.3.gz
 man/man3/gnutls_x509_crt_set_pubkey.3.gz
 man/man3/gnutls_x509_crt_set_serial.3.gz
 man/man3/gnutls_x509_crt_set_subject_alt_name.3.gz
+man/man3/gnutls_x509_crt_set_subject_alt_othername.3.gz
 man/man3/gnutls_x509_crt_set_subject_alternative_name.3.gz
 man/man3/gnutls_x509_crt_set_subject_key_id.3.gz
 man/man3/gnutls_x509_crt_set_subject_unique_id.3.gz
+man/man3/gnutls_x509_crt_set_tlsfeatures.3.gz
 man/man3/gnutls_x509_crt_set_version.3.gz
 man/man3/gnutls_x509_crt_sign.3.gz
 man/man3/gnutls_x509_crt_sign2.3.gz
@@ -1010,10 +1050,12 @@ man/man3/gnutls_x509_dn_export.3.gz
 man/man3/gnutls_x509_dn_export2.3.gz
 man/man3/gnutls_x509_dn_get_rdn_ava.3.gz
 man/man3/gnutls_x509_dn_get_str.3.gz
+man/man3/gnutls_x509_dn_get_str2.3.gz
 man/man3/gnutls_x509_dn_import.3.gz
 man/man3/gnutls_x509_dn_init.3.gz
 man/man3/gnutls_x509_dn_oid_known.3.gz
 man/man3/gnutls_x509_dn_oid_name.3.gz
+man/man3/gnutls_x509_dn_set_str.3.gz
 man/man3/gnutls_x509_ext_deinit.3.gz
 man/man3/gnutls_x509_ext_export_aia.3.gz
 man/man3/gnutls_x509_ext_export_authority_key_id.3.gz
@@ -1027,6 +1069,7 @@ man/man3/gnutls_x509_ext_export_private_key_usage_period.3.gz
 man/man3/gnutls_x509_ext_export_proxy.3.gz
 man/man3/gnutls_x509_ext_export_subject_alt_names.3.gz
 man/man3/gnutls_x509_ext_export_subject_key_id.3.gz
+man/man3/gnutls_x509_ext_export_tlsfeatures.3.gz
 man/man3/gnutls_x509_ext_import_aia.3.gz
 man/man3/gnutls_x509_ext_import_authority_key_id.3.gz
 man/man3/gnutls_x509_ext_import_basic_constraints.3.gz
@@ -1039,6 +1082,7 @@ man/man3/gnutls_x509_ext_import_private_key_usage_period.3.gz
 man/man3/gnutls_x509_ext_import_proxy.3.gz
 man/man3/gnutls_x509_ext_import_subject_alt_names.3.gz
 man/man3/gnutls_x509_ext_import_subject_key_id.3.gz
+man/man3/gnutls_x509_ext_import_tlsfeatures.3.gz
 man/man3/gnutls_x509_ext_print.3.gz
 man/man3/gnutls_x509_key_purpose_deinit.3.gz
 man/man3/gnutls_x509_key_purpose_get.3.gz
@@ -1070,9 +1114,11 @@ man/man3/gnutls_x509_privkey_export_rsa_raw.3.gz
 man/man3/gnutls_x509_privkey_export_rsa_raw2.3.gz
 man/man3/gnutls_x509_privkey_fix.3.gz
 man/man3/gnutls_x509_privkey_generate.3.gz
+man/man3/gnutls_x509_privkey_generate2.3.gz
 man/man3/gnutls_x509_privkey_get_key_id.3.gz
 man/man3/gnutls_x509_privkey_get_pk_algorithm.3.gz
 man/man3/gnutls_x509_privkey_get_pk_algorithm2.3.gz
+man/man3/gnutls_x509_privkey_get_seed.3.gz
 man/man3/gnutls_x509_privkey_import.3.gz
 man/man3/gnutls_x509_privkey_import2.3.gz
 man/man3/gnutls_x509_privkey_import_dsa_raw.3.gz
@@ -1083,13 +1129,21 @@ man/man3/gnutls_x509_privkey_import_rsa_raw.3.gz
 man/man3/gnutls_x509_privkey_import_rsa_raw2.3.gz
 man/man3/gnutls_x509_privkey_init.3.gz
 man/man3/gnutls_x509_privkey_sec_param.3.gz
+man/man3/gnutls_x509_privkey_set_flags.3.gz
 man/man3/gnutls_x509_privkey_set_pin_function.3.gz
 man/man3/gnutls_x509_privkey_sign_data.3.gz
 man/man3/gnutls_x509_privkey_sign_hash.3.gz
 man/man3/gnutls_x509_privkey_verify_params.3.gz
+man/man3/gnutls_x509_privkey_verify_seed.3.gz
 man/man3/gnutls_x509_rdn_get.3.gz
+man/man3/gnutls_x509_rdn_get2.3.gz
 man/man3/gnutls_x509_rdn_get_by_oid.3.gz
 man/man3/gnutls_x509_rdn_get_oid.3.gz
+man/man3/gnutls_x509_tlsfeatures_add.3.gz
+man/man3/gnutls_x509_tlsfeatures_check_crt.3.gz
+man/man3/gnutls_x509_tlsfeatures_deinit.3.gz
+man/man3/gnutls_x509_tlsfeatures_get.3.gz
+man/man3/gnutls_x509_tlsfeatures_init.3.gz
 man/man3/gnutls_x509_trust_list_add_cas.3.gz
 man/man3/gnutls_x509_trust_list_add_crls.3.gz
 man/man3/gnutls_x509_trust_list_add_named_crt.3.gz
@@ -1119,13 +1173,13 @@ man/man3/gnutls_x509_trust_list_verify_named_crt.3.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-client-resume.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-client-srp.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-client-x509.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-client-x509-3.1.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-crq.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-ocsp-client.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-pkcs11-list.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-pkcs12.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-serv-anon.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-serv-dtls.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-serv-pgp.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-serv-psk.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-serv-srp.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-serv-x509.c