Generated.

7 files changed, 656 insertions, 224 deletions

diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
index 96d09d3b70..aeca213397 100644
--- a/doc/manpages/Makefile.am
+++ b/doc/manpages/Makefile.am
@@ -26,7 +26,7 @@ if ENABLE_SRP
 dist_man_MANS += srptool.1
 endif
 
-APIMANS = gnutls_authz_send_x509_attr_cert.3 gnutls_authz_send_saml_assertion.3 gnutls_authz_send_x509_attr_cert_url.3 gnutls_authz_send_saml_assertion_url.3 gnutls_authz_enable.3 gnutls_server_name_get.3 gnutls_server_name_set.3 gnutls_alert_get_name.3 gnutls_alert_send.3 gnutls_error_to_alert.3 gnutls_alert_send_appropriate.3 gnutls_alert_get.3 gnutls_mac_get_name.3 gnutls_mac_list.3 gnutls_compression_get_name.3 gnutls_compression_list.3 gnutls_cipher_get_key_size.3 gnutls_cipher_get_name.3 gnutls_cipher_list.3 gnutls_kx_get_name.3 gnutls_kx_list.3 gnutls_protocol_get_name.3 gnutls_protocol_list.3 gnutls_cipher_suite_get_name.3 gnutls_cipher_suite_info.3 gnutls_certificate_type_get_name.3 gnutls_certificate_type_list.3 gnutls_sign_algorithm_get_name.3 gnutls_pk_algorithm_get_name.3 gnutls_anon_free_server_credentials.3 gnutls_anon_allocate_server_credentials.3 gnutls_anon_free_client_credentials.3 gnutls_anon_allocate_client_credentials.3 gnutls_anon_set_server_dh_params.3 gnutls_anon_set_server_params_function.3 gnutls_credentials_clear.3 gnutls_credentials_set.3 gnutls_auth_get_type.3 gnutls_auth_server_get_type.3 gnutls_auth_client_get_type.3 gnutls_transport_set_errno.3 gnutls_transport_set_global_errno.3 gnutls_record_check_pending.3 gnutls_certificate_free_keys.3 gnutls_certificate_free_cas.3 gnutls_certificate_free_ca_names.3 gnutls_certificate_free_credentials.3 gnutls_certificate_allocate_credentials.3 gnutls_certificate_server_set_request.3 gnutls_certificate_client_set_retrieve_function.3 gnutls_certificate_server_set_retrieve_function.3 gnutls_certificate_verify_peers2.3 gnutls_certificate_verify_peers.3 gnutls_certificate_expiration_time_peers.3 gnutls_certificate_activation_time_peers.3 gnutls_sign_callback_set.3 gnutls_sign_callback_get.3 gnutls_db_set_retrieve_function.3 gnutls_db_set_remove_function.3 gnutls_db_set_store_function.3 gnutls_db_set_ptr.3 gnutls_db_get_ptr.3 gnutls_db_set_cache_expiration.3 gnutls_db_check_entry.3 gnutls_db_remove_session.3 gnutls_dh_params_import_raw.3 gnutls_dh_params_init.3 gnutls_dh_params_deinit.3 gnutls_dh_params_cpy.3 gnutls_dh_params_generate2.3 gnutls_dh_params_import_pkcs3.3 gnutls_dh_params_export_pkcs3.3 gnutls_dh_params_export_raw.3 gnutls_error_is_fatal.3 gnutls_perror.3 gnutls_strerror.3 gnutls_global_set_log_function.3 gnutls_global_set_log_level.3 gnutls_global_set_mem_functions.3 gnutls_global_init.3 gnutls_global_deinit.3 gnutls_transport_set_pull_function.3 gnutls_transport_set_push_function.3 gnutls_check_version.3 gnutls_rehandshake.3 gnutls_handshake.3 gnutls_handshake_set_max_packet_length.3 gnutls_handshake_get_last_in.3 gnutls_handshake_get_last_out.3 gnutls_malloc.3 gnutls_free.3 gnutls_cipher_set_priority.3 gnutls_kx_set_priority.3 gnutls_mac_set_priority.3 gnutls_compression_set_priority.3 gnutls_protocol_set_priority.3 gnutls_certificate_type_set_priority.3 gnutls_set_default_priority.3 gnutls_set_default_export_priority.3 gnutls_psk_free_client_credentials.3 gnutls_psk_allocate_client_credentials.3 gnutls_psk_set_client_credentials.3 gnutls_psk_free_server_credentials.3 gnutls_psk_allocate_server_credentials.3 gnutls_psk_set_server_credentials_file.3 gnutls_psk_set_server_credentials_function.3 gnutls_psk_set_client_credentials_function.3 gnutls_psk_server_get_username.3 gnutls_hex_decode.3 gnutls_hex_encode.3 gnutls_psk_set_server_dh_params.3 gnutls_psk_set_server_params_function.3 gnutls_protocol_get_version.3 gnutls_transport_set_lowat.3 gnutls_transport_set_ptr.3 gnutls_transport_set_ptr2.3 gnutls_transport_get_ptr.3 gnutls_transport_get_ptr2.3 gnutls_bye.3 gnutls_record_send.3 gnutls_record_recv.3 gnutls_record_get_max_size.3 gnutls_record_set_max_size.3 gnutls_rsa_params_import_raw.3 gnutls_rsa_params_init.3 gnutls_rsa_params_deinit.3 gnutls_rsa_params_cpy.3 gnutls_rsa_params_generate2.3 gnutls_rsa_params_import_pkcs1.3 gnutls_rsa_params_export_pkcs1.3 gnutls_rsa_params_export_raw.3 gnutls_session_get_data.3 gnutls_session_get_data2.3 gnutls_session_get_id.3 gnutls_session_set_data.3 gnutls_cipher_get.3 gnutls_certificate_type_get.3 gnutls_kx_get.3 gnutls_mac_get.3 gnutls_compression_get.3 gnutls_init.3 gnutls_deinit.3 gnutls_openpgp_send_key.3 gnutls_certificate_send_x509_rdn_sequence.3 gnutls_handshake_set_private_extensions.3 gnutls_prf_raw.3 gnutls_prf.3 gnutls_session_get_client_random.3 gnutls_session_get_server_random.3 gnutls_session_get_master_secret.3 gnutls_session_is_resumed.3 gnutls_session_get_ptr.3 gnutls_session_set_ptr.3 gnutls_record_get_direction.3 gnutls_dh_set_prime_bits.3 gnutls_dh_get_group.3 gnutls_dh_get_pubkey.3 gnutls_rsa_export_get_pubkey.3 gnutls_dh_get_secret_bits.3 gnutls_dh_get_prime_bits.3 gnutls_rsa_export_get_modulus_bits.3 gnutls_dh_get_peers_public_bits.3 gnutls_certificate_get_ours.3 gnutls_certificate_get_peers.3 gnutls_certificate_client_get_request_status.3 gnutls_fingerprint.3 gnutls_certificate_set_dh_params.3 gnutls_certificate_set_params_function.3 gnutls_certificate_set_verify_flags.3 gnutls_certificate_set_verify_limits.3 gnutls_certificate_set_rsa_export_params.3 gnutls_psk_set_params_function.3 gnutls_anon_set_params_function.3 gnutls_certificate_set_x509_key_mem.3 gnutls_certificate_set_x509_key.3 gnutls_certificate_set_x509_key_file.3 gnutls_certificate_set_x509_trust_mem.3 gnutls_certificate_set_x509_trust.3 gnutls_certificate_set_x509_trust_file.3 gnutls_certificate_set_x509_crl_mem.3 gnutls_certificate_set_x509_crl.3 gnutls_certificate_set_x509_crl_file.3 gnutls_certificate_set_x509_simple_pkcs12_file.3 gnutls_certificate_free_crls.3 gnutls_pem_base64_encode.3 gnutls_pem_base64_encode_alloc.3 gnutls_pem_base64_decode.3 gnutls_pem_base64_decode_alloc.3 gnutls_global_init_extra.3 gnutls_extra_check_version.3 gnutls_ia_permute_inner_secret.3 gnutls_ia_generate_challenge.3 gnutls_ia_extract_inner_secret.3 gnutls_ia_endphase_send.3 gnutls_ia_verify_endphase.3 gnutls_ia_send.3 gnutls_ia_recv.3 gnutls_ia_handshake_p.3 gnutls_ia_handshake.3 gnutls_ia_allocate_client_credentials.3 gnutls_ia_free_client_credentials.3 gnutls_ia_set_client_avp_function.3 gnutls_ia_set_client_avp_ptr.3 gnutls_ia_get_client_avp_ptr.3 gnutls_ia_allocate_server_credentials.3 gnutls_ia_free_server_credentials.3 gnutls_ia_set_server_avp_function.3 gnutls_ia_set_server_avp_ptr.3 gnutls_ia_get_server_avp_ptr.3 gnutls_ia_enable.3 gnutls_certificate_set_openpgp_key_mem.3 gnutls_certificate_set_openpgp_key_file.3 gnutls_certificate_set_openpgp_keyring_file.3 gnutls_certificate_set_openpgp_keyring_mem.3 gnutls_certificate_set_openpgp_keyserver.3 gnutls_certificate_set_openpgp_trustdb.3 gnutls_openpgp_set_recv_key_function.3 gnutls_certificate_set_openpgp_key.3 gnutls_openpgp_privkey_sign_hash.3 gnutls_x509_dn_oid_known.3 gnutls_x509_crl_init.3 gnutls_x509_crl_deinit.3 gnutls_x509_crl_import.3 gnutls_x509_crl_get_issuer_dn.3 gnutls_x509_crl_get_issuer_dn_by_oid.3 gnutls_x509_crl_get_dn_oid.3 gnutls_x509_crl_get_signature_algorithm.3 gnutls_x509_crl_get_signature.3 gnutls_x509_crl_get_version.3 gnutls_x509_crl_get_this_update.3 gnutls_x509_crl_get_next_update.3 gnutls_x509_crl_get_crt_count.3 gnutls_x509_crl_get_crt_serial.3 gnutls_x509_crl_export.3 gnutls_x509_crl_set_version.3 gnutls_x509_crl_sign2.3 gnutls_x509_crl_sign.3 gnutls_x509_crl_set_this_update.3 gnutls_x509_crl_set_next_update.3 gnutls_x509_crl_set_crt_serial.3 gnutls_x509_crl_set_crt.3 gnutls_x509_crq_init.3 gnutls_x509_crq_deinit.3 gnutls_x509_crq_import.3 gnutls_x509_crq_get_dn.3 gnutls_x509_crq_get_dn_by_oid.3 gnutls_x509_crq_get_dn_oid.3 gnutls_x509_crq_get_challenge_password.3 gnutls_x509_crq_set_attribute_by_oid.3 gnutls_x509_crq_get_attribute_by_oid.3 gnutls_x509_crq_set_dn_by_oid.3 gnutls_x509_crq_set_version.3 gnutls_x509_crq_get_version.3 gnutls_x509_crq_set_key.3 gnutls_x509_crq_set_challenge_password.3 gnutls_x509_crq_sign2.3 gnutls_x509_crq_sign.3 gnutls_x509_crq_export.3 gnutls_x509_crq_get_pk_algorithm.3 gnutls_x509_rdn_get.3 gnutls_x509_rdn_get_by_oid.3 gnutls_x509_rdn_get_oid.3 gnutls_x509_crt_print.3 gnutls_x509_crl_print.3 gnutls_pkcs12_init.3 gnutls_pkcs12_deinit.3 gnutls_pkcs12_import.3 gnutls_pkcs12_export.3 gnutls_pkcs12_get_bag.3 gnutls_pkcs12_set_bag.3 gnutls_pkcs12_generate_mac.3 gnutls_pkcs12_verify_mac.3 gnutls_pkcs12_bag_init.3 gnutls_pkcs12_bag_deinit.3 gnutls_pkcs12_bag_get_type.3 gnutls_pkcs12_bag_get_count.3 gnutls_pkcs12_bag_get_data.3 gnutls_pkcs12_bag_set_data.3 gnutls_pkcs12_bag_set_crt.3 gnutls_pkcs12_bag_set_crl.3 gnutls_pkcs12_bag_set_key_id.3 gnutls_pkcs12_bag_get_key_id.3 gnutls_pkcs12_bag_get_friendly_name.3 gnutls_pkcs12_bag_set_friendly_name.3 gnutls_pkcs12_bag_decrypt.3 gnutls_pkcs12_bag_encrypt.3 gnutls_pkcs7_init.3 gnutls_pkcs7_deinit.3 gnutls_pkcs7_import.3 gnutls_pkcs7_get_crt_raw.3 gnutls_pkcs7_get_crt_count.3 gnutls_pkcs7_export.3 gnutls_pkcs7_set_crt_raw.3 gnutls_pkcs7_set_crt.3 gnutls_pkcs7_delete_crt.3 gnutls_pkcs7_get_crl_raw.3 gnutls_pkcs7_get_crl_count.3 gnutls_pkcs7_set_crl_raw.3 gnutls_pkcs7_set_crl.3 gnutls_pkcs7_delete_crl.3 gnutls_x509_privkey_init.3 gnutls_x509_privkey_deinit.3 gnutls_x509_privkey_cpy.3 gnutls_x509_privkey_import.3 gnutls_x509_privkey_import_rsa_raw.3 gnutls_x509_privkey_import_dsa_raw.3 gnutls_x509_privkey_get_pk_algorithm.3 gnutls_x509_privkey_export.3 gnutls_x509_privkey_export_rsa_raw.3 gnutls_x509_privkey_export_dsa_raw.3 gnutls_x509_privkey_generate.3 gnutls_x509_privkey_get_key_id.3 gnutls_x509_privkey_sign_data.3 gnutls_x509_privkey_sign_hash.3 gnutls_x509_privkey_verify_data.3 gnutls_x509_privkey_fix.3 gnutls_x509_privkey_export_pkcs8.3 gnutls_x509_privkey_import_pkcs8.3 gnutls_x509_crt_check_hostname.3 gnutls_x509_crt_check_issuer.3 gnutls_x509_crt_list_verify.3 gnutls_x509_crt_verify.3 gnutls_x509_crl_check_issuer.3 gnutls_x509_crl_verify.3 gnutls_x509_crt_init.3 gnutls_x509_crt_deinit.3 gnutls_x509_crt_import.3 gnutls_x509_crt_get_issuer_dn.3 gnutls_x509_crt_get_issuer_dn_by_oid.3 gnutls_x509_crt_get_issuer_dn_oid.3 gnutls_x509_crt_get_dn.3 gnutls_x509_crt_get_dn_by_oid.3 gnutls_x509_crt_get_dn_oid.3 gnutls_x509_crt_get_signature_algorithm.3 gnutls_x509_crt_get_signature.3 gnutls_x509_crt_get_version.3 gnutls_x509_crt_get_activation_time.3 gnutls_x509_crt_get_expiration_time.3 gnutls_x509_crt_get_serial.3 gnutls_x509_crt_get_subject_key_id.3 gnutls_x509_crt_get_authority_key_id.3 gnutls_x509_crt_get_pk_algorithm.3 gnutls_x509_crt_get_subject_alt_name.3 gnutls_x509_crt_get_subject_alt_othername_oid.3 gnutls_x509_crt_get_basic_constraints.3 gnutls_x509_crt_get_ca_status.3 gnutls_x509_crt_get_key_usage.3 gnutls_x509_crt_get_proxy.3 gnutls_x509_crt_get_extension_by_oid.3 gnutls_x509_crt_get_extension_oid.3 gnutls_x509_crt_get_extension_info.3 gnutls_x509_crt_get_extension_data.3 gnutls_x509_crt_get_raw_issuer_dn.3 gnutls_x509_crt_get_raw_dn.3 gnutls_x509_crt_get_subject.3 gnutls_x509_crt_get_issuer.3 gnutls_x509_dn_get_rdn_ava.3 gnutls_x509_crt_get_fingerprint.3 gnutls_x509_crt_export.3 gnutls_x509_crt_get_key_id.3 gnutls_x509_crt_check_revocation.3 gnutls_x509_crt_verify_data.3 gnutls_x509_crt_get_crl_dist_points.3 gnutls_x509_crt_get_key_purpose_oid.3 gnutls_x509_crt_get_pk_rsa_raw.3 gnutls_x509_crt_get_pk_dsa_raw.3 gnutls_x509_crt_list_import.3 gnutls_x509_crt_set_dn_by_oid.3 gnutls_x509_crt_set_issuer_dn_by_oid.3 gnutls_x509_crt_set_proxy_dn.3 gnutls_x509_crt_set_version.3 gnutls_x509_crt_set_key.3 gnutls_x509_crt_set_crq.3 gnutls_x509_crt_set_extension_by_oid.3 gnutls_x509_crt_set_basic_constraints.3 gnutls_x509_crt_set_ca_status.3 gnutls_x509_crt_set_key_usage.3 gnutls_x509_crt_set_subject_alternative_name.3 gnutls_x509_crt_set_proxy.3 gnutls_x509_crt_sign2.3 gnutls_x509_crt_sign.3 gnutls_x509_crt_set_activation_time.3 gnutls_x509_crt_set_expiration_time.3 gnutls_x509_crt_set_serial.3 gnutls_x509_crt_set_crl_dist_points.3 gnutls_x509_crt_cpy_crl_dist_points.3 gnutls_x509_crt_set_subject_key_id.3 gnutls_x509_crt_set_authority_key_id.3 gnutls_x509_crt_set_key_purpose_oid.3 gnutls_x509_crt_to_xml.3 gnutls_openpgp_keyring_init.3 gnutls_openpgp_keyring_deinit.3 gnutls_openpgp_keyring_check_id.3 gnutls_openpgp_keyring_import.3 gnutls_openpgp_trustdb_init.3 gnutls_openpgp_trustdb_deinit.3 gnutls_openpgp_trustdb_import_file.3 gnutls_openpgp_key_init.3 gnutls_openpgp_key_deinit.3 gnutls_openpgp_key_import.3 gnutls_openpgp_key_export.3 gnutls_openpgp_key_get_fingerprint.3 gnutls_openpgp_key_get_name.3 gnutls_openpgp_key_get_pk_algorithm.3 gnutls_openpgp_key_get_version.3 gnutls_openpgp_key_get_creation_time.3 gnutls_openpgp_key_get_expiration_time.3 gnutls_openpgp_key_get_id.3 gnutls_openpgp_key_check_hostname.3 gnutls_openpgp_key_get_key_usage.3 gnutls_openpgp_key_verify_ring.3 gnutls_openpgp_key_verify_self.3 gnutls_openpgp_key_verify_trustdb.3 gnutls_openpgp_privkey_init.3 gnutls_openpgp_privkey_deinit.3 gnutls_openpgp_privkey_import.3 gnutls_openpgp_privkey_get_pk_algorithm.3 gnutls_openpgp_key_to_xml.3
+APIMANS = gnutls_server_name_get.3 gnutls_server_name_set.3 gnutls_alert_get_name.3 gnutls_alert_send.3 gnutls_error_to_alert.3 gnutls_alert_send_appropriate.3 gnutls_alert_get.3 gnutls_mac_get_name.3 gnutls_mac_list.3 gnutls_compression_get_name.3 gnutls_compression_list.3 gnutls_cipher_get_key_size.3 gnutls_cipher_get_name.3 gnutls_cipher_list.3 gnutls_kx_get_name.3 gnutls_kx_list.3 gnutls_protocol_get_name.3 gnutls_protocol_list.3 gnutls_cipher_suite_get_name.3 gnutls_cipher_suite_info.3 gnutls_certificate_type_get_name.3 gnutls_certificate_type_list.3 gnutls_sign_algorithm_get_name.3 gnutls_pk_algorithm_get_name.3 gnutls_anon_free_server_credentials.3 gnutls_anon_allocate_server_credentials.3 gnutls_anon_free_client_credentials.3 gnutls_anon_allocate_client_credentials.3 gnutls_anon_set_server_dh_params.3 gnutls_anon_set_server_params_function.3 gnutls_credentials_clear.3 gnutls_credentials_set.3 gnutls_auth_get_type.3 gnutls_auth_server_get_type.3 gnutls_auth_client_get_type.3 gnutls_transport_set_errno.3 gnutls_transport_set_global_errno.3 gnutls_record_check_pending.3 gnutls_certificate_free_keys.3 gnutls_certificate_free_cas.3 gnutls_certificate_free_ca_names.3 gnutls_certificate_free_credentials.3 gnutls_certificate_allocate_credentials.3 gnutls_certificate_server_set_request.3 gnutls_certificate_client_set_retrieve_function.3 gnutls_certificate_server_set_retrieve_function.3 gnutls_certificate_verify_peers2.3 gnutls_certificate_verify_peers.3 gnutls_certificate_expiration_time_peers.3 gnutls_certificate_activation_time_peers.3 gnutls_sign_callback_set.3 gnutls_sign_callback_get.3 gnutls_db_set_retrieve_function.3 gnutls_db_set_remove_function.3 gnutls_db_set_store_function.3 gnutls_db_set_ptr.3 gnutls_db_get_ptr.3 gnutls_db_set_cache_expiration.3 gnutls_db_check_entry.3 gnutls_db_remove_session.3 gnutls_dh_params_import_raw.3 gnutls_dh_params_init.3 gnutls_dh_params_deinit.3 gnutls_dh_params_cpy.3 gnutls_dh_params_generate2.3 gnutls_dh_params_import_pkcs3.3 gnutls_dh_params_export_pkcs3.3 gnutls_dh_params_export_raw.3 gnutls_error_is_fatal.3 gnutls_perror.3 gnutls_strerror.3 gnutls_global_set_log_function.3 gnutls_global_set_log_level.3 gnutls_global_set_mem_functions.3 gnutls_global_init.3 gnutls_global_deinit.3 gnutls_transport_set_pull_function.3 gnutls_transport_set_push_function.3 gnutls_check_version.3 gnutls_rehandshake.3 gnutls_handshake.3 gnutls_handshake_set_max_packet_length.3 gnutls_handshake_get_last_in.3 gnutls_handshake_get_last_out.3 gnutls_malloc.3 gnutls_free.3 gnutls_cipher_set_priority.3 gnutls_kx_set_priority.3 gnutls_mac_set_priority.3 gnutls_compression_set_priority.3 gnutls_protocol_set_priority.3 gnutls_certificate_type_set_priority.3 gnutls_set_default_priority.3 gnutls_set_default_export_priority.3 gnutls_psk_free_client_credentials.3 gnutls_psk_allocate_client_credentials.3 gnutls_psk_set_client_credentials.3 gnutls_psk_free_server_credentials.3 gnutls_psk_allocate_server_credentials.3 gnutls_psk_set_server_credentials_file.3 gnutls_psk_set_server_credentials_function.3 gnutls_psk_set_client_credentials_function.3 gnutls_psk_server_get_username.3 gnutls_hex_decode.3 gnutls_hex_encode.3 gnutls_psk_set_server_dh_params.3 gnutls_psk_set_server_params_function.3 gnutls_protocol_get_version.3 gnutls_transport_set_lowat.3 gnutls_transport_set_ptr.3 gnutls_transport_set_ptr2.3 gnutls_transport_get_ptr.3 gnutls_transport_get_ptr2.3 gnutls_bye.3 gnutls_record_send.3 gnutls_record_recv.3 gnutls_record_get_max_size.3 gnutls_record_set_max_size.3 gnutls_rsa_params_import_raw.3 gnutls_rsa_params_init.3 gnutls_rsa_params_deinit.3 gnutls_rsa_params_cpy.3 gnutls_rsa_params_generate2.3 gnutls_rsa_params_import_pkcs1.3 gnutls_rsa_params_export_pkcs1.3 gnutls_rsa_params_export_raw.3 gnutls_session_get_data.3 gnutls_session_get_data2.3 gnutls_session_get_id.3 gnutls_session_set_data.3 gnutls_cipher_get.3 gnutls_certificate_type_get.3 gnutls_kx_get.3 gnutls_mac_get.3 gnutls_compression_get.3 gnutls_init.3 gnutls_deinit.3 gnutls_openpgp_send_key.3 gnutls_certificate_send_x509_rdn_sequence.3 gnutls_handshake_set_private_extensions.3 gnutls_prf_raw.3 gnutls_prf.3 gnutls_session_get_client_random.3 gnutls_session_get_server_random.3 gnutls_session_get_master_secret.3 gnutls_session_is_resumed.3 gnutls_session_get_ptr.3 gnutls_session_set_ptr.3 gnutls_record_get_direction.3 gnutls_dh_set_prime_bits.3 gnutls_dh_get_group.3 gnutls_dh_get_pubkey.3 gnutls_rsa_export_get_pubkey.3 gnutls_dh_get_secret_bits.3 gnutls_dh_get_prime_bits.3 gnutls_rsa_export_get_modulus_bits.3 gnutls_dh_get_peers_public_bits.3 gnutls_certificate_get_ours.3 gnutls_certificate_get_peers.3 gnutls_certificate_client_get_request_status.3 gnutls_fingerprint.3 gnutls_certificate_set_dh_params.3 gnutls_certificate_set_params_function.3 gnutls_certificate_set_verify_flags.3 gnutls_certificate_set_verify_limits.3 gnutls_certificate_set_rsa_export_params.3 gnutls_psk_set_params_function.3 gnutls_anon_set_params_function.3 gnutls_certificate_set_x509_key_mem.3 gnutls_certificate_set_x509_key.3 gnutls_certificate_set_x509_key_file.3 gnutls_certificate_set_x509_trust_mem.3 gnutls_certificate_set_x509_trust.3 gnutls_certificate_set_x509_trust_file.3 gnutls_certificate_set_x509_crl_mem.3 gnutls_certificate_set_x509_crl.3 gnutls_certificate_set_x509_crl_file.3 gnutls_certificate_set_x509_simple_pkcs12_file.3 gnutls_certificate_free_crls.3 gnutls_pem_base64_encode.3 gnutls_pem_base64_encode_alloc.3 gnutls_pem_base64_decode.3 gnutls_pem_base64_decode_alloc.3 gnutls_global_init_extra.3 gnutls_extra_check_version.3 gnutls_ia_permute_inner_secret.3 gnutls_ia_generate_challenge.3 gnutls_ia_extract_inner_secret.3 gnutls_ia_endphase_send.3 gnutls_ia_verify_endphase.3 gnutls_ia_send.3 gnutls_ia_recv.3 gnutls_ia_handshake_p.3 gnutls_ia_handshake.3 gnutls_ia_allocate_client_credentials.3 gnutls_ia_free_client_credentials.3 gnutls_ia_set_client_avp_function.3 gnutls_ia_set_client_avp_ptr.3 gnutls_ia_get_client_avp_ptr.3 gnutls_ia_allocate_server_credentials.3 gnutls_ia_free_server_credentials.3 gnutls_ia_set_server_avp_function.3 gnutls_ia_set_server_avp_ptr.3 gnutls_ia_get_server_avp_ptr.3 gnutls_ia_enable.3 gnutls_certificate_set_openpgp_key_mem.3 gnutls_certificate_set_openpgp_key_file.3 gnutls_certificate_set_openpgp_keyring_file.3 gnutls_certificate_set_openpgp_keyring_mem.3 gnutls_certificate_set_openpgp_keyserver.3 gnutls_certificate_set_openpgp_trustdb.3 gnutls_openpgp_set_recv_key_function.3 gnutls_certificate_set_openpgp_key.3 gnutls_openpgp_privkey_sign_hash.3 gnutls_x509_dn_oid_known.3 gnutls_x509_crl_init.3 gnutls_x509_crl_deinit.3 gnutls_x509_crl_import.3 gnutls_x509_crl_get_issuer_dn.3 gnutls_x509_crl_get_issuer_dn_by_oid.3 gnutls_x509_crl_get_dn_oid.3 gnutls_x509_crl_get_signature_algorithm.3 gnutls_x509_crl_get_signature.3 gnutls_x509_crl_get_version.3 gnutls_x509_crl_get_this_update.3 gnutls_x509_crl_get_next_update.3 gnutls_x509_crl_get_crt_count.3 gnutls_x509_crl_get_crt_serial.3 gnutls_x509_crl_export.3 gnutls_x509_crl_set_version.3 gnutls_x509_crl_sign2.3 gnutls_x509_crl_sign.3 gnutls_x509_crl_set_this_update.3 gnutls_x509_crl_set_next_update.3 gnutls_x509_crl_set_crt_serial.3 gnutls_x509_crl_set_crt.3 gnutls_x509_crq_init.3 gnutls_x509_crq_deinit.3 gnutls_x509_crq_import.3 gnutls_x509_crq_get_dn.3 gnutls_x509_crq_get_dn_by_oid.3 gnutls_x509_crq_get_dn_oid.3 gnutls_x509_crq_get_challenge_password.3 gnutls_x509_crq_set_attribute_by_oid.3 gnutls_x509_crq_get_attribute_by_oid.3 gnutls_x509_crq_set_dn_by_oid.3 gnutls_x509_crq_set_version.3 gnutls_x509_crq_get_version.3 gnutls_x509_crq_set_key.3 gnutls_x509_crq_set_challenge_password.3 gnutls_x509_crq_sign2.3 gnutls_x509_crq_sign.3 gnutls_x509_crq_export.3 gnutls_x509_crq_get_pk_algorithm.3 gnutls_x509_rdn_get.3 gnutls_x509_rdn_get_by_oid.3 gnutls_x509_rdn_get_oid.3 gnutls_x509_crt_print.3 gnutls_x509_crl_print.3 gnutls_pkcs12_init.3 gnutls_pkcs12_deinit.3 gnutls_pkcs12_import.3 gnutls_pkcs12_export.3 gnutls_pkcs12_get_bag.3 gnutls_pkcs12_set_bag.3 gnutls_pkcs12_generate_mac.3 gnutls_pkcs12_verify_mac.3 gnutls_pkcs12_bag_init.3 gnutls_pkcs12_bag_deinit.3 gnutls_pkcs12_bag_get_type.3 gnutls_pkcs12_bag_get_count.3 gnutls_pkcs12_bag_get_data.3 gnutls_pkcs12_bag_set_data.3 gnutls_pkcs12_bag_set_crt.3 gnutls_pkcs12_bag_set_crl.3 gnutls_pkcs12_bag_set_key_id.3 gnutls_pkcs12_bag_get_key_id.3 gnutls_pkcs12_bag_get_friendly_name.3 gnutls_pkcs12_bag_set_friendly_name.3 gnutls_pkcs12_bag_decrypt.3 gnutls_pkcs12_bag_encrypt.3 gnutls_pkcs7_init.3 gnutls_pkcs7_deinit.3 gnutls_pkcs7_import.3 gnutls_pkcs7_get_crt_raw.3 gnutls_pkcs7_get_crt_count.3 gnutls_pkcs7_export.3 gnutls_pkcs7_set_crt_raw.3 gnutls_pkcs7_set_crt.3 gnutls_pkcs7_delete_crt.3 gnutls_pkcs7_get_crl_raw.3 gnutls_pkcs7_get_crl_count.3 gnutls_pkcs7_set_crl_raw.3 gnutls_pkcs7_set_crl.3 gnutls_pkcs7_delete_crl.3 gnutls_x509_privkey_init.3 gnutls_x509_privkey_deinit.3 gnutls_x509_privkey_cpy.3 gnutls_x509_privkey_import.3 gnutls_x509_privkey_import_rsa_raw.3 gnutls_x509_privkey_import_dsa_raw.3 gnutls_x509_privkey_get_pk_algorithm.3 gnutls_x509_privkey_export.3 gnutls_x509_privkey_export_rsa_raw.3 gnutls_x509_privkey_export_dsa_raw.3 gnutls_x509_privkey_generate.3 gnutls_x509_privkey_get_key_id.3 gnutls_x509_privkey_sign_data.3 gnutls_x509_privkey_sign_hash.3 gnutls_x509_privkey_verify_data.3 gnutls_x509_privkey_fix.3 gnutls_x509_privkey_export_pkcs8.3 gnutls_x509_privkey_import_pkcs8.3 gnutls_x509_crt_check_hostname.3 gnutls_x509_crt_check_issuer.3 gnutls_x509_crt_list_verify.3 gnutls_x509_crt_verify.3 gnutls_x509_crl_check_issuer.3 gnutls_x509_crl_verify.3 gnutls_x509_crt_init.3 gnutls_x509_crt_deinit.3 gnutls_x509_crt_import.3 gnutls_x509_crt_get_issuer_dn.3 gnutls_x509_crt_get_issuer_dn_by_oid.3 gnutls_x509_crt_get_issuer_dn_oid.3 gnutls_x509_crt_get_dn.3 gnutls_x509_crt_get_dn_by_oid.3 gnutls_x509_crt_get_dn_oid.3 gnutls_x509_crt_get_signature_algorithm.3 gnutls_x509_crt_get_signature.3 gnutls_x509_crt_get_version.3 gnutls_x509_crt_get_activation_time.3 gnutls_x509_crt_get_expiration_time.3 gnutls_x509_crt_get_serial.3 gnutls_x509_crt_get_subject_key_id.3 gnutls_x509_crt_get_authority_key_id.3 gnutls_x509_crt_get_pk_algorithm.3 gnutls_x509_crt_get_subject_alt_name.3 gnutls_x509_crt_get_subject_alt_othername_oid.3 gnutls_x509_crt_get_basic_constraints.3 gnutls_x509_crt_get_ca_status.3 gnutls_x509_crt_get_key_usage.3 gnutls_x509_crt_get_proxy.3 gnutls_x509_crt_get_extension_by_oid.3 gnutls_x509_crt_get_extension_oid.3 gnutls_x509_crt_get_extension_info.3 gnutls_x509_crt_get_extension_data.3 gnutls_x509_crt_get_raw_issuer_dn.3 gnutls_x509_crt_get_raw_dn.3 gnutls_x509_crt_get_subject.3 gnutls_x509_crt_get_issuer.3 gnutls_x509_dn_get_rdn_ava.3 gnutls_x509_crt_get_fingerprint.3 gnutls_x509_crt_export.3 gnutls_x509_crt_get_key_id.3 gnutls_x509_crt_check_revocation.3 gnutls_x509_crt_verify_data.3 gnutls_x509_crt_get_crl_dist_points.3 gnutls_x509_crt_get_key_purpose_oid.3 gnutls_x509_crt_get_pk_rsa_raw.3 gnutls_x509_crt_get_pk_dsa_raw.3 gnutls_x509_crt_list_import.3 gnutls_x509_crt_set_dn_by_oid.3 gnutls_x509_crt_set_issuer_dn_by_oid.3 gnutls_x509_crt_set_proxy_dn.3 gnutls_x509_crt_set_version.3 gnutls_x509_crt_set_key.3 gnutls_x509_crt_set_crq.3 gnutls_x509_crt_set_extension_by_oid.3 gnutls_x509_crt_set_basic_constraints.3 gnutls_x509_crt_set_ca_status.3 gnutls_x509_crt_set_key_usage.3 gnutls_x509_crt_set_subject_alternative_name.3 gnutls_x509_crt_set_proxy.3 gnutls_x509_crt_sign2.3 gnutls_x509_crt_sign.3 gnutls_x509_crt_set_activation_time.3 gnutls_x509_crt_set_expiration_time.3 gnutls_x509_crt_set_serial.3 gnutls_x509_crt_set_crl_dist_points.3 gnutls_x509_crt_cpy_crl_dist_points.3 gnutls_x509_crt_set_subject_key_id.3 gnutls_x509_crt_set_authority_key_id.3 gnutls_x509_crt_set_key_purpose_oid.3 gnutls_x509_crt_to_xml.3 gnutls_openpgp_keyring_init.3 gnutls_openpgp_keyring_deinit.3 gnutls_openpgp_keyring_check_id.3 gnutls_openpgp_keyring_import.3 gnutls_openpgp_trustdb_init.3 gnutls_openpgp_trustdb_deinit.3 gnutls_openpgp_trustdb_import_file.3 gnutls_openpgp_key_init.3 gnutls_openpgp_key_deinit.3 gnutls_openpgp_key_import.3 gnutls_openpgp_key_export.3 gnutls_openpgp_key_get_fingerprint.3 gnutls_openpgp_key_get_name.3 gnutls_openpgp_key_get_pk_algorithm.3 gnutls_openpgp_key_get_version.3 gnutls_openpgp_key_get_creation_time.3 gnutls_openpgp_key_get_expiration_time.3 gnutls_openpgp_key_get_id.3 gnutls_openpgp_key_check_hostname.3 gnutls_openpgp_key_get_key_usage.3 gnutls_openpgp_key_verify_ring.3 gnutls_openpgp_key_verify_self.3 gnutls_openpgp_key_verify_trustdb.3 gnutls_openpgp_privkey_init.3 gnutls_openpgp_privkey_deinit.3 gnutls_openpgp_privkey_import.3 gnutls_openpgp_privkey_get_pk_algorithm.3 gnutls_openpgp_key_to_xml.3
 
 SRPMANS = gnutls_srp_base64_encode.3 gnutls_srp_base64_encode_alloc.3 gnutls_srp_base64_decode.3 gnutls_srp_base64_decode_alloc.3 gnutls_srp_free_client_credentials.3 gnutls_srp_allocate_client_credentials.3 gnutls_srp_set_client_credentials.3 gnutls_srp_free_server_credentials.3 gnutls_srp_allocate_server_credentials.3 gnutls_srp_set_server_credentials_file.3 gnutls_srp_set_server_credentials_function.3 gnutls_srp_set_client_credentials_function.3 gnutls_srp_server_get_username.3 gnutls_srp_verifier.3
 
