updated auto-generated files

4 files changed, 135 insertions, 2 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 50bd980fe1..fbf4aec5c9 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -541,6 +541,7 @@ ENUMS += enums/gnutls_params_type_t
 ENUMS += enums/gnutls_pin_flag_t
 ENUMS += enums/gnutls_pk_algorithm_t
 ENUMS += enums/gnutls_pkcs11_obj_attr_t
+ENUMS += enums/gnutls_pkcs11_obj_flags
 ENUMS += enums/gnutls_pkcs11_obj_info_t
 ENUMS += enums/gnutls_pkcs11_obj_type_t
 ENUMS += enums/gnutls_pkcs11_token_info_t
@@ -661,12 +662,24 @@ FUNCS += functions/gnutls_certificate_get_crt_raw
 FUNCS += functions/gnutls_certificate_get_crt_raw.short
 FUNCS += functions/gnutls_certificate_get_issuer
 FUNCS += functions/gnutls_certificate_get_issuer.short
+FUNCS += functions/gnutls_certificate_get_openpgp_crt
+FUNCS += functions/gnutls_certificate_get_openpgp_crt.short
+FUNCS += functions/gnutls_certificate_get_openpgp_key
+FUNCS += functions/gnutls_certificate_get_openpgp_key.short
 FUNCS += functions/gnutls_certificate_get_ours
 FUNCS += functions/gnutls_certificate_get_ours.short
 FUNCS += functions/gnutls_certificate_get_peers
 FUNCS += functions/gnutls_certificate_get_peers.short
 FUNCS += functions/gnutls_certificate_get_peers_subkey_id
 FUNCS += functions/gnutls_certificate_get_peers_subkey_id.short
+FUNCS += functions/gnutls_certificate_get_trust_list
+FUNCS += functions/gnutls_certificate_get_trust_list.short
+FUNCS += functions/gnutls_certificate_get_verify_flags
+FUNCS += functions/gnutls_certificate_get_verify_flags.short
+FUNCS += functions/gnutls_certificate_get_x509_crt
+FUNCS += functions/gnutls_certificate_get_x509_crt.short
+FUNCS += functions/gnutls_certificate_get_x509_key
+FUNCS += functions/gnutls_certificate_get_x509_key.short
 FUNCS += functions/gnutls_certificate_send_x509_rdn_sequence
 FUNCS += functions/gnutls_certificate_send_x509_rdn_sequence.short
 FUNCS += functions/gnutls_certificate_server_set_request
@@ -1237,6 +1250,10 @@ FUNCS += functions/gnutls_packet_get
 FUNCS += functions/gnutls_packet_get.short
 FUNCS += functions/gnutls_pcert_deinit
 FUNCS += functions/gnutls_pcert_deinit.short
+FUNCS += functions/gnutls_pcert_export_openpgp
+FUNCS += functions/gnutls_pcert_export_openpgp.short
+FUNCS += functions/gnutls_pcert_export_x509
+FUNCS += functions/gnutls_pcert_export_x509.short
 FUNCS += functions/gnutls_pcert_import_openpgp
 FUNCS += functions/gnutls_pcert_import_openpgp.short
 FUNCS += functions/gnutls_pcert_import_openpgp_raw
@@ -1263,6 +1280,8 @@ FUNCS += functions/gnutls_pk_bits_to_sec_param
 FUNCS += functions/gnutls_pk_bits_to_sec_param.short
 FUNCS += functions/gnutls_pkcs11_add_provider
 FUNCS += functions/gnutls_pkcs11_add_provider.short
+FUNCS += functions/gnutls_pkcs11_copy_attached_extension
+FUNCS += functions/gnutls_pkcs11_copy_attached_extension.short
 FUNCS += functions/gnutls_pkcs11_copy_secret_key
 FUNCS += functions/gnutls_pkcs11_copy_secret_key.short
 FUNCS += functions/gnutls_pkcs11_copy_x509_crt
@@ -1291,6 +1310,12 @@ FUNCS += functions/gnutls_pkcs11_obj_export3
 FUNCS += functions/gnutls_pkcs11_obj_export3.short
 FUNCS += functions/gnutls_pkcs11_obj_export_url
 FUNCS += functions/gnutls_pkcs11_obj_export_url.short
+FUNCS += functions/gnutls_pkcs11_obj_flags_get_str
+FUNCS += functions/gnutls_pkcs11_obj_flags_get_str.short
+FUNCS += functions/gnutls_pkcs11_obj_get_exts
+FUNCS += functions/gnutls_pkcs11_obj_get_exts.short
+FUNCS += functions/gnutls_pkcs11_obj_get_flags
+FUNCS += functions/gnutls_pkcs11_obj_get_flags.short
 FUNCS += functions/gnutls_pkcs11_obj_get_info
 FUNCS += functions/gnutls_pkcs11_obj_get_info.short
 FUNCS += functions/gnutls_pkcs11_obj_get_type
@@ -1305,8 +1330,12 @@ FUNCS += functions/gnutls_pkcs11_obj_list_import_url2
 FUNCS += functions/gnutls_pkcs11_obj_list_import_url2.short
 FUNCS += functions/gnutls_pkcs11_obj_set_pin_function
 FUNCS += functions/gnutls_pkcs11_obj_set_pin_function.short
