[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU gnutls branch, master, updated. gnutls_2_99_2-76-gcf20fa0
|
From: |
Nikos Mavrogiannopoulos |
|
Subject: |
[SCM] GNU gnutls branch, master, updated. gnutls_2_99_2-76-gcf20fa0 |
|
Date: |
Sun, 05 Jun 2011 19:09:51 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".
http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=cf20fa0f09c6ba7737b41d6e64764e2f8a607839
The branch, master has been updated
via cf20fa0f09c6ba7737b41d6e64764e2f8a607839 (commit)
via c66f5d4daa8bd81b662486b76a022db118869b5e (commit)
via 9e6e4b8da53d1ccaa62eab6d767bea207bb63051 (commit)
via b29f5e26dad360627d7966efd9e4b76d75d7dfde (commit)
via 50e2778a0b6bc81029ad415fb6e50fa9b3cc9630 (commit)
from 591186874eefa2f277dbd82819df96ae59787e5b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit cf20fa0f09c6ba7737b41d6e64764e2f8a607839
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Sun Jun 5 21:09:46 2011 +0200
Corrected fail() shell function. Reported by Andreas Metzler.
commit c66f5d4daa8bd81b662486b76a022db118869b5e
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Sun Jun 5 21:01:53 2011 +0200
Corrected typo. Reported by Andreas Metzler.
commit 9e6e4b8da53d1ccaa62eab6d767bea207bb63051
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Sun Jun 5 20:56:34 2011 +0200
regenerated makefile.
commit b29f5e26dad360627d7966efd9e4b76d75d7dfde
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Sun Jun 5 20:56:15 2011 +0200
documentation fix.
commit 50e2778a0b6bc81029ad415fb6e50fa9b3cc9630
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Sun Jun 5 20:46:13 2011 +0200
pclmul is not used on intel 32-bit systems.
-----------------------------------------------------------------------
Summary of changes:
doc/manpages/Makefile.am | 162 ++---
lib/accelerated/intel/Makefile.am | 8 +-
lib/accelerated/intel/aes-x86.c | 4 +
lib/accelerated/intel/asm/appro-aes-gcm-x86.s | 989 -------------------------
lib/x509/common.c | 9 +-
tests/dsa/testdsa | 24 +-
tests/openpgp-certs/testcerts | 14 +-
tests/scripts/common.sh | 2 +
tests/suite/testcompat-main | 44 +-
tests/suite/testsrn | 26 +-
10 files changed, 126 insertions(+), 1156 deletions(-)
delete mode 100644 lib/accelerated/intel/asm/appro-aes-gcm-x86.s
diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
index f1f707b..489029e 100644
--- a/doc/manpages/Makefile.am
+++ b/doc/manpages/Makefile.am
@@ -29,6 +29,9 @@ endif
APIMANS =
APIMANS += gnutls_cipher_init.3
+APIMANS += gnutls_cipher_tag.3
+APIMANS += gnutls_cipher_add_auth.3
+APIMANS += gnutls_cipher_set_iv.3
APIMANS += gnutls_cipher_encrypt.3
APIMANS += gnutls_cipher_decrypt.3
APIMANS += gnutls_cipher_encrypt2.3
@@ -46,60 +49,12 @@ APIMANS += gnutls_hash_output.3
APIMANS += gnutls_hash_deinit.3
APIMANS += gnutls_hash_get_len.3
APIMANS += gnutls_hash_fast.3
-APIMANS += gnutls_crypto_single_cipher_register2.3
-APIMANS += gnutls_crypto_rnd_register2.3
-APIMANS += gnutls_crypto_single_mac_register2.3
-APIMANS += gnutls_crypto_single_digest_register2.3
-APIMANS += gnutls_crypto_bigint_register2.3
-APIMANS += gnutls_crypto_pk_register2.3
-APIMANS += gnutls_crypto_cipher_register2.3
-APIMANS += gnutls_crypto_mac_register2.3
-APIMANS += gnutls_crypto_digest_register2.3
-APIMANS += gnutls_record_get_max_size.3
-APIMANS += gnutls_record_set_max_size.3
-APIMANS += gnutls_safe_renegotiation_status.3
-APIMANS += gnutls_server_name_get.3
-APIMANS += gnutls_server_name_set.3
-APIMANS += gnutls_session_ticket_key_generate.3
-APIMANS += gnutls_session_ticket_enable_client.3
-APIMANS += gnutls_session_ticket_enable_server.3
-APIMANS += gnutls_sign_algorithm_get_requested.3
+APIMANS += gnutls_key_generate.3
APIMANS += gnutls_alert_get_name.3
APIMANS += gnutls_alert_send.3
APIMANS += gnutls_error_to_alert.3
APIMANS += gnutls_alert_send_appropriate.3
APIMANS += gnutls_alert_get.3
-APIMANS += gnutls_mac_get_name.3
-APIMANS += gnutls_mac_get_id.3
-APIMANS += gnutls_mac_get_key_size.3
-APIMANS += gnutls_mac_list.3
-APIMANS += gnutls_cipher_get_block_size.3
-APIMANS += gnutls_cipher_get_key_size.3
-APIMANS += gnutls_cipher_get_name.3
-APIMANS += gnutls_cipher_get_id.3
-APIMANS += gnutls_cipher_list.3
-APIMANS += gnutls_kx_get_name.3
-APIMANS += gnutls_kx_get_id.3
-APIMANS += gnutls_kx_list.3
-APIMANS += gnutls_protocol_get_name.3
-APIMANS += gnutls_protocol_get_id.3
-APIMANS += gnutls_protocol_list.3
-APIMANS += gnutls_cipher_suite_get_name.3
-APIMANS += gnutls_cipher_suite_info.3
-APIMANS += gnutls_certificate_type_get_name.3
-APIMANS += gnutls_certificate_type_get_id.3
-APIMANS += gnutls_certificate_type_list.3
-APIMANS += gnutls_sign_algorithm_get_name.3
-APIMANS += gnutls_sign_list.3
-APIMANS += gnutls_sign_get_id.3
-APIMANS += gnutls_sign_get_name.3
-APIMANS += gnutls_pk_algorithm_get_name.3
-APIMANS += gnutls_pk_list.3
-APIMANS += gnutls_pk_get_id.3
-APIMANS += gnutls_pk_get_name.3
-APIMANS += gnutls_sec_param_to_pk_bits.3
-APIMANS += gnutls_sec_param_get_name.3
-APIMANS += gnutls_pk_bits_to_sec_param.3
APIMANS += gnutls_anon_free_server_credentials.3
APIMANS += gnutls_anon_allocate_server_credentials.3
APIMANS += gnutls_anon_free_client_credentials.3
@@ -111,18 +66,10 @@ APIMANS += gnutls_credentials_set.3
APIMANS += gnutls_auth_get_type.3
APIMANS += gnutls_auth_server_get_type.3
APIMANS += gnutls_auth_client_get_type.3
-APIMANS += gnutls_transport_set_errno.3
-APIMANS += gnutls_transport_set_global_errno.3
APIMANS += gnutls_record_check_pending.3
-APIMANS += gnutls_transport_set_pull_function.3
-APIMANS += gnutls_transport_set_push_function.3
-APIMANS += gnutls_transport_set_push_function2.3
-APIMANS += gnutls_transport_set_errno_function.3
APIMANS += gnutls_certificate_free_keys.3
APIMANS += gnutls_certificate_free_cas.3
-APIMANS += gnutls_certificate_get_x509_cas.3
-APIMANS += gnutls_certificate_get_x509_crls.3
-APIMANS += gnutls_certificate_get_openpgp_keyring.3
+APIMANS += gnutls_certificate_get_issuer.3
APIMANS += gnutls_certificate_free_ca_names.3
APIMANS += gnutls_certificate_free_credentials.3
APIMANS += gnutls_certificate_allocate_credentials.3
@@ -130,9 +77,9 @@ APIMANS += gnutls_certificate_server_set_request.3
APIMANS += gnutls_certificate_client_set_retrieve_function.3
APIMANS += gnutls_certificate_server_set_retrieve_function.3
APIMANS += gnutls_certificate_set_retrieve_function.3
+APIMANS += gnutls_certificate_set_retrieve_function2.3
APIMANS += gnutls_certificate_set_verify_function.3
APIMANS += gnutls_certificate_verify_peers2.3
-APIMANS += gnutls_certificate_verify_peers.3
APIMANS += gnutls_certificate_expiration_time_peers.3
APIMANS += gnutls_certificate_activation_time_peers.3
APIMANS += gnutls_sign_callback_set.3
@@ -156,12 +103,20 @@ APIMANS += gnutls_dh_params_generate2.3
APIMANS += gnutls_dh_params_import_pkcs3.3
APIMANS += gnutls_dh_params_export_pkcs3.3
APIMANS += gnutls_dh_params_export_raw.3
+APIMANS += gnutls_dtls_set_timeouts.3
+APIMANS += gnutls_dtls_set_mtu.3
+APIMANS += gnutls_dtls_get_data_mtu.3
+APIMANS += gnutls_dtls_get_mtu.3
+APIMANS += gnutls_dtls_cookie_send.3
+APIMANS += gnutls_dtls_cookie_verify.3
+APIMANS += gnutls_dtls_prestate_set.3
APIMANS += gnutls_error_is_fatal.3
APIMANS += gnutls_perror.3
APIMANS += gnutls_strerror.3
APIMANS += gnutls_strerror_name.3
-APIMANS += gnutls_ext_register.3
APIMANS += gnutls_global_set_log_function.3
+APIMANS += gnutls_global_set_audit_log_function.3
+APIMANS += gnutls_global_set_time_function.3
APIMANS += gnutls_global_set_log_level.3
APIMANS += gnutls_global_set_mem_functions.3
APIMANS += gnutls_global_init.3
@@ -174,6 +129,11 @@ APIMANS += gnutls_handshake_get_last_in.3
APIMANS += gnutls_handshake_get_last_out.3
APIMANS += gnutls_malloc.3
APIMANS += gnutls_free.3
+APIMANS += gnutls_pcert_import_x509.3
+APIMANS += gnutls_pcert_import_x509_raw.3
+APIMANS += gnutls_pcert_import_openpgp.3
+APIMANS += gnutls_pcert_import_openpgp_raw.3
+APIMANS += gnutls_pcert_deinit.3
APIMANS += gnutls_cipher_set_priority.3
APIMANS += gnutls_kx_set_priority.3
APIMANS += gnutls_mac_set_priority.3
@@ -211,19 +171,21 @@ APIMANS += gnutls_hex_decode.3
APIMANS += gnutls_hex_encode.3
APIMANS += gnutls_psk_set_server_dh_params.3
APIMANS += gnutls_psk_set_server_params_function.3
-APIMANS += gnutls_psk_netconf_derive_key.3
APIMANS += gnutls_pubkey_get_pk_algorithm.3
APIMANS += gnutls_pubkey_get_key_usage.3
APIMANS += gnutls_pubkey_init.3
APIMANS += gnutls_pubkey_deinit.3
APIMANS += gnutls_pubkey_import_x509.3
+APIMANS += gnutls_pubkey_import_privkey.3
APIMANS += gnutls_pubkey_get_preferred_hash_algorithm.3
APIMANS += gnutls_pubkey_import_pkcs11.3
APIMANS += gnutls_pubkey_import_openpgp.3
+APIMANS += gnutls_pubkey_get_openpgp_key_id.3
APIMANS += gnutls_pubkey_export.3
APIMANS += gnutls_pubkey_get_key_id.3
APIMANS += gnutls_pubkey_get_pk_rsa_raw.3
APIMANS += gnutls_pubkey_get_pk_dsa_raw.3
+APIMANS += gnutls_pubkey_get_pk_ecc_raw.3
APIMANS += gnutls_pubkey_import.3
APIMANS += gnutls_x509_crt_set_pubkey.3
APIMANS += gnutls_x509_crq_set_pubkey.3
@@ -231,10 +193,11 @@ APIMANS += gnutls_pubkey_set_key_usage.3
APIMANS += gnutls_pubkey_import_pkcs11_url.3
APIMANS += gnutls_pubkey_import_rsa_raw.3
APIMANS += gnutls_pubkey_import_dsa_raw.3
+APIMANS += gnutls_pubkey_verify_data.3
+APIMANS += gnutls_pubkey_verify_data2.3
APIMANS += gnutls_pubkey_verify_hash.3
APIMANS += gnutls_pubkey_get_verify_algorithm.3
APIMANS += gnutls_protocol_get_version.3
-APIMANS += gnutls_transport_set_lowat.3
APIMANS += gnutls_record_disable_padding.3
APIMANS += gnutls_transport_set_ptr.3
APIMANS += gnutls_transport_set_ptr2.3
@@ -243,6 +206,7 @@ APIMANS += gnutls_transport_get_ptr2.3
APIMANS += gnutls_bye.3
APIMANS += gnutls_record_send.3
APIMANS += gnutls_record_recv.3
+APIMANS += gnutls_record_recv_seq.3
APIMANS += gnutls_rsa_params_import_raw.3
APIMANS += gnutls_rsa_params_init.3
APIMANS += gnutls_rsa_params_deinit.3
@@ -267,10 +231,6 @@ APIMANS += gnutls_certificate_send_x509_rdn_sequence.3
APIMANS += gnutls_handshake_set_private_extensions.3
APIMANS += gnutls_prf_raw.3
APIMANS += gnutls_prf.3
-APIMANS += gnutls_session_get_client_random.3
-APIMANS += gnutls_session_get_server_random.3
-APIMANS += gnutls_session_get_master_secret.3
-APIMANS += gnutls_session_set_finished_function.3
APIMANS += gnutls_session_is_resumed.3
APIMANS += gnutls_session_get_ptr.3
APIMANS += gnutls_session_set_ptr.3
@@ -278,6 +238,7 @@ APIMANS += gnutls_record_get_direction.3
APIMANS += gnutls_handshake_set_post_client_hello_function.3
APIMANS += gnutls_session_enable_compatibility_mode.3
APIMANS += gnutls_session_channel_binding.3
+APIMANS += gnutls_ecc_curve_get.3
APIMANS += gnutls_hex2bin.3
APIMANS += gnutls_supplemental_get_name.3
APIMANS += gnutls_dh_set_prime_bits.3
@@ -336,10 +297,7 @@ APIMANS += gnutls_pkcs11_privkey_init.3
APIMANS += gnutls_pkcs11_privkey_deinit.3
APIMANS += gnutls_pkcs11_privkey_get_pk_algorithm.3
APIMANS += gnutls_pkcs11_privkey_get_info.3
-APIMANS += gnutls_pkcs11_privkey_sign_data.3
-APIMANS += gnutls_pkcs11_privkey_sign_hash.3
APIMANS += gnutls_pkcs11_privkey_import_url.3
-APIMANS += gnutls_pkcs11_privkey_decrypt_data.3
APIMANS += gnutls_pkcs11_privkey_export_url.3
APIMANS += gnutls_pkcs11_copy_secret_key.3
APIMANS += gnutls_pkcs11_copy_x509_crt.3
@@ -348,6 +306,12 @@ APIMANS += gnutls_pkcs11_delete_url.3
APIMANS += gnutls_pkcs11_token_init.3
APIMANS += gnutls_pkcs11_token_set_pin.3
APIMANS += gnutls_rnd.3
+APIMANS += gnutls_transport_set_errno.3
+APIMANS += gnutls_transport_set_pull_function.3
+APIMANS += gnutls_transport_set_pull_timeout_function.3
+APIMANS += gnutls_transport_set_push_function.3
+APIMANS += gnutls_transport_set_vec_push_function.3
+APIMANS += gnutls_transport_set_errno_function.3
APIMANS += gnutls_pem_base64_encode.3
APIMANS += gnutls_pem_base64_encode_alloc.3
APIMANS += gnutls_pem_base64_decode.3
@@ -355,26 +319,6 @@ APIMANS += gnutls_pem_base64_decode_alloc.3
APIMANS += gnutls_register_md5_handler.3
APIMANS += gnutls_global_init_extra.3
APIMANS += gnutls_extra_check_version.3
-APIMANS += gnutls_ia_permute_inner_secret.3
-APIMANS += gnutls_ia_generate_challenge.3
-APIMANS += gnutls_ia_extract_inner_secret.3
-APIMANS += gnutls_ia_endphase_send.3
-APIMANS += gnutls_ia_verify_endphase.3
-APIMANS += gnutls_ia_send.3
-APIMANS += gnutls_ia_recv.3
-APIMANS += gnutls_ia_handshake_p.3
-APIMANS += gnutls_ia_handshake.3
-APIMANS += gnutls_ia_allocate_client_credentials.3
-APIMANS += gnutls_ia_free_client_credentials.3
-APIMANS += gnutls_ia_set_client_avp_function.3
-APIMANS += gnutls_ia_set_client_avp_ptr.3
-APIMANS += gnutls_ia_get_client_avp_ptr.3
-APIMANS += gnutls_ia_allocate_server_credentials.3
-APIMANS += gnutls_ia_free_server_credentials.3
-APIMANS += gnutls_ia_set_server_avp_function.3
-APIMANS += gnutls_ia_set_server_avp_ptr.3
-APIMANS += gnutls_ia_get_server_avp_ptr.3
-APIMANS += gnutls_ia_enable.3
APIMANS += gnutls_x509_dn_oid_known.3
APIMANS += gnutls_x509_crl_init.3
APIMANS += gnutls_x509_crl_deinit.3
@@ -389,12 +333,15 @@ APIMANS += gnutls_x509_crl_get_this_update.3
APIMANS += gnutls_x509_crl_get_next_update.3
APIMANS += gnutls_x509_crl_get_crt_count.3
APIMANS += gnutls_x509_crl_get_crt_serial.3
+APIMANS += gnutls_x509_crl_get_raw_issuer_dn.3
APIMANS += gnutls_x509_crl_export.3
APIMANS += gnutls_x509_crl_get_authority_key_id.3
APIMANS += gnutls_x509_crl_get_number.3
APIMANS += gnutls_x509_crl_get_extension_oid.3
APIMANS += gnutls_x509_crl_get_extension_info.3
APIMANS += gnutls_x509_crl_get_extension_data.3
+APIMANS += gnutls_x509_crl_list_import2.3
+APIMANS += gnutls_x509_crl_list_import.3
APIMANS += gnutls_x509_crl_set_version.3
APIMANS += gnutls_x509_crl_sign2.3
APIMANS += gnutls_x509_crl_sign.3
@@ -441,6 +388,7 @@ APIMANS += gnutls_x509_crq_get_key_purpose_oid.3
APIMANS += gnutls_x509_crq_set_key_purpose_oid.3
APIMANS += gnutls_x509_crq_get_key_id.3
APIMANS += gnutls_x509_crq_privkey_sign.3
+APIMANS += gnutls_x509_crq_verify.3
APIMANS += gnutls_x509_dn_init.3
APIMANS += gnutls_x509_dn_import.3
APIMANS += gnutls_x509_dn_deinit.3
@@ -451,14 +399,6 @@ APIMANS += gnutls_x509_dn_export.3
APIMANS += gnutls_x509_crt_print.3
APIMANS += gnutls_x509_crl_print.3
APIMANS += gnutls_x509_crq_print.3
-APIMANS += gnutls_pkcs12_init.3
-APIMANS += gnutls_pkcs12_deinit.3
-APIMANS += gnutls_pkcs12_import.3
-APIMANS += gnutls_pkcs12_export.3
-APIMANS += gnutls_pkcs12_get_bag.3
-APIMANS += gnutls_pkcs12_set_bag.3
-APIMANS += gnutls_pkcs12_generate_mac.3
-APIMANS += gnutls_pkcs12_verify_mac.3
APIMANS += gnutls_pkcs12_bag_init.3
APIMANS += gnutls_pkcs12_bag_deinit.3
APIMANS += gnutls_pkcs12_bag_get_type.3
@@ -473,6 +413,14 @@ APIMANS += gnutls_pkcs12_bag_get_friendly_name.3
APIMANS += gnutls_pkcs12_bag_set_friendly_name.3
APIMANS += gnutls_pkcs12_bag_decrypt.3
APIMANS += gnutls_pkcs12_bag_encrypt.3
+APIMANS += gnutls_pkcs12_init.3
+APIMANS += gnutls_pkcs12_deinit.3
+APIMANS += gnutls_pkcs12_import.3
+APIMANS += gnutls_pkcs12_export.3
+APIMANS += gnutls_pkcs12_get_bag.3
+APIMANS += gnutls_pkcs12_set_bag.3
+APIMANS += gnutls_pkcs12_generate_mac.3
+APIMANS += gnutls_pkcs12_verify_mac.3
APIMANS += gnutls_pkcs7_init.3
APIMANS += gnutls_pkcs7_deinit.3
APIMANS += gnutls_pkcs7_import.3
@@ -494,18 +442,18 @@ APIMANS += gnutls_x509_privkey_import.3
APIMANS += gnutls_x509_privkey_import_rsa_raw.3
APIMANS += gnutls_x509_privkey_import_rsa_raw2.3
APIMANS += gnutls_x509_privkey_import_dsa_raw.3
+APIMANS += gnutls_x509_privkey_import_ecc_raw.3
APIMANS += gnutls_x509_privkey_get_pk_algorithm.3
APIMANS += gnutls_x509_privkey_export.3
APIMANS += gnutls_x509_privkey_sec_param.3
+APIMANS += gnutls_x509_privkey_export_ecc_raw.3
APIMANS += gnutls_x509_privkey_export_rsa_raw.3
APIMANS += gnutls_x509_privkey_export_rsa_raw2.3
APIMANS += gnutls_x509_privkey_export_dsa_raw.3
APIMANS += gnutls_x509_privkey_generate.3
APIMANS += gnutls_x509_privkey_get_key_id.3
-APIMANS += gnutls_x509_privkey_sign_data2.3
APIMANS += gnutls_x509_privkey_sign_hash.3
APIMANS += gnutls_x509_privkey_sign_data.3
-APIMANS += gnutls_x509_privkey_verify_data.3
APIMANS += gnutls_x509_privkey_fix.3
APIMANS += gnutls_x509_privkey_export_pkcs8.3
APIMANS += gnutls_x509_privkey_import_pkcs8.3
@@ -515,6 +463,14 @@ APIMANS += gnutls_x509_crt_list_verify.3
APIMANS += gnutls_x509_crt_verify.3
APIMANS += gnutls_x509_crl_check_issuer.3
APIMANS += gnutls_x509_crl_verify.3
+APIMANS += gnutls_x509_trust_list_init.3
+APIMANS += gnutls_x509_trust_list_deinit.3
+APIMANS += gnutls_x509_trust_list_add_cas.3
+APIMANS += gnutls_x509_trust_list_add_named_crt.3
+APIMANS += gnutls_x509_trust_list_add_crls.3
+APIMANS += gnutls_x509_trust_list_get_issuer.3
+APIMANS += gnutls_x509_trust_list_verify_crt.3
+APIMANS += gnutls_x509_trust_list_verify_named_crt.3
APIMANS += gnutls_x509_crt_init.3
APIMANS += gnutls_x509_crt_deinit.3
APIMANS += gnutls_x509_crt_import.3
@@ -564,6 +520,7 @@ APIMANS += gnutls_x509_crt_get_crl_dist_points.3
APIMANS += gnutls_x509_crt_get_key_purpose_oid.3
APIMANS += gnutls_x509_crt_get_pk_rsa_raw.3
APIMANS += gnutls_x509_crt_get_pk_dsa_raw.3
+APIMANS += gnutls_x509_crt_list_import2.3
APIMANS += gnutls_x509_crt_list_import.3
APIMANS += gnutls_x509_crt_get_subject_unique_id.3
APIMANS += gnutls_x509_crt_get_issuer_unique_id.3
@@ -607,8 +564,6 @@ APIMANS += gnutls_certificate_set_openpgp_key_file2.3
APIMANS += gnutls_certificate_set_openpgp_keyring_file.3
APIMANS += gnutls_certificate_set_openpgp_keyring_mem.3
APIMANS += gnutls_openpgp_set_recv_key_function.3
-APIMANS += gnutls_openpgp_privkey_sign_hash.3
-APIMANS += gnutls_openpgp_privkey_decrypt_data.3
APIMANS += gnutls_openpgp_crt_print.3
APIMANS += gnutls_openpgp_crt_init.3
APIMANS += gnutls_openpgp_crt_deinit.3
@@ -665,12 +620,9 @@ APIMANS += gnutls_openpgp_privkey_export_subkey_rsa_raw.3
APIMANS += gnutls_openpgp_privkey_export_subkey_dsa_raw.3
APIMANS += gnutls_openpgp_privkey_get_preferred_key_id.3
APIMANS += gnutls_openpgp_privkey_set_preferred_key_id.3
+APIMANS += gnutls_openpgp_privkey_sign_hash.3
SRPMANS =
-SRPMANS += gnutls_srp_base64_encode.3
-SRPMANS += gnutls_srp_base64_encode_alloc.3
-SRPMANS += gnutls_srp_base64_decode.3
-SRPMANS += gnutls_srp_base64_decode_alloc.3
SRPMANS += gnutls_srp_free_client_credentials.3
SRPMANS += gnutls_srp_allocate_client_credentials.3
SRPMANS += gnutls_srp_set_client_credentials.3
diff --git a/lib/accelerated/intel/Makefile.am
b/lib/accelerated/intel/Makefile.am
index c0d380e..bfca1a7 100644
--- a/lib/accelerated/intel/Makefile.am
+++ b/lib/accelerated/intel/Makefile.am
@@ -37,12 +37,12 @@ EXTRA_DIST = aes-x86.h README license.txt
noinst_LTLIBRARIES = libintel.la
-libintel_la_SOURCES = aes-x86.c aes-gcm-x86.c
-libintel_la_LIBADD =
+libintel_la_SOURCES = aes-x86.c
if ASM_X86_64
-libintel_la_SOURCES += asm/appro-aes-x86-64.s asm/appro-aes-gcm-x86-64.s
+AM_CPPFLAGS += -DASM_X86_64
+libintel_la_SOURCES += asm/appro-aes-x86-64.s asm/appro-aes-gcm-x86-64.s
aes-gcm-x86.c
else
-libintel_la_SOURCES += asm/appro-aes-x86.s asm/appro-aes-gcm-x86.s
+libintel_la_SOURCES += asm/appro-aes-x86.s
endif
diff --git a/lib/accelerated/intel/aes-x86.c b/lib/accelerated/intel/aes-x86.c
index 8bb6a5e..53b3bde 100644
--- a/lib/accelerated/intel/aes-x86.c
+++ b/lib/accelerated/intel/aes-x86.c
@@ -133,6 +133,7 @@ check_optimized_aes (void)
return (c & 0x2000000);
}
+#ifdef ASM_X86_64
static unsigned
check_pclmul (void)
{
@@ -141,6 +142,7 @@ check_pclmul (void)
return (c & 0x2);
}
+#endif
static unsigned
check_intel_or_amd (void)
@@ -195,6 +197,7 @@ register_x86_crypto (void)
gnutls_assert ();
}
+#ifdef ASM_X86_64
if (check_pclmul ())
{
/* register GCM ciphers */
@@ -218,6 +221,7 @@ register_x86_crypto (void)
if (ret >= 0)
_gnutls_priority_prefer_aes_gcm();
}
+#endif
}
return;
diff --git a/lib/accelerated/intel/asm/appro-aes-gcm-x86.s
b/lib/accelerated/intel/asm/appro-aes-gcm-x86.s
deleted file mode 100644
index c553c5b..0000000
--- a/lib/accelerated/intel/asm/appro-aes-gcm-x86.s
+++ /dev/null
@@ -1,989 +0,0 @@
-# Copyright (c) 2011, Andy Polyakov by <address@hidden>
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# * Redistributions of source code must retain copyright notices,
-# this list of conditions and the following disclaimer.
-#
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials
-# provided with the distribution.
-#
-# * Neither the name of the Andy Polyakov nor the names of its
-# copyright holder and contributors may be used to endorse or
-# promote products derived from this software without specific
-# prior written permission.
-#
-# ALTERNATIVELY, provided that this notice is retained in full, this
-# product may be distributed under the terms of the GNU General Public
-# License (GPL), in which case the provisions of the GPL apply INSTEAD OF
-# those given above.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-.file "ghash-x86.s"
-.text
-.globl gcm_gmult_4bit_x86
-.type gcm_gmult_4bit_x86,@function
-.align 16
-gcm_gmult_4bit_x86:
-.L_gcm_gmult_4bit_x86_begin:
- pushl %ebp
- pushl %ebx
- pushl %esi
- pushl %edi
- subl $84,%esp
- movl 104(%esp),%edi
- movl 108(%esp),%esi
- movl (%edi),%ebp
- movl 4(%edi),%edx
- movl 8(%edi),%ecx
- movl 12(%edi),%ebx
- movl $0,16(%esp)
- movl $471859200,20(%esp)
- movl $943718400,24(%esp)
- movl $610271232,28(%esp)
- movl $1887436800,32(%esp)
- movl $1822425088,36(%esp)
- movl $1220542464,40(%esp)
- movl $1423966208,44(%esp)
- movl $3774873600,48(%esp)
- movl $4246732800,52(%esp)
- movl $3644850176,56(%esp)
- movl $3311403008,60(%esp)
- movl $2441084928,64(%esp)
- movl $2376073216,68(%esp)
- movl $2847932416,72(%esp)
- movl $3051356160,76(%esp)
- movl %ebp,(%esp)
- movl %edx,4(%esp)
- movl %ecx,8(%esp)
- movl %ebx,12(%esp)
- shrl $20,%ebx
- andl $240,%ebx
- movl 4(%esi,%ebx,1),%ebp
- movl (%esi,%ebx,1),%edx
- movl 12(%esi,%ebx,1),%ecx
- movl 8(%esi,%ebx,1),%ebx
- xorl %eax,%eax
- movl $15,%edi
- jmp .L000x86_loop
-.align 16
-.L000x86_loop:
- movb %bl,%al
- shrdl $4,%ecx,%ebx
- andb $15,%al
- shrdl $4,%edx,%ecx
- shrdl $4,%ebp,%edx
- shrl $4,%ebp
- xorl 16(%esp,%eax,4),%ebp
- movb (%esp,%edi,1),%al
- andb $240,%al
- xorl 8(%esi,%eax,1),%ebx
- xorl 12(%esi,%eax,1),%ecx
- xorl (%esi,%eax,1),%edx
- xorl 4(%esi,%eax,1),%ebp
- decl %edi
- js .L001x86_break
- movb %bl,%al
- shrdl $4,%ecx,%ebx
- andb $15,%al
- shrdl $4,%edx,%ecx
- shrdl $4,%ebp,%edx
- shrl $4,%ebp
- xorl 16(%esp,%eax,4),%ebp
- movb (%esp,%edi,1),%al
- shlb $4,%al
- xorl 8(%esi,%eax,1),%ebx
- xorl 12(%esi,%eax,1),%ecx
- xorl (%esi,%eax,1),%edx
- xorl 4(%esi,%eax,1),%ebp
- jmp .L000x86_loop
-.align 16
-.L001x86_break:
- bswap %ebx
- bswap %ecx
- bswap %edx
- bswap %ebp
- movl 104(%esp),%edi
- movl %ebx,12(%edi)
- movl %ecx,8(%edi)
- movl %edx,4(%edi)
- movl %ebp,(%edi)
- addl $84,%esp
- popl %edi
- popl %esi
- popl %ebx
- popl %ebp
- ret
-.size gcm_gmult_4bit_x86,.-.L_gcm_gmult_4bit_x86_begin
-.globl gcm_ghash_4bit_x86
-.type gcm_ghash_4bit_x86,@function
-.align 16
-gcm_ghash_4bit_x86:
-.L_gcm_ghash_4bit_x86_begin:
- pushl %ebp
- pushl %ebx
- pushl %esi
- pushl %edi
- subl $84,%esp
- movl 104(%esp),%ebx
- movl 108(%esp),%esi
- movl 112(%esp),%edi
- movl 116(%esp),%ecx
- addl %edi,%ecx
- movl %ecx,116(%esp)
- movl (%ebx),%ebp
- movl 4(%ebx),%edx
- movl 8(%ebx),%ecx
- movl 12(%ebx),%ebx
- movl $0,16(%esp)
- movl $471859200,20(%esp)
- movl $943718400,24(%esp)
- movl $610271232,28(%esp)
- movl $1887436800,32(%esp)
- movl $1822425088,36(%esp)
- movl $1220542464,40(%esp)
- movl $1423966208,44(%esp)
- movl $3774873600,48(%esp)
- movl $4246732800,52(%esp)
- movl $3644850176,56(%esp)
- movl $3311403008,60(%esp)
- movl $2441084928,64(%esp)
- movl $2376073216,68(%esp)
- movl $2847932416,72(%esp)
- movl $3051356160,76(%esp)
-.align 16
-.L002x86_outer_loop:
- xorl 12(%edi),%ebx
- xorl 8(%edi),%ecx
- xorl 4(%edi),%edx
- xorl (%edi),%ebp
- movl %ebx,12(%esp)
- movl %ecx,8(%esp)
- movl %edx,4(%esp)
- movl %ebp,(%esp)
- shrl $20,%ebx
- andl $240,%ebx
- movl 4(%esi,%ebx,1),%ebp
- movl (%esi,%ebx,1),%edx
- movl 12(%esi,%ebx,1),%ecx
- movl 8(%esi,%ebx,1),%ebx
- xorl %eax,%eax
- movl $15,%edi
- jmp .L003x86_loop
-.align 16
-.L003x86_loop:
- movb %bl,%al
- shrdl $4,%ecx,%ebx
- andb $15,%al
- shrdl $4,%edx,%ecx
- shrdl $4,%ebp,%edx
- shrl $4,%ebp
- xorl 16(%esp,%eax,4),%ebp
- movb (%esp,%edi,1),%al
- andb $240,%al
- xorl 8(%esi,%eax,1),%ebx
- xorl 12(%esi,%eax,1),%ecx
- xorl (%esi,%eax,1),%edx
- xorl 4(%esi,%eax,1),%ebp
- decl %edi
- js .L004x86_break
- movb %bl,%al
- shrdl $4,%ecx,%ebx
- andb $15,%al
- shrdl $4,%edx,%ecx
- shrdl $4,%ebp,%edx
- shrl $4,%ebp
- xorl 16(%esp,%eax,4),%ebp
- movb (%esp,%edi,1),%al
- shlb $4,%al
- xorl 8(%esi,%eax,1),%ebx
- xorl 12(%esi,%eax,1),%ecx
- xorl (%esi,%eax,1),%edx
- xorl 4(%esi,%eax,1),%ebp
- jmp .L003x86_loop
-.align 16
-.L004x86_break:
- bswap %ebx
- bswap %ecx
- bswap %edx
- bswap %ebp
- movl 112(%esp),%edi
- leal 16(%edi),%edi
- cmpl 116(%esp),%edi
- movl %edi,112(%esp)
- jb .L002x86_outer_loop
- movl 104(%esp),%edi
- movl %ebx,12(%edi)
- movl %ecx,8(%edi)
- movl %edx,4(%edi)
- movl %ebp,(%edi)
- addl $84,%esp
- popl %edi
- popl %esi
- popl %ebx
- popl %ebp
- ret
-.size gcm_ghash_4bit_x86,.-.L_gcm_ghash_4bit_x86_begin
-.globl gcm_gmult_4bit_mmx
-.type gcm_gmult_4bit_mmx,@function
-.align 16
-gcm_gmult_4bit_mmx:
-.L_gcm_gmult_4bit_mmx_begin:
- pushl %ebp
- pushl %ebx
- pushl %esi
- pushl %edi
- movl 20(%esp),%edi
- movl 24(%esp),%esi
- call .L005pic_point
-.L005pic_point:
- popl %eax
- leal .Lrem_4bit-.L005pic_point(%eax),%eax
- movzbl 15(%edi),%ebx
- xorl %ecx,%ecx
- movl %ebx,%edx
- movb %dl,%cl
- movl $14,%ebp
- shlb $4,%cl
- andl $240,%edx
- movq 8(%esi,%ecx,1),%mm0
- movq (%esi,%ecx,1),%mm1
- movd %mm0,%ebx
- jmp .L006mmx_loop
-.align 16
-.L006mmx_loop:
- psrlq $4,%mm0
- andl $15,%ebx
- movq %mm1,%mm2
- psrlq $4,%mm1
- pxor 8(%esi,%edx,1),%mm0
- movb (%edi,%ebp,1),%cl
- psllq $60,%mm2
- pxor (%eax,%ebx,8),%mm1
- decl %ebp
- movd %mm0,%ebx
- pxor (%esi,%edx,1),%mm1
- movl %ecx,%edx
- pxor %mm2,%mm0
- js .L007mmx_break
- shlb $4,%cl
- andl $15,%ebx
- psrlq $4,%mm0
- andl $240,%edx
- movq %mm1,%mm2
- psrlq $4,%mm1
- pxor 8(%esi,%ecx,1),%mm0
- psllq $60,%mm2
- pxor (%eax,%ebx,8),%mm1
- movd %mm0,%ebx
- pxor (%esi,%ecx,1),%mm1
- pxor %mm2,%mm0
- jmp .L006mmx_loop
-.align 16
-.L007mmx_break:
- shlb $4,%cl
- andl $15,%ebx
- psrlq $4,%mm0
- andl $240,%edx
- movq %mm1,%mm2
- psrlq $4,%mm1
- pxor 8(%esi,%ecx,1),%mm0
- psllq $60,%mm2
- pxor (%eax,%ebx,8),%mm1
- movd %mm0,%ebx
- pxor (%esi,%ecx,1),%mm1
- pxor %mm2,%mm0
- psrlq $4,%mm0
- andl $15,%ebx
- movq %mm1,%mm2
- psrlq $4,%mm1
- pxor 8(%esi,%edx,1),%mm0
- psllq $60,%mm2
- pxor (%eax,%ebx,8),%mm1
- movd %mm0,%ebx
- pxor (%esi,%edx,1),%mm1
- pxor %mm2,%mm0
- psrlq $32,%mm0
- movd %mm1,%edx
- psrlq $32,%mm1
- movd %mm0,%ecx
- movd %mm1,%ebp
- bswap %ebx
- bswap %edx
- bswap %ecx
- bswap %ebp
- emms
- movl %ebx,12(%edi)
- movl %edx,4(%edi)
- movl %ecx,8(%edi)
- movl %ebp,(%edi)
- popl %edi
- popl %esi
- popl %ebx
- popl %ebp
- ret
-.size gcm_gmult_4bit_mmx,.-.L_gcm_gmult_4bit_mmx_begin
-.globl gcm_ghash_4bit_mmx
-.type gcm_ghash_4bit_mmx,@function
-.align 16
-gcm_ghash_4bit_mmx:
-.L_gcm_ghash_4bit_mmx_begin:
- pushl %ebp
- pushl %ebx
- pushl %esi
- pushl %edi
- movl 20(%esp),%eax
- movl 24(%esp),%ebx
- movl 28(%esp),%ecx
- movl 32(%esp),%edx
- movl %esp,%ebp
- call .L008pic_point
-.L008pic_point:
- popl %esi
- leal .Lrem_8bit-.L008pic_point(%esi),%esi
- subl $544,%esp
- andl $-64,%esp
- subl $16,%esp
- addl %ecx,%edx
- movl %eax,544(%esp)
- movl %edx,552(%esp)
- movl %ebp,556(%esp)
- addl $128,%ebx
- leal 144(%esp),%edi
- leal 400(%esp),%ebp
- movl -120(%ebx),%edx
- movq -120(%ebx),%mm0
- movq -128(%ebx),%mm3
- shll $4,%edx
- movb %dl,(%esp)
- movl -104(%ebx),%edx
- movq -104(%ebx),%mm2
- movq -112(%ebx),%mm5
- movq %mm0,-128(%edi)
- psrlq $4,%mm0
- movq %mm3,(%edi)
- movq %mm3,%mm7
- psrlq $4,%mm3
- shll $4,%edx
- movb %dl,1(%esp)
- movl -88(%ebx),%edx
- movq -88(%ebx),%mm1
- psllq $60,%mm7
- movq -96(%ebx),%mm4
- por %mm7,%mm0
- movq %mm2,-120(%edi)
- psrlq $4,%mm2
- movq %mm5,8(%edi)
- movq %mm5,%mm6
- movq %mm0,-128(%ebp)
- psrlq $4,%mm5
- movq %mm3,(%ebp)
- shll $4,%edx
- movb %dl,2(%esp)
- movl -72(%ebx),%edx
- movq -72(%ebx),%mm0
- psllq $60,%mm6
- movq -80(%ebx),%mm3
- por %mm6,%mm2
- movq %mm1,-112(%edi)
- psrlq $4,%mm1
- movq %mm4,16(%edi)
- movq %mm4,%mm7
- movq %mm2,-120(%ebp)
- psrlq $4,%mm4
- movq %mm5,8(%ebp)
- shll $4,%edx
- movb %dl,3(%esp)
- movl -56(%ebx),%edx
- movq -56(%ebx),%mm2
- psllq $60,%mm7
- movq -64(%ebx),%mm5
- por %mm7,%mm1
- movq %mm0,-104(%edi)
- psrlq $4,%mm0
- movq %mm3,24(%edi)
- movq %mm3,%mm6
- movq %mm1,-112(%ebp)
- psrlq $4,%mm3
- movq %mm4,16(%ebp)
- shll $4,%edx
- movb %dl,4(%esp)
- movl -40(%ebx),%edx
- movq -40(%ebx),%mm1
- psllq $60,%mm6
- movq -48(%ebx),%mm4
- por %mm6,%mm0
- movq %mm2,-96(%edi)
- psrlq $4,%mm2
- movq %mm5,32(%edi)
- movq %mm5,%mm7
- movq %mm0,-104(%ebp)
- psrlq $4,%mm5
- movq %mm3,24(%ebp)
- shll $4,%edx
- movb %dl,5(%esp)
- movl -24(%ebx),%edx
- movq -24(%ebx),%mm0
- psllq $60,%mm7
- movq -32(%ebx),%mm3
- por %mm7,%mm2
- movq %mm1,-88(%edi)
- psrlq $4,%mm1
- movq %mm4,40(%edi)
- movq %mm4,%mm6
- movq %mm2,-96(%ebp)
- psrlq $4,%mm4
- movq %mm5,32(%ebp)
- shll $4,%edx
- movb %dl,6(%esp)
- movl -8(%ebx),%edx
- movq -8(%ebx),%mm2
- psllq $60,%mm6
- movq -16(%ebx),%mm5
- por %mm6,%mm1
- movq %mm0,-80(%edi)
- psrlq $4,%mm0
- movq %mm3,48(%edi)
- movq %mm3,%mm7
- movq %mm1,-88(%ebp)
- psrlq $4,%mm3
- movq %mm4,40(%ebp)
- shll $4,%edx
- movb %dl,7(%esp)
- movl 8(%ebx),%edx
- movq 8(%ebx),%mm1
- psllq $60,%mm7
- movq (%ebx),%mm4
- por %mm7,%mm0
- movq %mm2,-72(%edi)
- psrlq $4,%mm2
- movq %mm5,56(%edi)
- movq %mm5,%mm6
- movq %mm0,-80(%ebp)
- psrlq $4,%mm5
- movq %mm3,48(%ebp)
- shll $4,%edx
- movb %dl,8(%esp)
- movl 24(%ebx),%edx
- movq 24(%ebx),%mm0
- psllq $60,%mm6
- movq 16(%ebx),%mm3
- por %mm6,%mm2
- movq %mm1,-64(%edi)
- psrlq $4,%mm1
- movq %mm4,64(%edi)
- movq %mm4,%mm7
- movq %mm2,-72(%ebp)
- psrlq $4,%mm4
- movq %mm5,56(%ebp)
- shll $4,%edx
- movb %dl,9(%esp)
- movl 40(%ebx),%edx
- movq 40(%ebx),%mm2
- psllq $60,%mm7
- movq 32(%ebx),%mm5
- por %mm7,%mm1
- movq %mm0,-56(%edi)
- psrlq $4,%mm0
- movq %mm3,72(%edi)
- movq %mm3,%mm6
- movq %mm1,-64(%ebp)
- psrlq $4,%mm3
- movq %mm4,64(%ebp)
- shll $4,%edx
- movb %dl,10(%esp)
- movl 56(%ebx),%edx
- movq 56(%ebx),%mm1
- psllq $60,%mm6
- movq 48(%ebx),%mm4
- por %mm6,%mm0
- movq %mm2,-48(%edi)
- psrlq $4,%mm2
- movq %mm5,80(%edi)
- movq %mm5,%mm7
- movq %mm0,-56(%ebp)
- psrlq $4,%mm5
- movq %mm3,72(%ebp)
- shll $4,%edx
- movb %dl,11(%esp)
- movl 72(%ebx),%edx
- movq 72(%ebx),%mm0
- psllq $60,%mm7
- movq 64(%ebx),%mm3
- por %mm7,%mm2
- movq %mm1,-40(%edi)
- psrlq $4,%mm1
- movq %mm4,88(%edi)
- movq %mm4,%mm6
- movq %mm2,-48(%ebp)
- psrlq $4,%mm4
- movq %mm5,80(%ebp)
- shll $4,%edx
- movb %dl,12(%esp)
- movl 88(%ebx),%edx
- movq 88(%ebx),%mm2
- psllq $60,%mm6
- movq 80(%ebx),%mm5
- por %mm6,%mm1
- movq %mm0,-32(%edi)
- psrlq $4,%mm0
- movq %mm3,96(%edi)
- movq %mm3,%mm7
- movq %mm1,-40(%ebp)
- psrlq $4,%mm3
- movq %mm4,88(%ebp)
- shll $4,%edx
- movb %dl,13(%esp)
- movl 104(%ebx),%edx
- movq 104(%ebx),%mm1
- psllq $60,%mm7
- movq 96(%ebx),%mm4
- por %mm7,%mm0
- movq %mm2,-24(%edi)
- psrlq $4,%mm2
- movq %mm5,104(%edi)
- movq %mm5,%mm6
- movq %mm0,-32(%ebp)
- psrlq $4,%mm5
- movq %mm3,96(%ebp)
- shll $4,%edx
- movb %dl,14(%esp)
- movl 120(%ebx),%edx
- movq 120(%ebx),%mm0
- psllq $60,%mm6
- movq 112(%ebx),%mm3
- por %mm6,%mm2
- movq %mm1,-16(%edi)
- psrlq $4,%mm1
- movq %mm4,112(%edi)
- movq %mm4,%mm7
- movq %mm2,-24(%ebp)
- psrlq $4,%mm4
- movq %mm5,104(%ebp)
- shll $4,%edx
- movb %dl,15(%esp)
- psllq $60,%mm7
- por %mm7,%mm1
- movq %mm0,-8(%edi)
- psrlq $4,%mm0
- movq %mm3,120(%edi)
- movq %mm3,%mm6
- movq %mm1,-16(%ebp)
- psrlq $4,%mm3
- movq %mm4,112(%ebp)
- psllq $60,%mm6
- por %mm6,%mm0
- movq %mm0,-8(%ebp)
- movq %mm3,120(%ebp)
- movq (%eax),%mm6
- movl 8(%eax),%ebx
- movl 12(%eax),%edx
-.align 16
-.L009outer:
- xorl 12(%ecx),%edx
- xorl 8(%ecx),%ebx
- pxor (%ecx),%mm6
- leal 16(%ecx),%ecx
- movl %ebx,536(%esp)
- movq %mm6,528(%esp)
- movl %ecx,548(%esp)
- xorl %eax,%eax
- roll $8,%edx
- movb %dl,%al
- movl %eax,%ebp
- andb $15,%al
- shrl $4,%ebp
- pxor %mm0,%mm0
- roll $8,%edx
- pxor %mm1,%mm1
- pxor %mm2,%mm2
- movq 16(%esp,%eax,8),%mm7
- movq 144(%esp,%eax,8),%mm6
- movb %dl,%al
- movd %mm7,%ebx
- psrlq $8,%mm7
- movq %mm6,%mm3
- movl %eax,%edi
- psrlq $8,%mm6
- pxor 272(%esp,%ebp,8),%mm7
- andb $15,%al
- psllq $56,%mm3
- shrl $4,%edi
- pxor 16(%esp,%eax,8),%mm7
- roll $8,%edx
- pxor 144(%esp,%eax,8),%mm6
- pxor %mm3,%mm7
- pxor 400(%esp,%ebp,8),%mm6
- xorb (%esp,%ebp,1),%bl
- movb %dl,%al
- movd %mm7,%ecx
- movzbl %bl,%ebx
- psrlq $8,%mm7
- movq %mm6,%mm3
- movl %eax,%ebp
- psrlq $8,%mm6
- pxor 272(%esp,%edi,8),%mm7
- andb $15,%al
- psllq $56,%mm3
- shrl $4,%ebp
- pinsrw $2,(%esi,%ebx,2),%mm2
- pxor 16(%esp,%eax,8),%mm7
- roll $8,%edx
- pxor 144(%esp,%eax,8),%mm6
- pxor %mm3,%mm7
- pxor 400(%esp,%edi,8),%mm6
- xorb (%esp,%edi,1),%cl
- movb %dl,%al
- movl 536(%esp),%edx
- movd %mm7,%ebx
- movzbl %cl,%ecx
- psrlq $8,%mm7
- movq %mm6,%mm3
- movl %eax,%edi
- psrlq $8,%mm6
- pxor 272(%esp,%ebp,8),%mm7
- andb $15,%al
- psllq $56,%mm3
- pxor %mm2,%mm6
- shrl $4,%edi
- pinsrw $2,(%esi,%ecx,2),%mm1
- pxor 16(%esp,%eax,8),%mm7
- roll $8,%edx
- pxor 144(%esp,%eax,8),%mm6
- pxor %mm3,%mm7
- pxor 400(%esp,%ebp,8),%mm6
- xorb (%esp,%ebp,1),%bl
- movb %dl,%al
- movd %mm7,%ecx
- movzbl %bl,%ebx
- psrlq $8,%mm7
- movq %mm6,%mm3
- movl %eax,%ebp
- psrlq $8,%mm6
- pxor 272(%esp,%edi,8),%mm7
- andb $15,%al
- psllq $56,%mm3
- pxor %mm1,%mm6
- shrl $4,%ebp
- pinsrw $2,(%esi,%ebx,2),%mm0
- pxor 16(%esp,%eax,8),%mm7
- roll $8,%edx
- pxor 144(%esp,%eax,8),%mm6
- pxor %mm3,%mm7
- pxor 400(%esp,%edi,8),%mm6
- xorb (%esp,%edi,1),%cl
- movb %dl,%al
- movd %mm7,%ebx
- movzbl %cl,%ecx
- psrlq $8,%mm7
- movq %mm6,%mm3
- movl %eax,%edi
- psrlq $8,%mm6
- pxor 272(%esp,%ebp,8),%mm7
- andb $15,%al
- psllq $56,%mm3
- pxor %mm0,%mm6
- shrl $4,%edi
- pinsrw $2,(%esi,%ecx,2),%mm2
- pxor 16(%esp,%eax,8),%mm7
- roll $8,%edx
- pxor 144(%esp,%eax,8),%mm6
- pxor %mm3,%mm7
- pxor 400(%esp,%ebp,8),%mm6
- xorb (%esp,%ebp,1),%bl
- movb %dl,%al
- movd %mm7,%ecx
- movzbl %bl,%ebx
- psrlq $8,%mm7
- movq %mm6,%mm3
- movl %eax,%ebp
- psrlq $8,%mm6
- pxor 272(%esp,%edi,8),%mm7
- andb $15,%al
- psllq $56,%mm3
- pxor %mm2,%mm6
- shrl $4,%ebp
- pinsrw $2,(%esi,%ebx,2),%mm1
- pxor 16(%esp,%eax,8),%mm7
- roll $8,%edx
- pxor 144(%esp,%eax,8),%mm6
- pxor %mm3,%mm7
- pxor 400(%esp,%edi,8),%mm6
- xorb (%esp,%edi,1),%cl
- movb %dl,%al
- movl 532(%esp),%edx
- movd %mm7,%ebx
- movzbl %cl,%ecx
- psrlq $8,%mm7
- movq %mm6,%mm3
- movl %eax,%edi
- psrlq $8,%mm6
- pxor 272(%esp,%ebp,8),%mm7
- andb $15,%al
- psllq $56,%mm3
- pxor %mm1,%mm6
- shrl $4,%edi
- pinsrw $2,(%esi,%ecx,2),%mm0
- pxor 16(%esp,%eax,8),%mm7
- roll $8,%edx
- pxor 144(%esp,%eax,8),%mm6
- pxor %mm3,%mm7
- pxor 400(%esp,%ebp,8),%mm6
- xorb (%esp,%ebp,1),%bl
- movb %dl,%al
- movd %mm7,%ecx
- movzbl %bl,%ebx
- psrlq $8,%mm7
- movq %mm6,%mm3
- movl %eax,%ebp
- psrlq $8,%mm6
- pxor 272(%esp,%edi,8),%mm7
- andb $15,%al
- psllq $56,%mm3
- pxor %mm0,%mm6
- shrl $4,%ebp
- pinsrw $2,(%esi,%ebx,2),%mm2
- pxor 16(%esp,%eax,8),%mm7
- roll $8,%edx
- pxor 144(%esp,%eax,8),%mm6
- pxor %mm3,%mm7
- pxor 400(%esp,%edi,8),%mm6
- xorb (%esp,%edi,1),%cl
- movb %dl,%al
- movd %mm7,%ebx
- movzbl %cl,%ecx
- psrlq $8,%mm7
- movq %mm6,%mm3
- movl %eax,%edi
- psrlq $8,%mm6
- pxor 272(%esp,%ebp,8),%mm7
- andb $15,%al
- psllq $56,%mm3
- pxor %mm2,%mm6
- shrl $4,%edi
- pinsrw $2,(%esi,%ecx,2),%mm1
- pxor 16(%esp,%eax,8),%mm7
- roll $8,%edx
- pxor 144(%esp,%eax,8),%mm6
- pxor %mm3,%mm7
- pxor 400(%esp,%ebp,8),%mm6
- xorb (%esp,%ebp,1),%bl
- movb %dl,%al
- movd %mm7,%ecx
- movzbl %bl,%ebx
- psrlq $8,%mm7
- movq %mm6,%mm3
- movl %eax,%ebp
- psrlq $8,%mm6
- pxor 272(%esp,%edi,8),%mm7
- andb $15,%al
- psllq $56,%mm3
- pxor %mm1,%mm6
- shrl $4,%ebp
- pinsrw $2,(%esi,%ebx,2),%mm0
- pxor 16(%esp,%eax,8),%mm7
- roll $8,%edx
- pxor 144(%esp,%eax,8),%mm6
- pxor %mm3,%mm7
- pxor 400(%esp,%edi,8),%mm6
- xorb (%esp,%edi,1),%cl
- movb %dl,%al
- movl 528(%esp),%edx
- movd %mm7,%ebx
- movzbl %cl,%ecx
- psrlq $8,%mm7
- movq %mm6,%mm3
- movl %eax,%edi
- psrlq $8,%mm6
- pxor 272(%esp,%ebp,8),%mm7
- andb $15,%al
- psllq $56,%mm3
- pxor %mm0,%mm6
- shrl $4,%edi
- pinsrw $2,(%esi,%ecx,2),%mm2
- pxor 16(%esp,%eax,8),%mm7
- roll $8,%edx
- pxor 144(%esp,%eax,8),%mm6
- pxor %mm3,%mm7
- pxor 400(%esp,%ebp,8),%mm6
- xorb (%esp,%ebp,1),%bl
- movb %dl,%al
- movd %mm7,%ecx
- movzbl %bl,%ebx
- psrlq $8,%mm7
- movq %mm6,%mm3
- movl %eax,%ebp
- psrlq $8,%mm6
- pxor 272(%esp,%edi,8),%mm7
- andb $15,%al
- psllq $56,%mm3
- pxor %mm2,%mm6
- shrl $4,%ebp
- pinsrw $2,(%esi,%ebx,2),%mm1
- pxor 16(%esp,%eax,8),%mm7
- roll $8,%edx
- pxor 144(%esp,%eax,8),%mm6
- pxor %mm3,%mm7
- pxor 400(%esp,%edi,8),%mm6
- xorb (%esp,%edi,1),%cl
- movb %dl,%al
- movd %mm7,%ebx
- movzbl %cl,%ecx
- psrlq $8,%mm7
- movq %mm6,%mm3
- movl %eax,%edi
- psrlq $8,%mm6
- pxor 272(%esp,%ebp,8),%mm7
- andb $15,%al
- psllq $56,%mm3
- pxor %mm1,%mm6
- shrl $4,%edi
- pinsrw $2,(%esi,%ecx,2),%mm0
- pxor 16(%esp,%eax,8),%mm7
- roll $8,%edx
- pxor 144(%esp,%eax,8),%mm6
- pxor %mm3,%mm7
- pxor 400(%esp,%ebp,8),%mm6
- xorb (%esp,%ebp,1),%bl
- movb %dl,%al
- movd %mm7,%ecx
- movzbl %bl,%ebx
- psrlq $8,%mm7
- movq %mm6,%mm3
- movl %eax,%ebp
- psrlq $8,%mm6
- pxor 272(%esp,%edi,8),%mm7
- andb $15,%al
- psllq $56,%mm3
- pxor %mm0,%mm6
- shrl $4,%ebp
- pinsrw $2,(%esi,%ebx,2),%mm2
- pxor 16(%esp,%eax,8),%mm7
- roll $8,%edx
- pxor 144(%esp,%eax,8),%mm6
- pxor %mm3,%mm7
- pxor 400(%esp,%edi,8),%mm6
- xorb (%esp,%edi,1),%cl
- movb %dl,%al
- movl 524(%esp),%edx
- movd %mm7,%ebx
- movzbl %cl,%ecx
- psrlq $8,%mm7
- movq %mm6,%mm3
- movl %eax,%edi
- psrlq $8,%mm6
- pxor 272(%esp,%ebp,8),%mm7
- andb $15,%al
- psllq $56,%mm3
- pxor %mm2,%mm6
- shrl $4,%edi
- pinsrw $2,(%esi,%ecx,2),%mm1
- pxor 16(%esp,%eax,8),%mm7
- pxor 144(%esp,%eax,8),%mm6
- xorb (%esp,%ebp,1),%bl
- pxor %mm3,%mm7
- pxor 400(%esp,%ebp,8),%mm6
- movzbl %bl,%ebx
- pxor %mm2,%mm2
- psllq $4,%mm1
- movd %mm7,%ecx
- psrlq $4,%mm7
- movq %mm6,%mm3
- psrlq $4,%mm6
- shll $4,%ecx
- pxor 16(%esp,%edi,8),%mm7
- psllq $60,%mm3
- movzbl %cl,%ecx
- pxor %mm3,%mm7
- pxor 144(%esp,%edi,8),%mm6
- pinsrw $2,(%esi,%ebx,2),%mm0
- pxor %mm1,%mm6
- movd %mm7,%edx
- pinsrw $3,(%esi,%ecx,2),%mm2
- psllq $12,%mm0
- pxor %mm0,%mm6
- psrlq $32,%mm7
- pxor %mm2,%mm6
- movl 548(%esp),%ecx
- movd %mm7,%ebx
- movq %mm6,%mm3
- psllw $8,%mm6
- psrlw $8,%mm3
- por %mm3,%mm6
- bswap %edx
- pshufw $27,%mm6,%mm6
- bswap %ebx
- cmpl 552(%esp),%ecx
- jne .L009outer
- movl 544(%esp),%eax
- movl %edx,12(%eax)
- movl %ebx,8(%eax)
- movq %mm6,(%eax)
- movl 556(%esp),%esp
- emms
- popl %edi
- popl %esi
- popl %ebx
- popl %ebp
- ret
-.size gcm_ghash_4bit_mmx,.-.L_gcm_ghash_4bit_mmx_begin
-.align 64
-.Lrem_4bit:
-.long 0,0,0,471859200,0,943718400,0,610271232
-.long 0,1887436800,0,1822425088,0,1220542464,0,1423966208
-.long 0,3774873600,0,4246732800,0,3644850176,0,3311403008
-.long 0,2441084928,0,2376073216,0,2847932416,0,3051356160
-.align 64
-.Lrem_8bit:
-.value 0,450,900,582,1800,1738,1164,1358
-.value 3600,4050,3476,3158,2328,2266,2716,2910
-.value 7200,7650,8100,7782,6952,6890,6316,6510
-.value 4656,5106,4532,4214,5432,5370,5820,6014
-.value 14400,14722,15300,14854,16200,16010,15564,15630
-.value 13904,14226,13780,13334,12632,12442,13020,13086
-.value 9312,9634,10212,9766,9064,8874,8428,8494
-.value 10864,11186,10740,10294,11640,11450,12028,12094
-.value 28800,28994,29444,29382,30600,30282,29708,30158
-.value 32400,32594,32020,31958,31128,30810,31260,31710
-.value 27808,28002,28452,28390,27560,27242,26668,27118
-.value 25264,25458,24884,24822,26040,25722,26172,26622
-.value 18624,18690,19268,19078,20424,19978,19532,19854
-.value 18128,18194,17748,17558,16856,16410,16988,17310
-.value 21728,21794,22372,22182,21480,21034,20588,20910
-.value 23280,23346,22900,22710,24056,23610,24188,24510
-.value 57600,57538,57988,58182,58888,59338,58764,58446
-.value 61200,61138,60564,60758,59416,59866,60316,59998
-.value 64800,64738,65188,65382,64040,64490,63916,63598
-.value 62256,62194,61620,61814,62520,62970,63420,63102
-.value 55616,55426,56004,56070,56904,57226,56780,56334
-.value 55120,54930,54484,54550,53336,53658,54236,53790
-.value 50528,50338,50916,50982,49768,50090,49644,49198
-.value 52080,51890,51444,51510,52344,52666,53244,52798
-.value 37248,36930,37380,37830,38536,38730,38156,38094
-.value 40848,40530,39956,40406,39064,39258,39708,39646
-.value 36256,35938,36388,36838,35496,35690,35116,35054
-.value 33712,33394,32820,33270,33976,34170,34620,34558
-.value 43456,43010,43588,43910,44744,44810,44364,44174
-.value 42960,42514,42068,42390,41176,41242,41820,41630
-.value 46560,46114,46692,47014,45800,45866,45420,45230
-.value 48112,47666,47220,47542,48376,48442,49020,48830
-.byte 71,72,65,83,72,32,102,111,114,32,120,56,54,44,32,67
-.byte 82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112
-.byte 112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62
-.byte 0
diff --git a/lib/x509/common.c b/lib/x509/common.c
index 16cd3e4..22c8da0 100644
--- a/lib/x509/common.c
+++ b/lib/x509/common.c
@@ -1344,9 +1344,10 @@ cleanup:
return result;
}
-/**
- * gnutls_x509_crt_get_signature_algorithm:
- * @cert: should contain a #gnutls_x509_crt_t structure
+/*-
+ * gnutls_x509_get_signature_algorithm:
+ * @src: should contain an ASN1_TYPE structure
+ * @src_name: the description of the signature field
*
* This function will return a value of the #gnutls_sign_algorithm_t
* enumeration that is the signature algorithm that has been used to
@@ -1354,7 +1355,7 @@ cleanup:
*
* Returns: a #gnutls_sign_algorithm_t value, or a negative value on
* error.
- **/
+ -*/
int
_gnutls_x509_get_signature_algorithm (ASN1_TYPE src, const char *src_name)
{
diff --git a/tests/dsa/testdsa b/tests/dsa/testdsa
index e8e782b..3d6a2f0 100755
--- a/tests/dsa/testdsa
+++ b/tests/dsa/testdsa
@@ -43,25 +43,25 @@ launch_server $$ --priority
"NORMAL:-VERS-TLS-ALL:+VERS-TLS1.0" --x509certfile $
wait_server $PID
$CLI $DEBUG -p $PORT 127.0.0.1 --insecure </dev/null >/dev/null || \
- fail "Failed connection to a server with DSA 1024 key and TLS 1.0!"
+ fail $PID "Failed connection to a server with DSA 1024 key and TLS 1.0!"
echo "Checking server DSA-1024 with client DSA-1024 and TLS 1.0"
#try with client key of 1024 bits (should succeed)
$CLI $DEBUG -p $PORT 127.0.0.1 --insecure --x509certfile
$srcdir/cert.dsa.1024.pem --x509keyfile $srcdir/dsa.1024.pem </dev/null
>/dev/null || \
- fail "Failed connection to a server with DSA 1024 key and TLS 1.0!"
+ fail $PID "Failed connection to a server with DSA 1024 key and TLS 1.0!"
echo "Checking server DSA-1024 with client DSA-2048 and TLS 1.0"
#try with client key of 2048 bits (should fail)
$CLI $DEBUG -p $PORT 127.0.0.1 --insecure --x509certfile
$srcdir/cert.dsa.2048.pem --x509keyfile $srcdir/dsa.2048.pem </dev/null
>/dev/null 2>&1 && \
- fail "Succeeded connection to a server with a client DSA 2048 key and TLS
1.0!"
+ fail $PID "Succeeded connection to a server with a client DSA 2048 key and
TLS 1.0!"
echo "Checking server DSA-1024 with client DSA-3072 and TLS 1.0"
#try with client key of 3072 bits (should fail)
$CLI $DEBUG -p $PORT 127.0.0.1 --insecure --x509certfile
$srcdir/cert.dsa.3072.pem --x509keyfile $srcdir/dsa.3072.pem </dev/null
>/dev/null 2>&1 && \
- fail "Succeeded connection to a server with a client DSA 3072 key and TLS
1.0!"
+ fail $PID "Succeeded connection to a server with a client DSA 3072 key and
TLS 1.0!"
kill $PID
wait
@@ -74,25 +74,25 @@ launch_server $$ --priority
"NORMAL:-VERS-TLS-ALL:+VERS-TLS1.2" --x509certfile
wait_server $PID
$CLI $DEBUG -p $PORT 127.0.0.1 --insecure </dev/null >/dev/null || \
- fail "Failed connection to a server with DSA 1024 key and TLS 1.2!"
+ fail $PID "Failed connection to a server with DSA 1024 key and TLS 1.2!"
echo "Checking server DSA-1024 with client DSA-1024 and TLS 1.2"
#try with client key of 1024 bits (should succeed)
$CLI $DEBUG -p $PORT 127.0.0.1 --insecure --x509certfile
$srcdir/cert.dsa.1024.pem --x509keyfile $srcdir/dsa.1024.pem </dev/null
>/dev/null || \
- fail "Failed connection to a server with DSA 1024 key and TLS 1.2!"
+ fail $PID "Failed connection to a server with DSA 1024 key and TLS 1.2!"
echo "Checking server DSA-1024 with client DSA-2048 and TLS 1.2"
#try with client key of 2048 bits (should succeed)
$CLI $DEBUG -p $PORT 127.0.0.1 --insecure --x509certfile
$srcdir/cert.dsa.2048.pem --x509keyfile $srcdir/dsa.2048.pem </dev/null
>/dev/null || \
- fail "Failed connection to a server with a client DSA 2048 key and TLS 1.2!"
+ fail $PID "Failed connection to a server with a client DSA 2048 key and TLS
1.2!"
echo "Checking server DSA-1024 with client DSA-3072 and TLS 1.2"
#try with client key of 3072 bits (should succeed)
$CLI $DEBUG -p $PORT 127.0.0.1 --insecure --x509certfile
$srcdir/cert.dsa.3072.pem --x509keyfile $srcdir/dsa.3072.pem </dev/null
>/dev/null || \
- fail "Failed connection to a server with a client DSA 3072 key and TLS 1.2!"
+ fail $PID "Failed connection to a server with a client DSA 3072 key and TLS
1.2!"
kill $PID
@@ -106,7 +106,7 @@ launch_server $$ --priority
"NORMAL:-VERS-TLS-ALL:+VERS-TLS1.0" --x509certfile
wait_server $PID
$CLI $DEBUG -p $PORT 127.0.0.1 --insecure </dev/null >/dev/null 2>&1 && \
- fail "Succeeded connection to a server with DSA 2048 key and TLS 1.0. Should
have failed!"
+ fail $PID "Succeeded connection to a server with DSA 2048 key and TLS 1.0.
Should have failed!"
kill $PID
wait
@@ -119,7 +119,7 @@ launch_server $$ --priority
"NORMAL:-VERS-TLS-ALL:+VERS-TLS1.2" --x509certfile
wait_server $PID
$CLI $DEBUG -p $PORT 127.0.0.1 --insecure </dev/null >/dev/null || \
- fail "Failed connection to a server with DSA 2048 key and TLS 1.2!"
+ fail $PID "Failed connection to a server with DSA 2048 key and TLS 1.2!"
kill $PID
wait
@@ -132,7 +132,7 @@ launch_server $$ --priority
"NORMAL:-VERS-TLS-ALL:+VERS-TLS1.0" --x509certfile
wait_server $PID
$CLI $DEBUG -p $PORT 127.0.0.1 --insecure </dev/null >/dev/null 2>&1 && \
- fail "Succeeded connection to a server with DSA 2048 key and TLS 1.0. Should
have failed!"
+ fail $PID "Succeeded connection to a server with DSA 3072 key and TLS 1.0.
Should have failed!"
kill $PID
wait
@@ -145,7 +145,7 @@ launch_server $$ --priority
"NORMAL:-VERS-TLS-ALL:+VERS-TLS1.2" --x509certfile
wait_server $PID
$CLI $DEBUG -p $PORT 127.0.0.1 --insecure </dev/null >/dev/null || \
- fail "Failed connection to a server with DSA 3072 key and TLS 1.2!"
+ fail $PID "Failed connection to a server with DSA 3072 key and TLS 1.2!"
kill $PID
wait
diff --git a/tests/openpgp-certs/testcerts b/tests/openpgp-certs/testcerts
index f9dbf23..3ae5065 100755
--- a/tests/openpgp-certs/testcerts
+++ b/tests/openpgp-certs/testcerts
@@ -47,10 +47,10 @@ wait_server $PID
# fail "Connection to verified IP address should have succeeded! (error code
$?)" $?
$CLI $DEBUG -p $PORT 127.0.0.2 --pgpkeyring $srcdir/ca-public.gpg </dev/null
>/dev/null 2>&1 && \
- fail "Connection to unrecognized IP address should have failed!"
+ fail $PID "Connection to unrecognized IP address should have failed!"
$CLI $DEBUG -p $PORT localhost --pgpkeyring $srcdir/ca-public.gpg </dev/null
>/dev/null 2>&1 && \
- fail "Connection to unverified (but present) 'localhost' should have failed!"
+ fail $PID "Connection to unverified (but present) 'localhost' should have
failed!"
kill $PID
wait
@@ -59,14 +59,14 @@ launch_server $$ --pgpcertfile
$srcdir/srv-public-localhost-signed.gpg --pgpkeyf
wait_server $PID
echo | $CLI $DEBUG -p $PORT 127.0.0.1 --pgpkeyring $srcdir/ca-public.gpg
</dev/null >/dev/null 2>&1 && \
- fail "Connection to unverified IP address should have failed! (error code
$?)" $?
+ fail $PID "Connection to unverified IP address should have failed! (error
code $?)" $?
$CLI $DEBUG -p $PORT 127.0.0.2 --pgpkeyring $srcdir/ca-public.gpg </dev/null
>/dev/null 2>&1 && \
- fail "Connection to unrecognized IP address should have failed!"
+ fail $PID "Connection to unrecognized IP address should have failed!"
#see reason above
#$CLI -p $PORT localhost --pgpkeyring ca-public.gpg </dev/null >/dev/null || \
-# fail "Connection to verified 'localhost' should have succeded! (error code
$?)" $?
+# fail $PID "Connection to verified 'localhost' should have succeded! (error
code $?)" $?
kill $PID
wait
@@ -76,10 +76,10 @@ wait_server $PID
# give the server a chance to initialize
echo | $CLI $DEBUG -p $PORT 127.0.0.1 --pgpkeyring $srcdir/ca-public.gpg
</dev/null >/dev/null || \
- fail "Connection to signed PGP certificate should have succeeded! (error
code $?)" $?
+ fail $PID "Connection to signed PGP certificate should have succeeded!
(error code $?)" $?
$CLI $DEBUG -p $PORT 127.0.0.2 --pgpkeyring $srcdir/ca-public.gpg </dev/null
>/dev/null && \
- fail "Connection to unrecognized IP address should have failed!"
+ fail $PID "Connection to unrecognized IP address should have failed!"
kill $PID
wait
diff --git a/tests/scripts/common.sh b/tests/scripts/common.sh
index 18c321f..dd616f3 100644
--- a/tests/scripts/common.sh
+++ b/tests/scripts/common.sh
@@ -19,6 +19,8 @@
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
fail() {
+ PID=$1
+ shift;
echo "Failure: $1" >&2
kill $PID
exit 1
diff --git a/tests/suite/testcompat-main b/tests/suite/testcompat-main
index a6b5ab9..abf6a43 100755
--- a/tests/suite/testcompat-main
+++ b/tests/suite/testcompat-main
@@ -72,17 +72,17 @@ wait_server $PID
# Test SSL 3.0 with RSA ciphersuite
echo "Checking SSL 3.0 with RSA..."
$CLI $DEBUG -p $PORT 127.0.0.1 --priority
"NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-SSL3.0:+RSA" --insecure
--x509certfile $CLI_CERT --x509keyfile $CLI_KEY </dev/null >/dev/null || \
- fail "Failed"
+ fail $PID "Failed"
# Test SSL 3.0 with DHE-RSA ciphersuite
echo "Checking SSL 3.0 with DHE-RSA..."
$CLI $DEBUG -p $PORT 127.0.0.1 --priority
"NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-SSL3.0:+DHE-RSA"
--insecure --x509certfile $CLI_CERT --x509keyfile $CLI_KEY </dev/null
>/dev/null || \
- fail "Failed"
+ fail $PID "Failed"
# Test SSL 3.0 with DHE-DSS ciphersuite
echo "Checking SSL 3.0 with DHE-DSS..."
$CLI $DEBUG -p $PORT 127.0.0.1 --priority
"NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-SSL3.0:+DHE-DSS"
--insecure --x509certfile $CLI_CERT --x509keyfile $CLI_KEY </dev/null
>/dev/null || \
- fail "Failed"
+ fail $PID "Failed"
kill $PID
wait
@@ -95,26 +95,26 @@ wait_server $PID
# Test TLS 1.0 with RSA ciphersuite
echo "Checking TLS 1.0 with RSA..."
$CLI $DEBUG -p $PORT 127.0.0.1 --priority
"NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.0:+RSA" --insecure
--x509certfile $CLI_CERT --x509keyfile $CLI_KEY </dev/null >/dev/null || \
- fail "Failed"
+ fail $PID "Failed"
# Test TLS 1.0 with DHE-RSA ciphersuite
echo "Checking TLS 1.0 with DHE-RSA..."
$CLI $DEBUG -p $PORT 127.0.0.1 --priority
"NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.0:+DHE-RSA"
--insecure --x509certfile $CLI_CERT --x509keyfile $CLI_KEY </dev/null
>/dev/null || \
- fail "Failed"
+ fail $PID "Failed"
if test $SV = 0;then
# Test TLS 1.0 with DHE-RSA ciphersuite
echo "Checking TLS 1.0 with ECDHE-RSA..."
$CLI $DEBUG -p $PORT 127.0.0.1 --priority
"NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.0:+ECDHE-RSA:+CURVE-ALL"
--insecure --x509certfile $CLI_CERT --x509keyfile $CLI_KEY </dev/null
>/dev/null || \
- fail "Failed"
+ fail $PID "Failed"
fi
# Test TLS 1.0 with DHE-DSS ciphersuite
echo "Checking TLS 1.0 with DHE-DSS..."
$CLI $DEBUG -p $PORT 127.0.0.1 --priority
"NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.0:+DHE-DSS"
--insecure --x509certfile $CLI_CERT --x509keyfile $CLI_KEY </dev/null
>/dev/null || \
- fail "Failed"
+ fail $PID "Failed"
kill $PID
wait
@@ -129,7 +129,7 @@ wait_server $PID
# Test TLS 1.0 with ECDHE-ECDSA ciphersuite
echo "Checking TLS 1.0 with ECDHE-ECDSA..."
$CLI $DEBUG -p $PORT 127.0.0.1 --priority
"NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.0:+ECDHE-ECDSA:+CURVE-ALL"
--insecure --x509certfile $ECC_CERT --x509keyfile $ECC_KEY </dev/null
>/dev/null || \
- fail "Failed"
+ fail $PID "Failed"
kill $PID
wait
@@ -145,7 +145,7 @@ if test $SV = 0;then
# Test DTLS 1.0 with RSA ciphersuite
echo "Checking DTLS 1.0 with RSA..."
$CLI $DEBUG -p $PORT 127.0.0.1 --priority
"NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-DTLS1.0:+RSA" --udp
--insecure --x509certfile $CLI_CERT --x509keyfile $CLI_KEY </dev/null
>/dev/null || \
- fail "Failed"
+ fail $PID "Failed"
kill $PID
wait
@@ -157,7 +157,7 @@ wait_server $PID
# Test DTLS 1.0 with DHE-RSA ciphersuite
echo "Checking DTLS 1.0 with DHE-RSA..."
$CLI $DEBUG -p $PORT 127.0.0.1 --priority
"NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-DTLS1.0:+DHE-RSA" --udp
--insecure --x509certfile $CLI_CERT --x509keyfile $CLI_KEY </dev/null
>/dev/null || \
- fail "Failed"
+ fail $PID "Failed"
kill $PID
wait
@@ -169,7 +169,7 @@ wait_server $PID
# Test DTLS 1.0 with DHE-DSS ciphersuite
echo "Checking DTLS 1.0 with DHE-DSS..."
$CLI $DEBUG -p $PORT 127.0.0.1 --priority
"NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-DTLS1.0:+DHE-DSS" --udp
--insecure --x509certfile $CLI_CERT --x509keyfile $CLI_KEY </dev/null
>/dev/null || \
- fail "Failed"
+ fail $PID "Failed"
fi
@@ -193,7 +193,7 @@ launch_server $$ --priority
"NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VE
wait_server $PID
$OPENSSL_CLI s_client -host localhost -port $PORT -ssl3 -cert $CLI_CERT -key
$CLI_KEY -CAfile $CA_CERT </dev/null 2>&1 | grep "\:error\:" && \
- fail "Failed"
+ fail $PID "Failed"
kill $PID
wait
@@ -203,7 +203,7 @@ launch_server $$ --priority
"NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VE
wait_server $PID
$OPENSSL_CLI s_client -host localhost -port $PORT -ssl3 -cert $CLI_CERT -key
$CLI_KEY -CAfile $CA_CERT </dev/null 2>&1 | grep "\:error\:" && \
- fail "Failed"
+ fail $PID "Failed"
kill $PID
wait
@@ -213,7 +213,7 @@ launch_server $$ --priority
"NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VE
wait_server $PID
$OPENSSL_CLI s_client -host localhost -port $PORT -ssl3 -cert $CLI_CERT -key
$CLI_KEY -CAfile $CA_CERT </dev/null 2>&1 | grep "\:error\:" && \
- fail "Failed"
+ fail $PID "Failed"
kill $PID
wait
@@ -225,7 +225,7 @@ launch_server $$ --priority
"NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VE
wait_server $PID
$OPENSSL_CLI s_client -host localhost -port $PORT -cert $CLI_CERT -key
$CLI_KEY -CAfile $CA_CERT </dev/null 2>&1 | grep "\:error\:" && \
- fail "Failed"
+ fail $PID "Failed"
kill $PID
wait
@@ -235,7 +235,7 @@ launch_server $$ --priority
"NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VE
wait_server $PID
$OPENSSL_CLI s_client -host localhost -tls1 -port $PORT -cert $CLI_CERT -key
$CLI_KEY -CAfile $CA_CERT </dev/null 2>&1 | grep "\:error\:" && \
- fail "Failed"
+ fail $PID "Failed"
kill $PID
wait
@@ -245,7 +245,7 @@ launch_server $$ --priority
"NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VE
wait_server $PID
$OPENSSL_CLI s_client -host localhost -tls1 -port $PORT -cert $CLI_CERT -key
$CLI_KEY -CAfile $CA_CERT </dev/null 2>&1 | grep "\:error\:" && \
- fail "Failed"
+ fail $PID "Failed"
kill $PID
wait
@@ -258,7 +258,7 @@ wait_server $PID
#-cipher ECDHE-RSA-AES128-SHA
$OPENSSL_CLI s_client -host localhost -tls1 -port $PORT -cert $CLI_CERT -key
$CLI_KEY -CAfile $CA_CERT </dev/null 2>&1 | grep "\:error\:" && \
- fail "Failed"
+ fail $PID "Failed"
kill $PID
wait
@@ -269,7 +269,7 @@ wait_server $PID
#-cipher ECDHE-ECDSA-AES128-SHA
$OPENSSL_CLI s_client -host localhost -tls1 -port $PORT -cert $ECC_CERT -key
$ECC_KEY -CAfile $CA_ECC_CERT </dev/null 2>&1 | grep "\:error\:" && \
- fail "Failed"
+ fail $PID "Failed"
kill $PID
wait
@@ -280,7 +280,7 @@ launch_server $$ --priority
"NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VE
wait_server $PID
$OPENSSL_CLI s_client -host localhost -port $PORT -dtls1 -cert $CLI_CERT -key
$CLI_KEY -CAfile $CA_CERT </dev/null 2>&1 | grep "\:error\:" && \
- fail "Failed"
+ fail $PID "Failed"
kill $PID
wait
@@ -290,7 +290,7 @@ launch_server $$ --priority
"NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VE
wait_server $PID
$CLI s_client -host localhost -port $PORT -dtls1 -cert $CLI_CERT -key
$CLI_KEY -CAfile $CA_CERT </dev/null 2>&1 | grep "\:error\:" && \
- fail "Failed"
+ fail $PID "Failed"
kill $PID
wait
@@ -300,7 +300,7 @@ launch_server $$ --priority
"NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VE
wait_server $PID
$CLI s_client -host localhost -port $PORT -dtls1 -cert $CLI_CERT -key
$CLI_KEY -CAfile $CA_CERT </dev/null 2>&1 | grep "\:error\:" && \
- fail "Failed"
+ fail $PID "Failed"
kill $PID
wait
diff --git a/tests/suite/testsrn b/tests/suite/testsrn
index 68993b5..f11a89a 100755
--- a/tests/suite/testsrn
+++ b/tests/suite/testsrn
@@ -39,19 +39,19 @@ PID=$!
wait_server $PID
$CLI -p $PORT 127.0.0.1 --rehandshake --priority
NONE:+AES-128-CBC:+MD5:+SHA1:+VERS-SSL3.0:+ANON-DH:+COMP-NULL:%SAFE_RENEGOTIATION
</dev/null >/dev/null 2>&1 || \
- fail "0. Renegotiation should have succeeded!"
+ fail $PID "0. Renegotiation should have succeeded!"
$CLI -p $PORT 127.0.0.1 --rehandshake --priority
NORMAL:+ANON-DH:%SAFE_RENEGOTIATION </dev/null >/dev/null 2>&1 || \
- fail "1. Safe rehandshake should have succeeded!"
+ fail $PID "1. Safe rehandshake should have succeeded!"
$CLI -p $PORT 127.0.0.1 --rehandshake --priority
NORMAL:+ANON-DH:%UNSAFE_RENEGOTIATION </dev/null >/dev/null 2>&1 || \
- fail "2. Unsafe rehandshake should have succeeded!"
+ fail $PID "2. Unsafe rehandshake should have succeeded!"
$CLI -p $PORT 127.0.0.1 --priority NORMAL:+ANON-DH:%DISABLE_SAFE_RENEGOTIATION
</dev/null >/dev/null 2>&1 || \
- fail "3. Unsafe negotiation should have succeeded!"
+ fail $PID "3. Unsafe negotiation should have succeeded!"
$CLI -p $PORT 127.0.0.1 --rehandshake --priority
NORMAL:+ANON-DH:%DISABLE_SAFE_RENEGOTIATION </dev/null >/dev/null 2>&1 && \
- fail "4. Unsafe renegotiation should have failed!"
+ fail $PID "4. Unsafe renegotiation should have failed!"
kill $PID
@@ -62,16 +62,16 @@ PID=$!
wait_server $PID
$CLI -p $PORT 127.0.0.1 --rehandshake --priority
NORMAL:+ANON-DH:%SAFE_RENEGOTIATION </dev/null >/dev/null 2>&1 || \
- fail "5. Safe rehandshake should have succeeded!"
+ fail $PID "5. Safe rehandshake should have succeeded!"
$CLI -p $PORT 127.0.0.1 --rehandshake --priority
NORMAL:+ANON-DH:%UNSAFE_RENEGOTIATION </dev/null >/dev/null 2>&1 || \
- fail "6. Unsafe rehandshake should have succeeded!"
+ fail $PID "6. Unsafe rehandshake should have succeeded!"
$CLI -p $PORT 127.0.0.1 --priority NORMAL:+ANON-DH:%DISABLE_SAFE_RENEGOTIATION
</dev/null >/dev/null 2>&1 && \
- fail "7. Unsafe negotiation should have failed!"
+ fail $PID "7. Unsafe negotiation should have failed!"
$CLI -p $PORT 127.0.0.1 --rehandshake --priority
NORMAL:+ANON-DH:%DISABLE_SAFE_RENEGOTIATION </dev/null >/dev/null 2>&1 && \
- fail "8. Unsafe renegotiation should have failed!"
+ fail $PID "8. Unsafe renegotiation should have failed!"
kill $PID
wait
@@ -81,16 +81,16 @@ PID=$!
wait_server $PID
$CLI -p $PORT 127.0.0.1 --priority NORMAL:+ANON-DH:%SAFE_RENEGOTIATION
</dev/null >/dev/null 2>&1 && \
- fail "9. Initial connection should have failed!"
+ fail $PID "9. Initial connection should have failed!"
$CLI -p $PORT 127.0.0.1 --priority NORMAL:+ANON-DH:%UNSAFE_RENEGOTIATION
</dev/null >/dev/null 2>&1 || \
- fail "10. Unsafe connection should have succeeded!"
+ fail $PID "10. Unsafe connection should have succeeded!"
$CLI -p $PORT 127.0.0.1 --priority NORMAL:+ANON-DH:%DISABLE_SAFE_RENEGOTIATION
</dev/null >/dev/null 2>&1 || \
- fail "11. Unsafe negotiation should have succeeded!"
+ fail $PID "11. Unsafe negotiation should have succeeded!"
$CLI -p $PORT 127.0.0.1 --rehandshake --priority
NORMAL:+ANON-DH:%DISABLE_SAFE_RENEGOTIATION </dev/null >/dev/null 2>&1 || \
- fail "12. Unsafe renegotiation should have succeeded!"
+ fail $PID "12. Unsafe renegotiation should have succeeded!"
kill $PID
wait
hooks/post-receive
--
GNU gnutls
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU gnutls branch, master, updated. gnutls_2_99_2-76-gcf20fa0,
Nikos Mavrogiannopoulos <=