diff --git a/po/de.po b/po/de.po
index d30467b83e..e00e210254 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnutls 1.4.0\n"
 "Report-Msgid-Bugs-To: bug-gnutls@gnu.org\n"
-"POT-Creation-Date: 2006-05-12 00:21+0200\n"
+"POT-Creation-Date: 2007-10-17 16:00+0200\n"
 "PO-Revision-Date: 2006-12-12 09:37+0100\n"
 "Last-Translator: Michael Piefel <piefel@informatik.hu-berlin.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -42,8 +42,12 @@ msgstr "Ein großes TLS-Datensatzpaket wurde empfangen."
 msgid "A record packet with illegal version was received."
 msgstr "Ein Datensatzpaket mit illegaler Version wurde empfangen."
 
-msgid "The Diffie Hellman prime sent by the server is not acceptable (not long enough)."
-msgstr "Die Diffie-Hellman-Primzahl, die vom Server gesendet wurde, ist nicht akzeptabel (nicht lang genug)."
+msgid ""
+"The Diffie Hellman prime sent by the server is not acceptable (not long "
+"enough)."
+msgstr ""
+"Die Diffie-Hellman-Primzahl, die vom Server gesendet wurde, ist nicht "
+"akzeptabel (nicht lang genug)."
 
 msgid "A TLS packet with unexpected length was received."
 msgstr "Ein TLS-Paket mit unerwarteter Länge wurde empfangen."