+FUNCS += functions/gnutls_pkcs11_privkey_cpy
+FUNCS += functions/gnutls_pkcs11_privkey_cpy.short
 FUNCS += functions/gnutls_pkcs11_privkey_deinit
 FUNCS += functions/gnutls_pkcs11_privkey_deinit.short
+FUNCS += functions/gnutls_pkcs11_privkey_export_pubkey
+FUNCS += functions/gnutls_pkcs11_privkey_export_pubkey.short
 FUNCS += functions/gnutls_pkcs11_privkey_export_url
 FUNCS += functions/gnutls_pkcs11_privkey_export_url.short
 FUNCS += functions/gnutls_pkcs11_privkey_generate
@@ -1351,6 +1380,8 @@ FUNCS += functions/gnutls_pkcs12_bag_decrypt
 FUNCS += functions/gnutls_pkcs12_bag_decrypt.short
 FUNCS += functions/gnutls_pkcs12_bag_deinit
 FUNCS += functions/gnutls_pkcs12_bag_deinit.short
+FUNCS += functions/gnutls_pkcs12_bag_enc_info
+FUNCS += functions/gnutls_pkcs12_bag_enc_info.short
 FUNCS += functions/gnutls_pkcs12_bag_encrypt
 FUNCS += functions/gnutls_pkcs12_bag_encrypt.short
 FUNCS += functions/gnutls_pkcs12_bag_get_count
@@ -1383,12 +1414,16 @@ FUNCS += functions/gnutls_pkcs12_export2
 FUNCS += functions/gnutls_pkcs12_export2.short
 FUNCS += functions/gnutls_pkcs12_generate_mac
 FUNCS += functions/gnutls_pkcs12_generate_mac.short
+FUNCS += functions/gnutls_pkcs12_generate_mac2
+FUNCS += functions/gnutls_pkcs12_generate_mac2.short
 FUNCS += functions/gnutls_pkcs12_get_bag
 FUNCS += functions/gnutls_pkcs12_get_bag.short
 FUNCS += functions/gnutls_pkcs12_import
 FUNCS += functions/gnutls_pkcs12_import.short
 FUNCS += functions/gnutls_pkcs12_init
 FUNCS += functions/gnutls_pkcs12_init.short
+FUNCS += functions/gnutls_pkcs12_mac_info
+FUNCS += functions/gnutls_pkcs12_mac_info.short
 FUNCS += functions/gnutls_pkcs12_set_bag
 FUNCS += functions/gnutls_pkcs12_set_bag.short
 FUNCS += functions/gnutls_pkcs12_simple_parse
@@ -1425,6 +1460,12 @@ FUNCS += functions/gnutls_pkcs7_set_crt
 FUNCS += functions/gnutls_pkcs7_set_crt.short
 FUNCS += functions/gnutls_pkcs7_set_crt_raw
 FUNCS += functions/gnutls_pkcs7_set_crt_raw.short
+FUNCS += functions/gnutls_pkcs8_info
+FUNCS += functions/gnutls_pkcs8_info.short
+FUNCS += functions/gnutls_pkcs_schema_get_name
+FUNCS += functions/gnutls_pkcs_schema_get_name.short
+FUNCS += functions/gnutls_pkcs_schema_get_oid
+FUNCS += functions/gnutls_pkcs_schema_get_oid.short
 FUNCS += functions/gnutls_pk_get_id
 FUNCS += functions/gnutls_pk_get_id.short
 FUNCS += functions/gnutls_pk_get_name
@@ -1471,8 +1512,14 @@ FUNCS += functions/gnutls_privkey_export_dsa_raw
 FUNCS += functions/gnutls_privkey_export_dsa_raw.short
 FUNCS += functions/gnutls_privkey_export_ecc_raw
 FUNCS += functions/gnutls_privkey_export_ecc_raw.short
+FUNCS += functions/gnutls_privkey_export_openpgp
+FUNCS += functions/gnutls_privkey_export_openpgp.short
+FUNCS += functions/gnutls_privkey_export_pkcs11
+FUNCS += functions/gnutls_privkey_export_pkcs11.short
 FUNCS += functions/gnutls_privkey_export_rsa_raw
 FUNCS += functions/gnutls_privkey_export_rsa_raw.short
+FUNCS += functions/gnutls_privkey_export_x509
+FUNCS += functions/gnutls_privkey_export_x509.short
 FUNCS += functions/gnutls_privkey_generate
 FUNCS += functions/gnutls_privkey_generate.short
 FUNCS += functions/gnutls_privkey_get_pk_algorithm
@@ -1487,6 +1534,8 @@ 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_import_ext3
+FUNCS += functions/gnutls_privkey_import_ext3.short
 FUNCS += functions/gnutls_privkey_import_openpgp
 FUNCS += functions/gnutls_privkey_import_openpgp.short
 FUNCS += functions/gnutls_privkey_import_openpgp_raw
@@ -2033,6 +2082,8 @@ FUNCS += functions/gnutls_x509_crq_get_dn_oid
 FUNCS += functions/gnutls_x509_crq_get_dn_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_crq_get_extension_by_oid2
+FUNCS += functions/gnutls_x509_crq_get_extension_by_oid2.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_data2
@@ -2051,6 +2102,8 @@ FUNCS += functions/gnutls_x509_crq_get_pk_algorithm
 FUNCS += functions/gnutls_x509_crq_get_pk_algorithm.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_signature_algorithm
+FUNCS += functions/gnutls_x509_crq_get_signature_algorithm.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
@@ -2139,6 +2192,8 @@ FUNCS += functions/gnutls_x509_crt_get_expiration_time
 FUNCS += functions/gnutls_x509_crt_get_expiration_time.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_by_oid2
+FUNCS += functions/gnutls_x509_crt_get_extension_by_oid2.short
 FUNCS += functions/gnutls_x509_crt_get_extension_data
 FUNCS += functions/gnutls_x509_crt_get_extension_data.short
 FUNCS += functions/gnutls_x509_crt_get_extension_data2
@@ -2323,6 +2378,8 @@ 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_ext_deinit
+FUNCS += functions/gnutls_x509_ext_deinit.short
 FUNCS += functions/gnutls_x509_ext_export_aia
 FUNCS += functions/gnutls_x509_ext_export_aia.short
 FUNCS += functions/gnutls_x509_ext_export_authority_key_id
@@ -2371,6 +2428,8 @@ FUNCS += functions/gnutls_x509_ext_import_subject_alt_names
 FUNCS += functions/gnutls_x509_ext_import_subject_alt_names.short
 FUNCS += functions/gnutls_x509_ext_import_subject_key_id
 FUNCS += functions/gnutls_x509_ext_import_subject_key_id.short
+FUNCS += functions/gnutls_x509_ext_print
+FUNCS += functions/gnutls_x509_ext_print.short
 FUNCS += functions/gnutls_x509_key_purpose_deinit
 FUNCS += functions/gnutls_x509_key_purpose_deinit.short
 FUNCS += functions/gnutls_x509_key_purpose_get
@@ -2395,6 +2454,8 @@ FUNCS += functions/gnutls_x509_name_constraints_get_permitted
 FUNCS += functions/gnutls_x509_name_constraints_get_permitted.short
 FUNCS += functions/gnutls_x509_name_constraints_init
 FUNCS += functions/gnutls_x509_name_constraints_init.short
+FUNCS += functions/gnutls_x509_othername_to_virtual
+FUNCS += functions/gnutls_x509_othername_to_virtual.short
 FUNCS += functions/gnutls_x509_policies_deinit
 FUNCS += functions/gnutls_x509_policies_deinit.short
 FUNCS += functions/gnutls_x509_policies_get
@@ -2487,6 +2548,10 @@ FUNCS += functions/gnutls_x509_trust_list_get_issuer
 FUNCS += functions/gnutls_x509_trust_list_get_issuer.short
 FUNCS += functions/gnutls_x509_trust_list_init
 FUNCS += functions/gnutls_x509_trust_list_init.short
+FUNCS += functions/gnutls_x509_trust_list_iter_deinit
+FUNCS += functions/gnutls_x509_trust_list_iter_deinit.short
+FUNCS += functions/gnutls_x509_trust_list_iter_get_ca
+FUNCS += functions/gnutls_x509_trust_list_iter_get_ca.short
 FUNCS += functions/gnutls_x509_trust_list_remove_cas
 FUNCS += functions/gnutls_x509_trust_list_remove_cas.short
 FUNCS += functions/gnutls_x509_trust_list_remove_trust_file
@@ -2495,5 +2560,7 @@ FUNCS += functions/gnutls_x509_trust_list_remove_trust_mem
 FUNCS += functions/gnutls_x509_trust_list_remove_trust_mem.short
 FUNCS += functions/gnutls_x509_trust_list_verify_crt
 FUNCS += functions/gnutls_x509_trust_list_verify_crt.short
+FUNCS += functions/gnutls_x509_trust_list_verify_crt2
+FUNCS += functions/gnutls_x509_trust_list_verify_crt2.short
 FUNCS += functions/gnutls_x509_trust_list_verify_named_crt
 FUNCS += functions/gnutls_x509_trust_list_verify_named_crt.short
diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
index d10174c48f..7545e3dd51 100644
--- a/doc/manpages/Makefile.am
+++ b/doc/manpages/Makefile.am
@@ -120,9 +120,16 @@ APIMANS += gnutls_certificate_free_crls.3
 APIMANS += gnutls_certificate_free_keys.3
 APIMANS += gnutls_certificate_get_crt_raw.3
 APIMANS += gnutls_certificate_get_issuer.3
+APIMANS += gnutls_certificate_get_openpgp_crt.3
+APIMANS += gnutls_certificate_get_openpgp_key.3
 APIMANS += gnutls_certificate_get_ours.3
 APIMANS += gnutls_certificate_get_peers.3
 APIMANS += gnutls_certificate_get_peers_subkey_id.3