@@ -103,7 +107,8 @@ msgid "Public key signing has failed."
 msgstr "Das Signieren mittels öffentlichem Schlüssel schlug fehl."
 
 msgid "Public key signature verification has failed."
-msgstr "Die Verifizierung der Signatur mittels öffentlichem Schlüssel schlug fehl."
+msgstr ""
+"Die Verifizierung der Signatur mittels öffentlichem Schlüssel schlug fehl."
 
 msgid "Decompression of the TLS record packet has failed."
 msgstr "Die Dekomprimierung des TLS-Datensatzpakets schlug fehl."
@@ -115,7 +120,8 @@ msgid "Internal error in memory allocation."
 msgstr "Interner Fehler bei Speicheranfoderung."
 
 msgid "An unimplemented or disabled feature has been requested."
-msgstr "Eine nicht implementierte oder deaktivierte Eigenschaft wurde abgefragt."
+msgstr ""
+"Eine nicht implementierte oder deaktivierte Eigenschaft wurde abgefragt."
 
 msgid "Insufficient credentials for that request."
 msgstr "Unzureichende Berechtigungsnachweise für diese Anfrage."
@@ -150,7 +156,8 @@ msgstr "Fehler in der Pull-Funktion."
 msgid "Error in the push function."
 msgstr "Fehler in der Push-Funktion."
 
-msgid "The upper limit of record packet sequence numbers has been reached. Wow!"
+msgid ""
+"The upper limit of record packet sequence numbers has been reached. Wow!"
 msgstr "Das obere Limit der Datensatzpaketsequenznummern wurde erreicht. Huch!"
 
 msgid "Error in the certificate."
@@ -172,7 +179,9 @@ msgid "Rehandshake was requested by the peer."
 msgstr "Neuer Handshake wurde von der Gegenstelle gefordert."
 
 msgid "TLS Application data were received, while expecting handshake data."
-msgstr "TLS-Anwendungsdaten wurden empfangen, während Handshake-Daten erwartet wurden."
+msgstr ""
+"TLS-Anwendungsdaten wurden empfangen, während Handshake-Daten erwartet "
+"wurden."
 
 msgid "Error in Database backend."
 msgstr "Fehler im Datenbank-Backend."
@@ -233,8 +242,11 @@ msgstr "Zu viele leere Datensatzpakete wurden empfangen."
 msgid "The initialization of GnuTLS-extra has failed."
 msgstr "Die Initialisierung von GnuTLS-extra schlug fehl."
 
-msgid "The GnuTLS library version does not match the GnuTLS-extra library version."
-msgstr "Die Version der GnuTLS-Bibliothek stimmt nicht mit der Version der GnuTLS-extra-Bibliothek überein."
+msgid ""
+"The GnuTLS library version does not match the GnuTLS-extra library version."
+msgstr ""
+"Die Version der GnuTLS-Bibliothek stimmt nicht mit der Version der GnuTLS-"
+"extra-Bibliothek überein."
 
 msgid "The gcrypt library version is too old."
 msgstr "Die Version der Bibliothek gcrypt ist zu alt."
@@ -242,8 +254,12 @@ msgstr "Die Version der Bibliothek gcrypt ist zu alt."
 msgid "The tasn1 library version is too old."
 msgstr "Die Version der Bibliothek tasn1 ist zu alt."
 
-msgid "The specified GnuPG TrustDB version is not supported. TrustDB v4 is supported."
-msgstr "Die angegebene Version von GnuPG-TrustDB wird nicht unterstützt. TrustDB Version 4 wird unterstützt."
+msgid ""
+"The specified GnuPG TrustDB version is not supported. TrustDB v4 is "
+"supported."
+msgstr ""
+"Die angegebene Version von GnuPG-TrustDB wird nicht unterstützt. TrustDB "
+"Version 4 wird unterstützt."
 
 msgid "Error loading the keyring."
 msgstr "Fehler beim Laden des Schlüsselrings."