+APIMANS += gnutls_certificate_get_trust_list.3
+APIMANS += gnutls_certificate_get_verify_flags.3
+APIMANS += gnutls_certificate_get_verify_flags.3
+APIMANS += gnutls_certificate_get_x509_crt.3
+APIMANS += gnutls_certificate_get_x509_key.3
 APIMANS += gnutls_certificate_send_x509_rdn_sequence.3
 APIMANS += gnutls_certificate_server_set_request.3
 APIMANS += gnutls_certificate_server_set_retrieve_function.3
@@ -411,6 +418,8 @@ APIMANS += gnutls_openpgp_set_recv_key_function.3
 APIMANS += gnutls_packet_deinit.3
 APIMANS += gnutls_packet_get.3
 APIMANS += gnutls_pcert_deinit.3
+APIMANS += gnutls_pcert_export_openpgp.3
+APIMANS += gnutls_pcert_export_x509.3
 APIMANS += gnutls_pcert_import_openpgp.3
 APIMANS += gnutls_pcert_import_openpgp_raw.3
 APIMANS += gnutls_pcert_import_x509.3
@@ -424,6 +433,7 @@ APIMANS += gnutls_perror.3
 APIMANS += gnutls_pk_algorithm_get_name.3
 APIMANS += gnutls_pk_bits_to_sec_param.3
 APIMANS += gnutls_pkcs11_add_provider.3
+APIMANS += gnutls_pkcs11_copy_attached_extension.3
 APIMANS += gnutls_pkcs11_copy_secret_key.3
 APIMANS += gnutls_pkcs11_copy_x509_crt.3
 APIMANS += gnutls_pkcs11_copy_x509_privkey.3
@@ -438,6 +448,9 @@ APIMANS += gnutls_pkcs11_obj_export.3
 APIMANS += gnutls_pkcs11_obj_export2.3
 APIMANS += gnutls_pkcs11_obj_export3.3
 APIMANS += gnutls_pkcs11_obj_export_url.3
+APIMANS += gnutls_pkcs11_obj_flags_get_str.3
+APIMANS += gnutls_pkcs11_obj_get_exts.3
+APIMANS += gnutls_pkcs11_obj_get_flags.3
 APIMANS += gnutls_pkcs11_obj_get_info.3
 APIMANS += gnutls_pkcs11_obj_get_type.3
 APIMANS += gnutls_pkcs11_obj_import_url.3
@@ -445,7 +458,9 @@ APIMANS += gnutls_pkcs11_obj_init.3
 APIMANS += gnutls_pkcs11_obj_list_import_url.3
 APIMANS += gnutls_pkcs11_obj_list_import_url2.3
 APIMANS += gnutls_pkcs11_obj_set_pin_function.3
+APIMANS += gnutls_pkcs11_privkey_cpy.3
 APIMANS += gnutls_pkcs11_privkey_deinit.3
+APIMANS += gnutls_pkcs11_privkey_export_pubkey.3
 APIMANS += gnutls_pkcs11_privkey_export_url.3
 APIMANS += gnutls_pkcs11_privkey_generate.3
 APIMANS += gnutls_pkcs11_privkey_generate2.3
@@ -468,6 +483,7 @@ APIMANS += gnutls_pkcs11_token_set_pin.3
 APIMANS += gnutls_pkcs11_type_get_name.3
 APIMANS += gnutls_pkcs12_bag_decrypt.3
 APIMANS += gnutls_pkcs12_bag_deinit.3
+APIMANS += gnutls_pkcs12_bag_enc_info.3
 APIMANS += gnutls_pkcs12_bag_encrypt.3
 APIMANS += gnutls_pkcs12_bag_get_count.3
 APIMANS += gnutls_pkcs12_bag_get_data.3
@@ -484,9 +500,11 @@ APIMANS += gnutls_pkcs12_deinit.3
 APIMANS += gnutls_pkcs12_export.3
 APIMANS += gnutls_pkcs12_export2.3
 APIMANS += gnutls_pkcs12_generate_mac.3
+APIMANS += gnutls_pkcs12_generate_mac2.3
 APIMANS += gnutls_pkcs12_get_bag.3
 APIMANS += gnutls_pkcs12_import.3
 APIMANS += gnutls_pkcs12_init.3
+APIMANS += gnutls_pkcs12_mac_info.3
 APIMANS += gnutls_pkcs12_set_bag.3
 APIMANS += gnutls_pkcs12_simple_parse.3
 APIMANS += gnutls_pkcs12_verify_mac.3
@@ -505,6 +523,9 @@ APIMANS += gnutls_pkcs7_set_crl.3
 APIMANS += gnutls_pkcs7_set_crl_raw.3
 APIMANS += gnutls_pkcs7_set_crt.3
 APIMANS += gnutls_pkcs7_set_crt_raw.3
+APIMANS += gnutls_pkcs8_info.3
+APIMANS += gnutls_pkcs_schema_get_name.3
+APIMANS += gnutls_pkcs_schema_get_oid.3
 APIMANS += gnutls_pk_get_id.3
 APIMANS += gnutls_pk_get_name.3
 APIMANS += gnutls_pk_list.3