@@ -304,3 +320,256 @@ msgstr "Empfing eine »TLS/IA Final Phase Finished«-Mitteilung"
 
 msgid "Verifying TLS/IA phase checksum failed"
 msgstr "Verifizierung der TLS/IA-Phasenprüfsumme schlug fehl"
+
+#, c-format
+msgid "\t\t\tPath Length Constraint: %d\n"
+msgstr ""
+
+#, c-format
+msgid "\t\t\tPolicy Language: %s"
+msgstr ""
+
+msgid ""
+"\t\t\tPolicy:\n"
+"\t\t\t\tASCII: "
+msgstr ""
+
+msgid ""
+"\n"
+"\t\t\t\tHexdump: "
+msgstr ""
+
+msgid "\t\t\tDigital signature.\n"
+msgstr ""
+
+msgid "\t\t\tNon repudiation.\n"
+msgstr ""
+
+msgid "\t\t\tKey encipherment.\n"
+msgstr ""
+
+msgid "\t\t\tData encipherment.\n"
+msgstr ""
+
+msgid "\t\t\tKey agreement.\n"
+msgstr ""
+
+msgid "\t\t\tCertificate signing.\n"
+msgstr ""
+
+msgid "\t\t\tCRL signing.\n"
+msgstr ""
+
+msgid "\t\t\tKey encipher only.\n"
+msgstr ""
+
+msgid "\t\t\tKey decipher only.\n"
+msgstr ""
+
+msgid "\t\t\tTLS WWW Server.\n"
+msgstr ""
+
+msgid "\t\t\tTLS WWW Client.\n"
+msgstr ""
+
+msgid "\t\t\tCode signing.\n"
+msgstr ""
+
+msgid "\t\t\tEmail protection.\n"
+msgstr ""
+
+msgid "\t\t\tTime stamping.\n"
+msgstr ""
+
+msgid "\t\t\tOCSP signing.\n"
+msgstr ""
+
+msgid "\t\t\tAny purpose.\n"
+msgstr ""
+
+msgid "\t\t\tCertificate Authority (CA): FALSE\n"
+msgstr ""
+
+msgid "\t\t\tCertificate Authority (CA): TRUE\n"
+msgstr ""
+
+#, c-format
+msgid "\t\t\tXMPP Address: %.*s\n"
+msgstr ""
+
+#, c-format
+msgid "\t\t\totherName OID: %.*s\n"
+msgstr ""
+
+msgid "\t\t\totherName DER: "
+msgstr ""
+
+msgid ""
+"\n"
+"\t\t\totherName ASCII: "
+msgstr ""
+
+#, c-format
+msgid "\tVersion: %d\n"
+msgstr ""
+
+msgid "\tSerial Number (hex): "
+msgstr ""
+
+#, c-format
+msgid "\tIssuer: %s\n"
+msgstr ""
+
+msgid "\tValidity:\n"
+msgstr ""
+
+#, c-format
+msgid "\t\tNot Before: %s\n"
+msgstr ""
+
+#, c-format
+msgid "\t\tNot After: %s\n"
+msgstr ""
+
+#, c-format
+msgid "\tSubject: %s\n"
+msgstr ""
+
+#, c-format
+msgid "\tSubject Public Key Algorithm: %s\n"
+msgstr ""
+
+#, c-format
+msgid "\t\tModulus (bits %d):\n"
+msgstr ""
+
+msgid "\t\tExponent:\n"
+msgstr ""
+
+#, c-format
+msgid "\t\tPublic key (bits %d):\n"
+msgstr ""
+
+msgid "\t\tP:\n"
+msgstr ""
+
+msgid "\t\tQ:\n"
+msgstr ""
+
+msgid "\t\tG:\n"
+msgstr ""
+
+msgid "\tExtensions:\n"
+msgstr ""
+
+#, c-format
+msgid "\t\tBasic Constraints (%s):\n"
+msgstr ""
+
+msgid "critical"
+msgstr ""
+
+msgid "not critical"
+msgstr ""
+
+#, c-format
+msgid "\t\tSubject Key Identifier (%s):\n"
+msgstr ""
+
+#, c-format
+msgid "\t\tAuthority Key Identifier (%s):\n"
+msgstr ""
+
+#, c-format
+msgid "\t\tKey Usage (%s):\n"
+msgstr ""
+
+#, c-format
+msgid "\t\tKey Purpose (%s):\n"
+msgstr ""
+
+#, c-format
+msgid "\t\tSubject Alternative Name (%s):\n"
+msgstr ""
+
+#, c-format
+msgid "\t\tCRL Distribution points (%s):\n"
+msgstr ""
+
+#, c-format
+msgid "\t\tProxy Certificate Information (%s):\n"
+msgstr ""
+
+#, c-format
+msgid "\t\tUnknown extension %s (%s):\n"
+msgstr ""
+
+msgid "\t\t\tASCII: "
+msgstr ""
+
+msgid "\t\t\tHexdump: "
+msgstr ""
+
+#, c-format
+msgid "\tSignature Algorithm: %s\n"
+msgstr ""
+
+msgid ""
+"warning: signed using a broken signature algorithm that can be forged.\n"
+msgstr ""
+
+msgid "\tSignature:\n"
+msgstr ""
+
+msgid ""
+"\tMD5 fingerprint:\n"
+"\t\t"
+msgstr ""
+
+msgid ""
+"\tSHA-1 fingerprint:\n"
+"\t\t"
+msgstr ""
+
+msgid ""
+"\tPublic Key Id:\n"
+"\t\t"
+msgstr ""
+
+msgid "X.509 Certificate Information:\n"
+msgstr ""
+
+msgid "Other Information:\n"
+msgstr ""
+
+msgid "\tVersion: 1 (default)\n"
+msgstr ""
+
+msgid "\tUpdate dates:\n"
+msgstr ""
+
+#, c-format
+msgid "\t\tIssued: %s\n"
+msgstr ""
+
+#, c-format
+msgid "\t\tNext at: %s\n"
+msgstr ""
+
+#, c-format
+msgid "\tRevoked certificates (%d):\n"
+msgstr ""
+
+#, fuzzy
+msgid "\tNo revoked certificates.\n"
+msgstr "Fehler im Zertifikat."
+
+msgid "\t\tSerial Number (hex): "
+msgstr ""
+
+#, c-format
+msgid "\t\tRevoked at: %s\n"
+msgstr ""
+
+msgid "X.509 Certificate Revocation List Information:\n"
+msgstr ""
diff --git a/po/ms.po b/po/ms.po
index f261a0551e..41a19591ac 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnutls 1.4.0\n"
 "Report-Msgid-Bugs-To: bug-gnutls@gnu.org\n"
-"POT-Creation-Date: 2006-05-12 00:21+0200\n"
+"POT-Creation-Date: 2007-10-17 16:00+0200\n"
 "PO-Revision-Date: 2007-06-24 19:29+0800\n"
 "Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n"
 "Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
@@ -42,8 +42,12 @@ msgstr "Paket rekod TLS besar telah diterima."
 msgid "A record packet with illegal version was received."
 msgstr "Paket rekod dengan versi tidak sah telah diterima."
 
-msgid "The Diffie Hellman prime sent by the server is not acceptable (not long enough)."
-msgstr "Perdana Diffie Hellman yang dihantar oleh pelayan tidak boleh diterima (tidak cukup panjang)."
+msgid ""
+"The Diffie Hellman prime sent by the server is not acceptable (not long "
+"enough)."
+msgstr ""
+"Perdana Diffie Hellman yang dihantar oleh pelayan tidak boleh diterima "
+"(tidak cukup panjang)."
 
 msgid "A TLS packet with unexpected length was received."
 msgstr "Paket TLS dengan panjang tidak dijangka telah diterima."
@@ -150,7 +154,8 @@ msgstr "Ralat dalam fungsi tarik."
 msgid "Error in the push function."
 msgstr "Ralat dalam fungsi tolak."
 
-msgid "The upper limit of record packet sequence numbers has been reached. Wow!"
+msgid ""
+"The upper limit of record packet sequence numbers has been reached. Wow!"
 msgstr "Had atas nombor jujukan paket rakaman telah dicapai. Wow!"
 
 msgid "Error in the certificate."
@@ -231,7 +236,8 @@ msgstr "Terlalu banyak paket rekod kosong telah diterima."
 msgid "The initialization of GnuTLS-extra has failed."
 msgstr "Pemulaan GnuTLS-extra telah gagal."
 
-msgid "The GnuTLS library version does not match the GnuTLS-extra library version."
+msgid ""
+"The GnuTLS library version does not match the GnuTLS-extra library version."
 msgstr "Versi pustaka GnuTLS tidak sepadan dengan versi pustaka GnuTLS-extra."
 
 msgid "The gcrypt library version is too old."
@@ -240,8 +246,12 @@ msgstr "Versi pustaka gcrypt terlalu lama."
 msgid "The tasn1 library version is too old."
 msgstr "Versi pustaka tasn1 terlalu lama."
 
-msgid "The specified GnuPG TrustDB version is not supported. TrustDB v4 is supported."
-msgstr "Versi GnuPG TrustDB yang dinyatakan tidak disokong. TrustDB v4 adalah disokong."
+msgid ""
+"The specified GnuPG TrustDB version is not supported. TrustDB v4 is "
+"supported."
+msgstr ""
+"Versi GnuPG TrustDB yang dinyatakan tidak disokong. TrustDB v4 adalah "
+"disokong."
 
 msgid "Error loading the keyring."
 msgstr "Ralat memuatkan cecincin kunci."
@@ -299,3 +309,256 @@ msgstr "Menerima mesej TLS/IA Final Phase Finished"
 
 msgid "Verifying TLS/IA phase checksum failed"
 msgstr "Pengesahan checksum fasa TLS/IA gagal"
+
+#, c-format
+msgid "\t\t\tPath Length Constraint: %d\n"
+msgstr ""
+
+#, c-format
+msgid "\t\t\tPolicy Language: %s"
+msgstr ""
+
+msgid ""
+"\t\t\tPolicy:\n"
+"\t\t\t\tASCII: "
+msgstr ""
+
+msgid ""
+"\n"
+"\t\t\t\tHexdump: "
+msgstr ""
+
+msgid "\t\t\tDigital signature.\n"
+msgstr ""
+
+msgid "\t\t\tNon repudiation.\n"
+msgstr ""
+
+msgid "\t\t\tKey encipherment.\n"
+msgstr ""
+
+msgid "\t\t\tData encipherment.\n"
+msgstr ""
+
+msgid "\t\t\tKey agreement.\n"
+msgstr ""
+
+msgid "\t\t\tCertificate signing.\n"
+msgstr ""
+
+msgid "\t\t\tCRL signing.\n"
+msgstr ""
+
+msgid "\t\t\tKey encipher only.\n"
+msgstr ""
+
+msgid "\t\t\tKey decipher only.\n"
+msgstr ""
+
+msgid "\t\t\tTLS WWW Server.\n"
+msgstr ""
+
+msgid "\t\t\tTLS WWW Client.\n"
+msgstr ""
+
+msgid "\t\t\tCode signing.\n"
+msgstr ""
+
+msgid "\t\t\tEmail protection.\n"
+msgstr ""
+
+msgid "\t\t\tTime stamping.\n"
+msgstr ""
+
+msgid "\t\t\tOCSP signing.\n"
+msgstr ""
+
+msgid "\t\t\tAny purpose.\n"
+msgstr ""
+
+msgid "\t\t\tCertificate Authority (CA): FALSE\n"
+msgstr ""
+
+msgid "\t\t\tCertificate Authority (CA): TRUE\n"
+msgstr ""
+
+#, c-format
+msgid "\t\t\tXMPP Address: %.*s\n"
+msgstr ""
+
+#, c-format
+msgid "\t\t\totherName OID: %.*s\n"
+msgstr ""
+
+msgid "\t\t\totherName DER: "
+msgstr ""
+
+msgid ""
+"\n"
+"\t\t\totherName ASCII: "
+msgstr ""
+
+#, c-format
+msgid "\tVersion: %d\n"
+msgstr ""
+
+msgid "\tSerial Number (hex): "
+msgstr ""
+
+#, c-format
+msgid "\tIssuer: %s\n"
+msgstr ""
+
+msgid "\tValidity:\n"
+msgstr ""
+
+#, c-format
+msgid "\t\tNot Before: %s\n"
+msgstr ""
+
+#, c-format
+msgid "\t\tNot After: %s\n"
+msgstr ""
+
+#, c-format
+msgid "\tSubject: %s\n"
+msgstr ""
+
+#, c-format
+msgid "\tSubject Public Key Algorithm: %s\n"
+msgstr ""
+
+#, c-format
+msgid "\t\tModulus (bits %d):\n"
+msgstr ""
+
+msgid "\t\tExponent:\n"
+msgstr ""
+
+#, c-format
+msgid "\t\tPublic key (bits %d):\n"
+msgstr ""
+
+msgid "\t\tP:\n"
+msgstr ""
+
+msgid "\t\tQ:\n"
+msgstr ""
+
+msgid "\t\tG:\n"
+msgstr ""
+
+msgid "\tExtensions:\n"
+msgstr ""
+
+#, c-format
+msgid "\t\tBasic Constraints (%s):\n"
+msgstr ""
+
+msgid "critical"
+msgstr ""
+
+msgid "not critical"
+msgstr ""
+
+#, c-format
+msgid "\t\tSubject Key Identifier (%s):\n"
+msgstr ""
+
+#, c-format
+msgid "\t\tAuthority Key Identifier (%s):\n"
+msgstr ""
+
+#, c-format
+msgid "\t\tKey Usage (%s):\n"
+msgstr ""
+
+#, c-format
+msgid "\t\tKey Purpose (%s):\n"
+msgstr ""
+
+#, c-format
+msgid "\t\tSubject Alternative Name (%s):\n"
+msgstr ""
+
+#, c-format
+msgid "\t\tCRL Distribution points (%s):\n"
+msgstr ""
+
+#, c-format
+msgid "\t\tProxy Certificate Information (%s):\n"
+msgstr ""
+
+#, c-format
+msgid "\t\tUnknown extension %s (%s):\n"
+msgstr ""
+
+msgid "\t\t\tASCII: "
+msgstr ""
+
+msgid "\t\t\tHexdump: "
+msgstr ""
+
+#, c-format
+msgid "\tSignature Algorithm: %s\n"
+msgstr ""
+
+msgid ""
+"warning: signed using a broken signature algorithm that can be forged.\n"
+msgstr ""
+
+msgid "\tSignature:\n"
+msgstr ""
+
+msgid ""
+"\tMD5 fingerprint:\n"
+"\t\t"
+msgstr ""
+
+msgid ""
+"\tSHA-1 fingerprint:\n"
+"\t\t"
+msgstr ""
+
+msgid ""
+"\tPublic Key Id:\n"
+"\t\t"
+msgstr ""
+
+msgid "X.509 Certificate Information:\n"
+msgstr ""
+
+msgid "Other Information:\n"
+msgstr ""
+
+msgid "\tVersion: 1 (default)\n"
+msgstr ""
+
+msgid "\tUpdate dates:\n"
+msgstr ""
+
+#, c-format
+msgid "\t\tIssued: %s\n"
+msgstr ""
+
+#, c-format
+msgid "\t\tNext at: %s\n"
+msgstr ""
+
+#, c-format
+msgid "\tRevoked certificates (%d):\n"
+msgstr ""
+
+#, fuzzy
+msgid "\tNo revoked certificates.\n"
+msgstr "Ralat dalam sijil."
+
+msgid "\t\tSerial Number (hex): "
+msgstr ""
+
+#, c-format
+msgid "\t\tRevoked at: %s\n"
+msgstr ""
+
+msgid "X.509 Certificate Revocation List Information:\n"
+msgstr ""
diff --git a/src/cli-gaa.c b/src/cli-gaa.c
index 3460050b94..07bb4c4ca9 100644
--- a/src/cli-gaa.c
+++ b/src/cli-gaa.c
@@ -156,8 +156,6 @@ void gaa_help(void)
 	__gaa_helpsingle(0, "srppasswd", "PASSWD ", "SRP password to use.");
 	__gaa_helpsingle(0, "pskusername", "NAME ", "PSK username to use.");
 	__gaa_helpsingle(0, "pskkey", "KEY ", "PSK key (in hex) to use.");
-	__gaa_helpsingle(0, "authz-x509-attr-cert", "FILE ", "Use X.509 Attribute Certificate in FILE as authorization data.");
-	__gaa_helpsingle(0, "authz-saml-assertion", "FILE ", "Use SAML Assertion in FILE as authorization data.");
 	__gaa_helpsingle('p', "port", "PORT ", "The port to connect to.");
 	__gaa_helpsingle(0, "insecure", "", "Don't abort program if server certificate can't be validated.");
 	__gaa_helpsingle('l', "list", "", "Print a list of the supported algorithms and modes.");
@@ -178,16 +176,12 @@ typedef struct _gaainfo gaainfo;
 
 struct _gaainfo
 {
-#line 125 "cli.gaa"
+#line 119 "cli.gaa"
 	char *rest_args;
-#line 116 "cli.gaa"
-	int insecure;
-#line 113 "cli.gaa"
-	char *port;
 #line 110 "cli.gaa"
-	char *authz_saml_assertion;
+	int insecure;
 #line 107 "cli.gaa"
-	char *authz_x509_attr_cert;
+	char *port;
 #line 104 "cli.gaa"
 	char *psk_key;
 #line 101 "cli.gaa"
@@ -312,44 +306,42 @@ static int gaa_error = 0;
 #define GAA_MULTIPLE_OPTION     3
 
 #define GAA_REST                0
-#define GAA_NB_OPTION           37
+#define GAA_NB_OPTION           35
 #define GAAOPTID_copyright	1
 #define GAAOPTID_version	2
 #define GAAOPTID_help	3
 #define GAAOPTID_list	4
 #define GAAOPTID_insecure	5
 #define GAAOPTID_port	6
-#define GAAOPTID_authz_saml_assertion	7
-#define GAAOPTID_authz_x509_attr_cert	8
-#define GAAOPTID_pskkey	9
-#define GAAOPTID_pskusername	10
-#define GAAOPTID_srppasswd	11
-#define GAAOPTID_srpusername	12
-#define GAAOPTID_x509certfile	13
-#define GAAOPTID_x509keyfile	14
-#define GAAOPTID_pgpcertfile	15
-#define GAAOPTID_pgptrustdb	16
-#define GAAOPTID_pgpkeyring	17
-#define GAAOPTID_pgpkeyfile	18
-#define GAAOPTID_x509crlfile	19
-#define GAAOPTID_x509cafile	20
-#define GAAOPTID_ctypes	21
-#define GAAOPTID_kx	22
-#define GAAOPTID_macs	23
-#define GAAOPTID_comp	24
-#define GAAOPTID_protocols	25
-#define GAAOPTID_ciphers	26
-#define GAAOPTID_verbose	27
-#define GAAOPTID_recordsize	28
-#define GAAOPTID_print_cert	29
-#define GAAOPTID_xml	30
-#define GAAOPTID_disable_extensions	31
-#define GAAOPTID_fingerprint	32
-#define GAAOPTID_x509fmtder	33
-#define GAAOPTID_crlf	34
-#define GAAOPTID_starttls	35
-#define GAAOPTID_resume	36
-#define GAAOPTID_debug	37
+#define GAAOPTID_pskkey	7
+#define GAAOPTID_pskusername	8
+#define GAAOPTID_srppasswd	9
+#define GAAOPTID_srpusername	10
+#define GAAOPTID_x509certfile	11
+#define GAAOPTID_x509keyfile	12
+#define GAAOPTID_pgpcertfile	13
+#define GAAOPTID_pgptrustdb	14
+#define GAAOPTID_pgpkeyring	15
+#define GAAOPTID_pgpkeyfile	16
+#define GAAOPTID_x509crlfile	17
+#define GAAOPTID_x509cafile	18
+#define GAAOPTID_ctypes	19
+#define GAAOPTID_kx	20
+#define GAAOPTID_macs	21
+#define GAAOPTID_comp	22
+#define GAAOPTID_protocols	23
+#define GAAOPTID_ciphers	24
+#define GAAOPTID_verbose	25
+#define GAAOPTID_recordsize	26
+#define GAAOPTID_print_cert	27
+#define GAAOPTID_xml	28
+#define GAAOPTID_disable_extensions	29
+#define GAAOPTID_fingerprint	30
+#define GAAOPTID_x509fmtder	31
+#define GAAOPTID_crlf	32
+#define GAAOPTID_starttls	33
+#define GAAOPTID_resume	34
+#define GAAOPTID_debug	35
 
 #line 168 "gaa.skel"
 
@@ -542,18 +534,6 @@ struct GAAOPTION_port
 	int size1;
 };
 