@@ -529,7 +550,10 @@ APIMANS += gnutls_privkey_decrypt_data.3
 APIMANS += gnutls_privkey_deinit.3
 APIMANS += gnutls_privkey_export_dsa_raw.3
 APIMANS += gnutls_privkey_export_ecc_raw.3
+APIMANS += gnutls_privkey_export_openpgp.3
+APIMANS += gnutls_privkey_export_pkcs11.3
 APIMANS += gnutls_privkey_export_rsa_raw.3
+APIMANS += gnutls_privkey_export_x509.3
 APIMANS += gnutls_privkey_generate.3
 APIMANS += gnutls_privkey_get_pk_algorithm.3
 APIMANS += gnutls_privkey_get_type.3
@@ -537,6 +561,7 @@ APIMANS += gnutls_privkey_import_dsa_raw.3
 APIMANS += gnutls_privkey_import_ecc_raw.3
 APIMANS += gnutls_privkey_import_ext.3
 APIMANS += gnutls_privkey_import_ext2.3
+APIMANS += gnutls_privkey_import_ext3.3
 APIMANS += gnutls_privkey_import_openpgp.3
 APIMANS += gnutls_privkey_import_openpgp_raw.3
 APIMANS += gnutls_privkey_import_pkcs11.3
@@ -810,6 +835,7 @@ APIMANS += gnutls_x509_crq_get_dn2.3
 APIMANS += gnutls_x509_crq_get_dn_by_oid.3
 APIMANS += gnutls_x509_crq_get_dn_oid.3
 APIMANS += gnutls_x509_crq_get_extension_by_oid.3
+APIMANS += gnutls_x509_crq_get_extension_by_oid2.3
 APIMANS += gnutls_x509_crq_get_extension_data.3
 APIMANS += gnutls_x509_crq_get_extension_data2.3
 APIMANS += gnutls_x509_crq_get_extension_info.3
@@ -819,6 +845,7 @@ APIMANS += gnutls_x509_crq_get_key_rsa_raw.3
 APIMANS += gnutls_x509_crq_get_key_usage.3
 APIMANS += gnutls_x509_crq_get_pk_algorithm.3
 APIMANS += gnutls_x509_crq_get_private_key_usage_period.3
+APIMANS += gnutls_x509_crq_get_signature_algorithm.3
 APIMANS += gnutls_x509_crq_get_subject_alt_name.3
 APIMANS += gnutls_x509_crq_get_subject_alt_othername_oid.3
 APIMANS += gnutls_x509_crq_get_version.3
@@ -863,6 +890,7 @@ APIMANS += gnutls_x509_crt_get_dn_by_oid.3
 APIMANS += gnutls_x509_crt_get_dn_oid.3
 APIMANS += gnutls_x509_crt_get_expiration_time.3
 APIMANS += gnutls_x509_crt_get_extension_by_oid.3
+APIMANS += gnutls_x509_crt_get_extension_by_oid2.3
 APIMANS += gnutls_x509_crt_get_extension_data.3
 APIMANS += gnutls_x509_crt_get_extension_data2.3
 APIMANS += gnutls_x509_crt_get_extension_info.3
@@ -955,6 +983,7 @@ APIMANS += gnutls_x509_dn_import.3
 APIMANS += gnutls_x509_dn_init.3
 APIMANS += gnutls_x509_dn_oid_known.3
 APIMANS += gnutls_x509_dn_oid_name.3
+APIMANS += gnutls_x509_ext_deinit.3
 APIMANS += gnutls_x509_ext_export_aia.3
 APIMANS += gnutls_x509_ext_export_authority_key_id.3
 APIMANS += gnutls_x509_ext_export_basic_constraints.3
@@ -979,6 +1008,7 @@ APIMANS += gnutls_x509_ext_import_private_key_usage_period.3
 APIMANS += gnutls_x509_ext_import_proxy.3
 APIMANS += gnutls_x509_ext_import_subject_alt_names.3
 APIMANS += gnutls_x509_ext_import_subject_key_id.3
+APIMANS += gnutls_x509_ext_print.3
 APIMANS += gnutls_x509_key_purpose_deinit.3
 APIMANS += gnutls_x509_key_purpose_get.3
 APIMANS += gnutls_x509_key_purpose_init.3
@@ -991,6 +1021,7 @@ APIMANS += gnutls_x509_name_constraints_deinit.3
 APIMANS += gnutls_x509_name_constraints_get_excluded.3
 APIMANS += gnutls_x509_name_constraints_get_permitted.3
 APIMANS += gnutls_x509_name_constraints_init.3
+APIMANS += gnutls_x509_othername_to_virtual.3
 APIMANS += gnutls_x509_policies_deinit.3
 APIMANS += gnutls_x509_policies_get.3
 APIMANS += gnutls_x509_policies_init.3
@@ -1037,10 +1068,13 @@ APIMANS += gnutls_x509_trust_list_add_trust_mem.3
 APIMANS += gnutls_x509_trust_list_deinit.3
 APIMANS += gnutls_x509_trust_list_get_issuer.3
 APIMANS += gnutls_x509_trust_list_init.3