-struct GAAOPTION_authz_saml_assertion 
-{
-	char* arg1;
-	int size1;
-};
-
-struct GAAOPTION_authz_x509_attr_cert 
-{
-	char* arg1;
-	int size1;
-};
-
 struct GAAOPTION_pskkey 
 {
 	char* arg1;
@@ -711,8 +691,6 @@ static int gaa_get_option_num(char *str, int status)
         {
         case GAA_LETTER_OPTION:
 			GAA_CHECK1STR("p", GAAOPTID_port);
-			GAA_CHECK1STR("", GAAOPTID_authz_saml_assertion);
-			GAA_CHECK1STR("", GAAOPTID_authz_x509_attr_cert);
 			GAA_CHECK1STR("", GAAOPTID_pskkey);
 			GAA_CHECK1STR("", GAAOPTID_pskusername);
 			GAA_CHECK1STR("", GAAOPTID_srppasswd);
@@ -759,8 +737,6 @@ static int gaa_get_option_num(char *str, int status)
 			GAA_CHECKSTR("list", GAAOPTID_list);
 			GAA_CHECKSTR("insecure", GAAOPTID_insecure);
 			GAA_CHECKSTR("port", GAAOPTID_port);
-			GAA_CHECKSTR("authz-saml-assertion", GAAOPTID_authz_saml_assertion);
-			GAA_CHECKSTR("authz-x509-attr-cert", GAAOPTID_authz_x509_attr_cert);
 			GAA_CHECKSTR("pskkey", GAAOPTID_pskkey);
 			GAA_CHECKSTR("pskusername", GAAOPTID_pskusername);
 			GAA_CHECKSTR("srppasswd", GAAOPTID_srppasswd);
@@ -803,8 +779,6 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
     int OK = 0;
     int gaa_last_non_option;
 	struct GAAOPTION_port GAATMP_port;
-	struct GAAOPTION_authz_saml_assertion GAATMP_authz_saml_assertion;
-	struct GAAOPTION_authz_x509_attr_cert GAATMP_authz_x509_attr_cert;
 	struct GAAOPTION_pskkey GAATMP_pskkey;
 	struct GAAOPTION_pskusername GAATMP_pskusername;
 	struct GAAOPTION_srppasswd GAATMP_srppasswd;
@@ -847,35 +821,35 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
     {
 	case GAAOPTID_copyright:
 	OK = 0;
-#line 123 "cli.gaa"
+#line 117 "cli.gaa"
 { print_license(); exit(0); ;};
 
 		return GAA_OK;
 		break;
 	case GAAOPTID_version:
 	OK = 0;
-#line 122 "cli.gaa"
+#line 116 "cli.gaa"
 { cli_version(); exit(0); ;};
 
 		return GAA_OK;
 		break;
 	case GAAOPTID_help:
 	OK = 0;
-#line 120 "cli.gaa"
+#line 114 "cli.gaa"
 { gaa_help(); exit(0); ;};
 
 		return GAA_OK;
 		break;
 	case GAAOPTID_list:
 	OK = 0;
-#line 119 "cli.gaa"
+#line 113 "cli.gaa"
 { print_list(gaaval->verbose); exit(0); ;};
 
 		return GAA_OK;
 		break;
 	case GAAOPTID_insecure:
 	OK = 0;
-#line 117 "cli.gaa"
+#line 111 "cli.gaa"
 { gaaval->insecure = 1 ;};
 
 		return GAA_OK;
@@ -885,28 +859,8 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
 		GAA_TESTMOREARGS;
 		GAA_FILL(GAATMP_port.arg1, gaa_getstr, GAATMP_port.size1);
 		gaa_index++;
-#line 114 "cli.gaa"
-{ gaaval->port = GAATMP_port.arg1 ;};
-
-		return GAA_OK;
-		break;
-	case GAAOPTID_authz_saml_assertion:
-	OK = 0;
-		GAA_TESTMOREARGS;
-		GAA_FILL(GAATMP_authz_saml_assertion.arg1, gaa_getstr, GAATMP_authz_saml_assertion.size1);
-		gaa_index++;
-#line 111 "cli.gaa"
-{ gaaval->authz_saml_assertion = GAATMP_authz_saml_assertion.arg1 ;};
-
-		return GAA_OK;
-		break;
-	case GAAOPTID_authz_x509_attr_cert:
-	OK = 0;
-		GAA_TESTMOREARGS;
-		GAA_FILL(GAATMP_authz_x509_attr_cert.arg1, gaa_getstr, GAATMP_authz_x509_attr_cert.size1);
-		gaa_index++;
 #line 108 "cli.gaa"
-{ gaaval->authz_x509_attr_cert = GAATMP_authz_x509_attr_cert.arg1 ;};
+{ gaaval->port = GAATMP_port.arg1 ;};
 
 		return GAA_OK;
 		break;
@@ -1165,7 +1119,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
 		GAA_TESTMOREARGS;
 		GAA_FILL(GAAREST_tmp.arg1, gaa_getstr, GAAREST_tmp.size1);
 		gaa_index++;
-#line 126 "cli.gaa"
+#line 120 "cli.gaa"
 { gaaval->rest_args = GAAREST_tmp.arg1; ;};
 
 		return GAA_OK;
@@ -1194,7 +1148,7 @@ int gaa(int argc, char **argv, gaainfo *gaaval)
     if(inited == 0)
     {
 
-#line 128 "cli.gaa"
+#line 122 "cli.gaa"
 { gaaval->resume=0; gaaval->port="443"; gaaval->rest_args=NULL; gaaval->ciphers=NULL;
 	gaaval->kx=NULL; gaaval->comp=NULL; gaaval->macs=NULL; gaaval->ctype=NULL; gaaval->nciphers=0;
 	gaaval->nkx=0; gaaval->ncomp=0; gaaval->nmacs=0; gaaval->nctype = 0; gaaval->record_size=0; 
diff --git a/src/cli-gaa.h b/src/cli-gaa.h
index b86664e612..012ba4f4aa 100644
--- a/src/cli-gaa.h
+++ b/src/cli-gaa.h
@@ -8,16 +8,12 @@ typedef struct _gaainfo gaainfo;
 
 struct _gaainfo
 {
-#line 125 "cli.gaa"
+#line 119 "cli.gaa"
 	char *rest_args;
-#line 116 "cli.gaa"
-	int insecure;
-#line 113 "cli.gaa"
-	char *port;
 #line 110 "cli.gaa"
-	char *authz_saml_assertion;
+	int insecure;
 #line 107 "cli.gaa"
-	char *authz_x509_attr_cert;
+	char *port;
 #line 104 "cli.gaa"
 	char *psk_key;
 #line 101 "cli.gaa"
diff --git a/src/serv-gaa.c b/src/serv-gaa.c
index 5351f58fdb..e3a87342cf 100644
--- a/src/serv-gaa.c
+++ b/src/serv-gaa.c
@@ -149,8 +149,6 @@ void gaa_help(void)
 	__gaa_helpsingle(0, "pskpasswd", "FILE ", "PSK password file to use.");
 	__gaa_helpsingle(0, "srppasswd", "FILE ", "SRP password file to use.");
 	__gaa_helpsingle(0, "srppasswdconf", "FILE ", "SRP password conf file to use.");
-	__gaa_helpsingle(0, "authz-x509-attr-cert", "FILE ", "Use X.509 Attribute Certificate in FILE as authorization data.");
-	__gaa_helpsingle(0, "authz-saml-assertion", "FILE ", "Use SAML Assertion in FILE as authorization data.");
 	__gaa_helpsingle(0, "ciphers", "cipher1 cipher2... ", "Ciphers to enable.");
 	__gaa_helpsingle(0, "protocols", "protocol1 protocol2... ", "Protocols to enable.");
 	__gaa_helpsingle(0, "comp", "comp1 comp2... ", "Compression methods to enable.");
@@ -175,34 +173,30 @@ typedef struct _gaainfo gaainfo;
 
 struct _gaainfo
 {
-#line 109 "serv.gaa"
+#line 103 "serv.gaa"
 	char **ctype;
-#line 108 "serv.gaa"
+#line 102 "serv.gaa"
 	int nctype;
-#line 105 "serv.gaa"
+#line 99 "serv.gaa"
 	char **kx;
-#line 104 "serv.gaa"
+#line 98 "serv.gaa"
 	int nkx;
-#line 101 "serv.gaa"
+#line 95 "serv.gaa"
 	char **macs;
-#line 100 "serv.gaa"
+#line 94 "serv.gaa"
 	int nmacs;
-#line 97 "serv.gaa"
+#line 91 "serv.gaa"
 	char **comp;
-#line 96 "serv.gaa"
+#line 90 "serv.gaa"
 	int ncomp;
-#line 93 "serv.gaa"
+#line 87 "serv.gaa"
 	char **proto;
-#line 92 "serv.gaa"
+#line 86 "serv.gaa"
 	int nproto;
-#line 89 "serv.gaa"
+#line 83 "serv.gaa"
 	char **ciphers;
-#line 88 "serv.gaa"
-	int nciphers;
-#line 85 "serv.gaa"
-	char *authz_saml_assertion;
 #line 82 "serv.gaa"
-	char *authz_x509_attr_cert;
+	int nciphers;
 #line 79 "serv.gaa"
 	char *srp_passwd_conf;
 #line 76 "serv.gaa"
@@ -303,7 +297,7 @@ static int gaa_error = 0;
 #define GAA_MULTIPLE_OPTION     3
 
 #define GAA_REST                0
-#define GAA_NB_OPTION           36
+#define GAA_NB_OPTION           34
 #define GAAOPTID_copyright	1
 #define GAAOPTID_version	2
 #define GAAOPTID_help	3
@@ -314,32 +308,30 @@ static int gaa_error = 0;
 #define GAAOPTID_comp	8
 #define GAAOPTID_protocols	9
 #define GAAOPTID_ciphers	10
-#define GAAOPTID_authz_saml_assertion	11
-#define GAAOPTID_authz_x509_attr_cert	12
-#define GAAOPTID_srppasswdconf	13
-#define GAAOPTID_srppasswd	14
-#define GAAOPTID_pskpasswd	15
-#define GAAOPTID_disable_client_cert	16
-#define GAAOPTID_require_cert	17
-#define GAAOPTID_x509dsacertfile	18
-#define GAAOPTID_x509dsakeyfile	19
-#define GAAOPTID_x509certfile	20
-#define GAAOPTID_x509keyfile	21
-#define GAAOPTID_pgpcertfile	22
-#define GAAOPTID_pgpkeyfile	23
-#define GAAOPTID_pgptrustdb	24
-#define GAAOPTID_pgpkeyring	25
-#define GAAOPTID_x509crlfile	26
-#define GAAOPTID_x509cafile	27
-#define GAAOPTID_x509fmtder	28
-#define GAAOPTID_dhparams	29
-#define GAAOPTID_echo	30
-#define GAAOPTID_http	31
-#define GAAOPTID_nodb	32
-#define GAAOPTID_quiet	33
-#define GAAOPTID_port	34
-#define GAAOPTID_generate	35
-#define GAAOPTID_debug	36
+#define GAAOPTID_srppasswdconf	11
+#define GAAOPTID_srppasswd	12
+#define GAAOPTID_pskpasswd	13
+#define GAAOPTID_disable_client_cert	14
+#define GAAOPTID_require_cert	15
+#define GAAOPTID_x509dsacertfile	16
+#define GAAOPTID_x509dsakeyfile	17
+#define GAAOPTID_x509certfile	18
+#define GAAOPTID_x509keyfile	19
+#define GAAOPTID_pgpcertfile	20
+#define GAAOPTID_pgpkeyfile	21
+#define GAAOPTID_pgptrustdb	22
+#define GAAOPTID_pgpkeyring	23
+#define GAAOPTID_x509crlfile	24
+#define GAAOPTID_x509cafile	25
+#define GAAOPTID_x509fmtder	26
+#define GAAOPTID_dhparams	27
+#define GAAOPTID_echo	28
+#define GAAOPTID_http	29
+#define GAAOPTID_nodb	30
+#define GAAOPTID_quiet	31
+#define GAAOPTID_port	32
+#define GAAOPTID_generate	33
+#define GAAOPTID_debug	34
 
 #line 168 "gaa.skel"
 
@@ -562,18 +554,6 @@ struct GAAOPTION_ciphers
 	int size1;
 };
 
-struct GAAOPTION_authz_saml_assertion 
-{
-	char* arg1;
-	int size1;
-};
-
-struct GAAOPTION_authz_x509_attr_cert 
-{
-	char* arg1;
-	int size1;
-};
-
 struct GAAOPTION_srppasswdconf 
 {
 	char* arg1;
@@ -705,8 +685,6 @@ static int gaa_get_option_num(char *str, int status)
 			GAA_CHECK1STR("", GAAOPTID_comp);
 			GAA_CHECK1STR("", GAAOPTID_protocols);
 			GAA_CHECK1STR("", GAAOPTID_ciphers);
-			GAA_CHECK1STR("", GAAOPTID_authz_saml_assertion);
-			GAA_CHECK1STR("", GAAOPTID_authz_x509_attr_cert);
 			GAA_CHECK1STR("", GAAOPTID_srppasswdconf);
 			GAA_CHECK1STR("", GAAOPTID_srppasswd);
 			GAA_CHECK1STR("", GAAOPTID_pskpasswd);
@@ -751,8 +729,6 @@ static int gaa_get_option_num(char *str, int status)
 			GAA_CHECKSTR("comp", GAAOPTID_comp);
 			GAA_CHECKSTR("protocols", GAAOPTID_protocols);
 			GAA_CHECKSTR("ciphers", GAAOPTID_ciphers);
-			GAA_CHECKSTR("authz-saml-assertion", GAAOPTID_authz_saml_assertion);
-			GAA_CHECKSTR("authz-x509-attr-cert", GAAOPTID_authz_x509_attr_cert);
 			GAA_CHECKSTR("srppasswdconf", GAAOPTID_srppasswdconf);
 			GAA_CHECKSTR("srppasswd", GAAOPTID_srppasswd);
 			GAA_CHECKSTR("pskpasswd", GAAOPTID_pskpasswd);
@@ -795,8 +771,6 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
 	struct GAAOPTION_comp GAATMP_comp;
 	struct GAAOPTION_protocols GAATMP_protocols;
 	struct GAAOPTION_ciphers GAATMP_ciphers;
-	struct GAAOPTION_authz_saml_assertion GAATMP_authz_saml_assertion;
-	struct GAAOPTION_authz_x509_attr_cert GAATMP_authz_x509_attr_cert;
 	struct GAAOPTION_srppasswdconf GAATMP_srppasswdconf;
 	struct GAAOPTION_srppasswd GAATMP_srppasswd;
 	struct GAAOPTION_pskpasswd GAATMP_pskpasswd;
@@ -835,28 +809,28 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
     {
 	case GAAOPTID_copyright:
 	OK = 0;
-#line 116 "serv.gaa"
+#line 110 "serv.gaa"
 { print_serv_license(); exit(0); ;};
 
 		return GAA_OK;
 		break;
 	case GAAOPTID_version:
 	OK = 0;
-#line 115 "serv.gaa"
+#line 109 "serv.gaa"
 { serv_version(); exit(0); ;};
 
 		return GAA_OK;
 		break;
 	case GAAOPTID_help:
 	OK = 0;
-#line 113 "serv.gaa"
+#line 107 "serv.gaa"
 { gaa_help(); exit(0); ;};
 
 		return GAA_OK;
 		break;
 	case GAAOPTID_list:
 	OK = 0;
-#line 112 "serv.gaa"
+#line 106 "serv.gaa"
 { print_list(0); exit(0); ;};
 
 		return GAA_OK;
@@ -864,7 +838,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
 	case GAAOPTID_ctypes:
 	OK = 0;
 		GAA_LIST_FILL(GAATMP_ctypes.arg1, gaa_getstr, char*, GAATMP_ctypes.size1);
-#line 110 "serv.gaa"
+#line 104 "serv.gaa"
 { gaaval->ctype = GAATMP_ctypes.arg1; gaaval->nctype = GAATMP_ctypes.size1 ;};
 
 		return GAA_OK;
@@ -872,7 +846,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
 	case GAAOPTID_kx:
 	OK = 0;
 		GAA_LIST_FILL(GAATMP_kx.arg1, gaa_getstr, char*, GAATMP_kx.size1);
-#line 106 "serv.gaa"
+#line 100 "serv.gaa"
 { gaaval->kx = GAATMP_kx.arg1; gaaval->nkx = GAATMP_kx.size1 ;};
 
 		return GAA_OK;
@@ -880,7 +854,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
 	case GAAOPTID_macs:
 	OK = 0;
 		GAA_LIST_FILL(GAATMP_macs.arg1, gaa_getstr, char*, GAATMP_macs.size1);
-#line 102 "serv.gaa"
+#line 96 "serv.gaa"
 { gaaval->macs = GAATMP_macs.arg1; gaaval->nmacs = GAATMP_macs.size1 ;};
 
 		return GAA_OK;
@@ -888,7 +862,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
 	case GAAOPTID_comp:
 	OK = 0;
 		GAA_LIST_FILL(GAATMP_comp.arg1, gaa_getstr, char*, GAATMP_comp.size1);
-#line 98 "serv.gaa"
+#line 92 "serv.gaa"
 { gaaval->comp = GAATMP_comp.arg1; gaaval->ncomp = GAATMP_comp.size1 ;};
 
 		return GAA_OK;
@@ -896,7 +870,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
 	case GAAOPTID_protocols:
 	OK = 0;
 		GAA_LIST_FILL(GAATMP_protocols.arg1, gaa_getstr, char*, GAATMP_protocols.size1);
-#line 94 "serv.gaa"
+#line 88 "serv.gaa"
 { gaaval->proto = GAATMP_protocols.arg1; gaaval->nproto = GAATMP_protocols.size1 ;};
 
 		return GAA_OK;
@@ -904,31 +878,11 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
 	case GAAOPTID_ciphers:
 	OK = 0;
 		GAA_LIST_FILL(GAATMP_ciphers.arg1, gaa_getstr, char*, GAATMP_ciphers.size1);
-#line 90 "serv.gaa"
+#line 84 "serv.gaa"
 { gaaval->ciphers = GAATMP_ciphers.arg1; gaaval->nciphers = GAATMP_ciphers.size1 ;};
 
 		return GAA_OK;
 		break;
-	case GAAOPTID_authz_saml_assertion:
-	OK = 0;
-		GAA_TESTMOREARGS;
-		GAA_FILL(GAATMP_authz_saml_assertion.arg1, gaa_getstr, GAATMP_authz_saml_assertion.size1);
-		gaa_index++;
-#line 86 "serv.gaa"
-{ gaaval->authz_saml_assertion = GAATMP_authz_saml_assertion.arg1 ;};
-
-		return GAA_OK;
-		break;
-	case GAAOPTID_authz_x509_attr_cert:
-	OK = 0;
-		GAA_TESTMOREARGS;
-		GAA_FILL(GAATMP_authz_x509_attr_cert.arg1, gaa_getstr, GAATMP_authz_x509_attr_cert.size1);
-		gaa_index++;
-#line 83 "serv.gaa"
-{ gaaval->authz_x509_attr_cert = GAATMP_authz_x509_attr_cert.arg1 ;};
-
-		return GAA_OK;
-		break;
 	case GAAOPTID_srppasswdconf:
 	OK = 0;
 		GAA_TESTMOREARGS;
@@ -1169,7 +1123,7 @@ int gaa(int argc, char **argv, gaainfo *gaaval)
     if(inited == 0)
     {
 
-#line 120 "serv.gaa"
+#line 114 "serv.gaa"
 { gaaval->generate=0; gaaval->port=5556; gaaval->http=0; gaaval->ciphers=NULL;
 	gaaval->kx=NULL; gaaval->comp=NULL; gaaval->macs=NULL; gaaval->ctype=NULL; gaaval->nciphers=0;
 	gaaval->nkx=0; gaaval->ncomp=0; gaaval->nmacs=0; gaaval->nctype = 0; gaaval->nodb = 0;
@@ -1327,7 +1281,7 @@ static int gaa_internal_get_next_str(FILE *file, gaa_str_node *tmp_str, int argc
 
         len++;
         a = fgetc( file);
-        if(a==EOF) return 0; //a = ' ';
+        if(a==EOF) return 0; /* a = ' '; */
     }
 
     len += 1;
diff --git a/src/serv-gaa.h b/src/serv-gaa.h
index 0ad61d96d8..e621b30652 100644
--- a/src/serv-gaa.h
+++ b/src/serv-gaa.h
@@ -8,34 +8,30 @@ typedef struct _gaainfo gaainfo;
 
 struct _gaainfo
 {
-#line 109 "serv.gaa"
+#line 103 "serv.gaa"
 	char **ctype;
-#line 108 "serv.gaa"
+#line 102 "serv.gaa"
 	int nctype;
-#line 105 "serv.gaa"
+#line 99 "serv.gaa"
 	char **kx;
-#line 104 "serv.gaa"
+#line 98 "serv.gaa"
 	int nkx;
-#line 101 "serv.gaa"
+#line 95 "serv.gaa"
 	char **macs;
-#line 100 "serv.gaa"
+#line 94 "serv.gaa"
 	int nmacs;
-#line 97 "serv.gaa"
+#line 91 "serv.gaa"
 	char **comp;
-#line 96 "serv.gaa"
+#line 90 "serv.gaa"
 	int ncomp;
-#line 93 "serv.gaa"
+#line 87 "serv.gaa"
 	char **proto;
-#line 92 "serv.gaa"
+#line 86 "serv.gaa"
 	int nproto;
-#line 89 "serv.gaa"
+#line 83 "serv.gaa"
 	char **ciphers;
-#line 88 "serv.gaa"
-	int nciphers;
-#line 85 "serv.gaa"
-	char *authz_saml_assertion;
 #line 82 "serv.gaa"
-	char *authz_x509_attr_cert;
+	int nciphers;
 #line 79 "serv.gaa"
 	char *srp_passwd_conf;
 #line 76 "serv.gaa"