+APIMANS += gnutls_x509_trust_list_iter_deinit.3
+APIMANS += gnutls_x509_trust_list_iter_get_ca.3
 APIMANS += gnutls_x509_trust_list_remove_cas.3
 APIMANS += gnutls_x509_trust_list_remove_trust_file.3
 APIMANS += gnutls_x509_trust_list_remove_trust_mem.3
 APIMANS += gnutls_x509_trust_list_verify_crt.3
+APIMANS += gnutls_x509_trust_list_verify_crt2.3
 APIMANS += gnutls_x509_trust_list_verify_named_crt.3
 
 dist_man_MANS += $(APIMANS)
diff --git a/lib/libgnutls.map b/lib/libgnutls.map
index 42f56060e3..c454bc1e9b 100644
--- a/lib/libgnutls.map
+++ b/lib/libgnutls.map
@@ -684,7 +684,6 @@ GNUTLS_3_0_0 {
 	gnutls_pcert_import_x509_raw;
 	gnutls_pcert_import_openpgp;
 	gnutls_pcert_import_openpgp_raw;
-	gnutls_pcert_get_type;
 	gnutls_pcert_export_x509;
 	gnutls_pcert_export_openpgp;
 	gnutls_pubkey_get_openpgp_key_id;
diff --git a/symbols.last b/symbols.last
index fa713bed78..94ffd09c98 100644
--- a/symbols.last
+++ b/symbols.last
@@ -28,9 +28,9 @@ _gnutls_get_cred@GNUTLS_PRIVATE
 _gnutls_lib_simulate_error@GNUTLS_PRIVATE
 _gnutls_log@GNUTLS_PRIVATE
 _gnutls_log_level@GNUTLS_PRIVATE
+_gnutls_mac_to_entry@GNUTLS_PRIVATE
 _gnutls_mpi_log@GNUTLS_PRIVATE
 _gnutls_mpi_ops@GNUTLS_PRIVATE
-_gnutls_pbkdf2_sha1@GNUTLS_PRIVATE
 _gnutls_pkcs12_string_to_key@GNUTLS_PRIVATE
 _gnutls_pkix1_asn@GNUTLS_PRIVATE
 _gnutls_record_set_default_version@GNUTLS_PRIVATE
@@ -68,9 +68,15 @@ gnutls_certificate_free_crls@GNUTLS_1_4
 gnutls_certificate_free_keys@GNUTLS_1_4
 gnutls_certificate_get_crt_raw@GNUTLS_3_1_0
 gnutls_certificate_get_issuer@GNUTLS_2_12
+gnutls_certificate_get_openpgp_crt@GNUTLS_3_1_0
+gnutls_certificate_get_openpgp_key@GNUTLS_3_1_0
 gnutls_certificate_get_ours@GNUTLS_1_4
 gnutls_certificate_get_peers@GNUTLS_1_4
 gnutls_certificate_get_peers_subkey_id@GNUTLS_3_1_0
+gnutls_certificate_get_trust_list@GNUTLS_3_1_0
+gnutls_certificate_get_verify_flags@GNUTLS_3_1_0
+gnutls_certificate_get_x509_crt@GNUTLS_3_1_0
+gnutls_certificate_get_x509_key@GNUTLS_3_1_0
 gnutls_certificate_send_x509_rdn_sequence@GNUTLS_1_4
 gnutls_certificate_server_set_request@GNUTLS_1_4
 gnutls_certificate_server_set_retrieve_function@GNUTLS_1_4
@@ -358,6 +364,8 @@ gnutls_openpgp_set_recv_key_function@GNUTLS_1_4
 gnutls_packet_deinit@GNUTLS_3_1_0
 gnutls_packet_get@GNUTLS_3_1_0
 gnutls_pcert_deinit@GNUTLS_3_0_0
+gnutls_pcert_export_openpgp@GNUTLS_3_0_0
+gnutls_pcert_export_x509@GNUTLS_3_0_0
 gnutls_pcert_import_openpgp@GNUTLS_3_0_0
 gnutls_pcert_import_openpgp_raw@GNUTLS_3_0_0
 gnutls_pcert_import_x509@GNUTLS_3_0_0
@@ -375,6 +383,7 @@ gnutls_pk_get_name@GNUTLS_1_4
 gnutls_pk_list@GNUTLS_1_4
 gnutls_pk_to_sign@GNUTLS_3_0_0
 gnutls_pkcs11_add_provider@GNUTLS_2_12
+gnutls_pkcs11_copy_attached_extension@GNUTLS_3_1_0
 gnutls_pkcs11_copy_secret_key@GNUTLS_2_12
 gnutls_pkcs11_copy_x509_crt@GNUTLS_2_12
 gnutls_pkcs11_copy_x509_privkey@GNUTLS_2_12
@@ -389,6 +398,9 @@ gnutls_pkcs11_obj_export2@GNUTLS_3_1_0
 gnutls_pkcs11_obj_export3@GNUTLS_3_1_0
 gnutls_pkcs11_obj_export@GNUTLS_2_12
 gnutls_pkcs11_obj_export_url@GNUTLS_2_12
+gnutls_pkcs11_obj_flags_get_str@GNUTLS_3_1_0
+gnutls_pkcs11_obj_get_exts@GNUTLS_3_1_0
+gnutls_pkcs11_obj_get_flags@GNUTLS_3_1_0
 gnutls_pkcs11_obj_get_info@GNUTLS_2_12
 gnutls_pkcs11_obj_get_type@GNUTLS_2_12
 gnutls_pkcs11_obj_import_url@GNUTLS_2_12
@@ -396,7 +408,9 @@ gnutls_pkcs11_obj_init@GNUTLS_2_12
 gnutls_pkcs11_obj_list_import_url2@GNUTLS_3_1_0
 gnutls_pkcs11_obj_list_import_url@GNUTLS_2_12
 gnutls_pkcs11_obj_set_pin_function@GNUTLS_3_1_0
+gnutls_pkcs11_privkey_cpy@GNUTLS_3_1_0
 gnutls_pkcs11_privkey_deinit@GNUTLS_2_12
+gnutls_pkcs11_privkey_export_pubkey@GNUTLS_3_1_0
 gnutls_pkcs11_privkey_export_url@GNUTLS_2_12
 gnutls_pkcs11_privkey_generate2@GNUTLS_3_1_0
 gnutls_pkcs11_privkey_generate@GNUTLS_3_0_0
@@ -419,6 +433,7 @@ gnutls_pkcs11_token_set_pin@GNUTLS_2_12
 gnutls_pkcs11_type_get_name@GNUTLS_2_12
 gnutls_pkcs12_bag_decrypt@GNUTLS_1_4
 gnutls_pkcs12_bag_deinit@GNUTLS_1_4
+gnutls_pkcs12_bag_enc_info@GNUTLS_3_1_0
 gnutls_pkcs12_bag_encrypt@GNUTLS_1_4
 gnutls_pkcs12_bag_get_count@GNUTLS_1_4
 gnutls_pkcs12_bag_get_data@GNUTLS_1_4
@@ -434,10 +449,12 @@ gnutls_pkcs12_bag_set_key_id@GNUTLS_1_4
 gnutls_pkcs12_deinit@GNUTLS_1_4
 gnutls_pkcs12_export2@GNUTLS_3_1_0
 gnutls_pkcs12_export@GNUTLS_1_4
+gnutls_pkcs12_generate_mac2@GNUTLS_3_1_0
 gnutls_pkcs12_generate_mac@GNUTLS_1_4
 gnutls_pkcs12_get_bag@GNUTLS_1_4
 gnutls_pkcs12_import@GNUTLS_1_4
 gnutls_pkcs12_init@GNUTLS_1_4
+gnutls_pkcs12_mac_info@GNUTLS_3_1_0
 gnutls_pkcs12_set_bag@GNUTLS_1_4
 gnutls_pkcs12_simple_parse@GNUTLS_3_1_0
 gnutls_pkcs12_verify_mac@GNUTLS_1_4
@@ -456,6 +473,9 @@ gnutls_pkcs7_set_crl@GNUTLS_1_4
 gnutls_pkcs7_set_crl_raw@GNUTLS_1_4
 gnutls_pkcs7_set_crt@GNUTLS_1_4
 gnutls_pkcs7_set_crt_raw@GNUTLS_1_4
+gnutls_pkcs8_info@GNUTLS_3_1_0
+gnutls_pkcs_schema_get_name@GNUTLS_3_1_0
+gnutls_pkcs_schema_get_oid@GNUTLS_3_1_0
 gnutls_prf@GNUTLS_1_4
 gnutls_prf_raw@GNUTLS_1_4
 gnutls_priority_certificate_type_list@GNUTLS_3_0_0
@@ -475,13 +495,17 @@ gnutls_privkey_decrypt_data@GNUTLS_2_12
 gnutls_privkey_deinit@GNUTLS_2_12
 gnutls_privkey_export_dsa_raw@GNUTLS_3_1_0
 gnutls_privkey_export_ecc_raw@GNUTLS_3_1_0
+gnutls_privkey_export_openpgp@GNUTLS_3_1_0
+gnutls_privkey_export_pkcs11@GNUTLS_3_1_0
 gnutls_privkey_export_rsa_raw@GNUTLS_3_1_0
+gnutls_privkey_export_x509@GNUTLS_3_1_0
 gnutls_privkey_generate@GNUTLS_3_1_0
 gnutls_privkey_get_pk_algorithm@GNUTLS_2_12
 gnutls_privkey_get_type@GNUTLS_2_12
 gnutls_privkey_import_dsa_raw@GNUTLS_3_1_0
 gnutls_privkey_import_ecc_raw@GNUTLS_3_1_0
 gnutls_privkey_import_ext2@GNUTLS_3_1_0
+gnutls_privkey_import_ext3@GNUTLS_3_1_0
 gnutls_privkey_import_ext@GNUTLS_3_0_0
 gnutls_privkey_import_openpgp@GNUTLS_2_12
 gnutls_privkey_import_openpgp_raw@GNUTLS_3_1_0
@@ -772,6 +796,7 @@ gnutls_x509_crq_get_dn2@GNUTLS_3_1_0
 gnutls_x509_crq_get_dn@GNUTLS_1_4
 gnutls_x509_crq_get_dn_by_oid@GNUTLS_1_4
 gnutls_x509_crq_get_dn_oid@GNUTLS_1_4
+gnutls_x509_crq_get_extension_by_oid2@GNUTLS_3_1_0
 gnutls_x509_crq_get_extension_by_oid@GNUTLS_2_8
 gnutls_x509_crq_get_extension_data2@GNUTLS_3_1_0
 gnutls_x509_crq_get_extension_data@GNUTLS_2_8
@@ -782,6 +807,7 @@ gnutls_x509_crq_get_key_rsa_raw@GNUTLS_2_8
 gnutls_x509_crq_get_key_usage@GNUTLS_2_8
 gnutls_x509_crq_get_pk_algorithm@GNUTLS_1_4
 gnutls_x509_crq_get_private_key_usage_period@GNUTLS_3_0_0
+gnutls_x509_crq_get_signature_algorithm@GNUTLS_3_1_0
 gnutls_x509_crq_get_subject_alt_name@GNUTLS_2_8
 gnutls_x509_crq_get_subject_alt_othername_oid@GNUTLS_2_8
 gnutls_x509_crq_get_version@GNUTLS_1_4
@@ -825,6 +851,7 @@ gnutls_x509_crt_get_dn@GNUTLS_1_4
 gnutls_x509_crt_get_dn_by_oid@GNUTLS_1_4
 gnutls_x509_crt_get_dn_oid@GNUTLS_1_4
 gnutls_x509_crt_get_expiration_time@GNUTLS_1_4
+gnutls_x509_crt_get_extension_by_oid2@GNUTLS_3_1_0
 gnutls_x509_crt_get_extension_by_oid@GNUTLS_1_4
 gnutls_x509_crt_get_extension_data2@GNUTLS_3_1_0
 gnutls_x509_crt_get_extension_data@GNUTLS_1_4
@@ -918,6 +945,7 @@ gnutls_x509_dn_import@GNUTLS_1_4
 gnutls_x509_dn_init@GNUTLS_1_4
 gnutls_x509_dn_oid_known@GNUTLS_1_4
 gnutls_x509_dn_oid_name@GNUTLS_3_0_0
+gnutls_x509_ext_deinit@GNUTLS_3_1_0
 gnutls_x509_ext_export_aia@GNUTLS_3_1_0
 gnutls_x509_ext_export_authority_key_id@GNUTLS_3_1_0
 gnutls_x509_ext_export_basic_constraints@GNUTLS_3_1_0
@@ -942,6 +970,7 @@ gnutls_x509_ext_import_private_key_usage_period@GNUTLS_3_1_0
 gnutls_x509_ext_import_proxy@GNUTLS_3_1_0
 gnutls_x509_ext_import_subject_alt_names@GNUTLS_3_1_0
 gnutls_x509_ext_import_subject_key_id@GNUTLS_3_1_0
+gnutls_x509_ext_print@GNUTLS_3_1_0
 gnutls_x509_key_purpose_deinit@GNUTLS_3_1_0
 gnutls_x509_key_purpose_get@GNUTLS_3_1_0
 gnutls_x509_key_purpose_init@GNUTLS_3_1_0
@@ -954,6 +983,7 @@ gnutls_x509_name_constraints_deinit@GNUTLS_3_1_0
 gnutls_x509_name_constraints_get_excluded@GNUTLS_3_1_0
 gnutls_x509_name_constraints_get_permitted@GNUTLS_3_1_0
 gnutls_x509_name_constraints_init@GNUTLS_3_1_0
+gnutls_x509_othername_to_virtual@GNUTLS_3_1_0
 gnutls_x509_policies_deinit@GNUTLS_3_1_0
 gnutls_x509_policies_get@GNUTLS_3_1_0
 gnutls_x509_policies_init@GNUTLS_3_1_0
@@ -1000,8 +1030,11 @@ gnutls_x509_trust_list_add_trust_mem@GNUTLS_3_1_0
 gnutls_x509_trust_list_deinit@GNUTLS_3_0_0
 gnutls_x509_trust_list_get_issuer@GNUTLS_3_0_0
 gnutls_x509_trust_list_init@GNUTLS_3_0_0
+gnutls_x509_trust_list_iter_deinit@GNUTLS_3_1_0
+gnutls_x509_trust_list_iter_get_ca@GNUTLS_3_1_0
 gnutls_x509_trust_list_remove_cas@GNUTLS_3_1_0
 gnutls_x509_trust_list_remove_trust_file@GNUTLS_3_1_0
 gnutls_x509_trust_list_remove_trust_mem@GNUTLS_3_1_0
+gnutls_x509_trust_list_verify_crt2@GNUTLS_3_1_0
 gnutls_x509_trust_list_verify_crt@GNUTLS_3_0_0
 gnutls_x509_trust_list_verify_named_crt@GNUTLS_3_0_0