Changes 2.12.3:

* libgnutls: Several minor bugfixes.
* libgnutls: Restored HMAC-MD5 for compatibility. Although considered weak,
  several sites require it for connection. It is enabled for "NORMAL" and
  "PERFORMANCE" priority strings.
* libgnutls: depend on libdl.
* libgnutls: gnutls_transport_set_global_errno() was deprecated. Use your
  system's errno fascility or gnutls_transport_set_errno().
* gnutls-cli: Correction with usage of select to check for pending data in
  gnutls sessions. It now uses gnutls_record_check_pending().
* tests: More fixes and updates for win32. Patches by LRN.
* libgnutls: Several files unnecessarily included <gcrypt.h>; this has been
  fixed.
** API and ABI modifications: gnutls_transport_set_global_errno: DEPRECATED

Changes 2.12.2:
* libgnutls: Several updates and fixes for win32. Patches by LRN.
* libgnutls: Several bug and memory leak fixes.
* srptool: Accepts the -d option to enable debugging.
* libgnutls: Corrected bug in gnutls_srp_verifier() that prevented the
  allocation of a verifier. Reported by Andrew Wiseman.

Changes 2.12.1:
* certtool: Generated certificate request with stricter permissions.
* libgnutls: Bug fixes in opencdk code. Reported by Vitaly Kruglikov.
* libgnutls: Corrected windows system_errno() function prototype.
* libgnutls: C++ compatibility fix for compat.h. Reported by Mark Brand.
* libgnutls: Fix size of gnutls_openpgp_keyid_t by using the
  GNUTLS_OPENPGP_KEYID_SIZE definition. Reported by Andreas Metzler.

1 files changed, 94 insertions, 9 deletions

diff --git a/security/gnutls/PLIST b/security/gnutls/PLIST
index a29b73392c0..10e274367b8 100644
--- a/security/gnutls/PLIST
+++ b/security/gnutls/PLIST
@@ -1,16 +1,19 @@
-@comment $NetBSD: PLIST,v 1.38 2010/09/01 16:32:17 drochner Exp $
+@comment $NetBSD: PLIST,v 1.39 2011/04/26 10:35:29 adam Exp $
 bin/certtool
 bin/gnutls-cli
 bin/gnutls-cli-debug
 bin/gnutls-serv
+bin/p11tool
 bin/psktool
 bin/srptool
+include/gnutls/abstract.h
 include/gnutls/compat.h
 include/gnutls/crypto.h
 include/gnutls/extra.h
 include/gnutls/gnutls.h
 include/gnutls/gnutlsxx.h
 include/gnutls/openpgp.h
+include/gnutls/pkcs11.h
 include/gnutls/pkcs12.h
 include/gnutls/x509.h
 info/gnutls-certificate-user-use-case.png
@@ -26,6 +29,7 @@ info/gnutls-objects.png
 info/gnutls-pgp.png
 info/gnutls-x509.png
 info/gnutls.info
+info/pkcs11-vision.png
 lib/libgnutls-extra.la
 lib/libgnutls.la
 lib/libgnutlsxx.la
@@ -35,6 +39,7 @@ man/man1/certtool.1
 man/man1/gnutls-cli-debug.1
 man/man1/gnutls-cli.1
 man/man1/gnutls-serv.1
+man/man1/p11tool.1
 man/man1/psktool.1
 man/man1/srptool.1
 man/man3/gnutls_alert_get.3
@@ -79,6 +84,7 @@ man/man3/gnutls_certificate_set_openpgp_key_mem2.3
 man/man3/gnutls_certificate_set_openpgp_keyring_file.3
 man/man3/gnutls_certificate_set_openpgp_keyring_mem.3
 man/man3/gnutls_certificate_set_params_function.3
+man/man3/gnutls_certificate_set_retrieve_function.3
 man/man3/gnutls_certificate_set_rsa_export_params.3
 man/man3/gnutls_certificate_set_verify_flags.3
 man/man3/gnutls_certificate_set_verify_function.3
@@ -103,8 +109,10 @@ man/man3/gnutls_certificate_verify_peers.3
 man/man3/gnutls_certificate_verify_peers2.3
 man/man3/gnutls_check_version.3
 man/man3/gnutls_cipher_decrypt.3
+man/man3/gnutls_cipher_decrypt2.3
 man/man3/gnutls_cipher_deinit.3
 man/man3/gnutls_cipher_encrypt.3
+man/man3/gnutls_cipher_encrypt2.3
 man/man3/gnutls_cipher_get.3
 man/man3/gnutls_cipher_get_block_size.3
 man/man3/gnutls_cipher_get_id.3
@@ -166,6 +174,7 @@ man/man3/gnutls_global_init_extra.3
 man/man3/gnutls_global_set_log_function.3
 man/man3/gnutls_global_set_log_level.3
 man/man3/gnutls_global_set_mem_functions.3
+man/man3/gnutls_global_set_mutex.3
 man/man3/gnutls_handshake.3
 man/man3/gnutls_handshake_get_last_in.3
 man/man3/gnutls_handshake_get_last_out.3
@@ -280,21 +289,50 @@ man/man3/gnutls_openpgp_privkey_get_subkey_pk_algorithm.3
 man/man3/gnutls_openpgp_privkey_get_subkey_revoked_status.3
 man/man3/gnutls_openpgp_privkey_import.3
 man/man3/gnutls_openpgp_privkey_init.3
+man/man3/gnutls_openpgp_privkey_sec_param.3
 man/man3/gnutls_openpgp_privkey_set_preferred_key_id.3
 man/man3/gnutls_openpgp_privkey_sign_hash.3
 man/man3/gnutls_openpgp_send_cert.3
 man/man3/gnutls_openpgp_set_recv_key_function.3
-man/man3/gnutls_oprfi_enable_client.3
-man/man3/gnutls_oprfi_enable_server.3
 man/man3/gnutls_pem_base64_decode.3
 man/man3/gnutls_pem_base64_decode_alloc.3
 man/man3/gnutls_pem_base64_encode.3
 man/man3/gnutls_pem_base64_encode_alloc.3
 man/man3/gnutls_perror.3
 man/man3/gnutls_pk_algorithm_get_name.3
+man/man3/gnutls_pk_bits_to_sec_param.3
 man/man3/gnutls_pk_get_id.3
 man/man3/gnutls_pk_get_name.3
 man/man3/gnutls_pk_list.3
+man/man3/gnutls_pkcs11_add_provider.3
+man/man3/gnutls_pkcs11_copy_secret_key.3
+man/man3/gnutls_pkcs11_copy_x509_crt.3
+man/man3/gnutls_pkcs11_copy_x509_privkey.3
+man/man3/gnutls_pkcs11_deinit.3
+man/man3/gnutls_pkcs11_delete_url.3
+man/man3/gnutls_pkcs11_init.3
+man/man3/gnutls_pkcs11_obj_deinit.3
+man/man3/gnutls_pkcs11_obj_export.3
+man/man3/gnutls_pkcs11_obj_export_url.3
+man/man3/gnutls_pkcs11_obj_get_info.3
+man/man3/gnutls_pkcs11_obj_get_type.3
+man/man3/gnutls_pkcs11_obj_import_url.3
+man/man3/gnutls_pkcs11_obj_init.3
+man/man3/gnutls_pkcs11_obj_list_import_url.3
+man/man3/gnutls_pkcs11_privkey_deinit.3
+man/man3/gnutls_pkcs11_privkey_export_url.3
+man/man3/gnutls_pkcs11_privkey_get_info.3
+man/man3/gnutls_pkcs11_privkey_get_pk_algorithm.3
+man/man3/gnutls_pkcs11_privkey_import_url.3
+man/man3/gnutls_pkcs11_privkey_init.3
+man/man3/gnutls_pkcs11_set_pin_function.3
+man/man3/gnutls_pkcs11_set_token_function.3
+man/man3/gnutls_pkcs11_token_get_flags.3
+man/man3/gnutls_pkcs11_token_get_info.3
+man/man3/gnutls_pkcs11_token_get_mechanism.3
+man/man3/gnutls_pkcs11_token_get_url.3
+man/man3/gnutls_pkcs11_token_init.3
+man/man3/gnutls_pkcs11_token_set_pin.3
 man/man3/gnutls_pkcs12_bag_decrypt.3
 man/man3/gnutls_pkcs12_bag_deinit.3
 man/man3/gnutls_pkcs12_bag_encrypt.3
@@ -337,6 +375,16 @@ man/man3/gnutls_priority_deinit.3
 man/man3/gnutls_priority_init.3
 man/man3/gnutls_priority_set.3
 man/man3/gnutls_priority_set_direct.3
+man/man3/gnutls_privkey_decrypt_data.3
+man/man3/gnutls_privkey_deinit.3
+man/man3/gnutls_privkey_get_pk_algorithm.3
+man/man3/gnutls_privkey_get_type.3
+man/man3/gnutls_privkey_import_openpgp.3
+man/man3/gnutls_privkey_import_pkcs11.3
+man/man3/gnutls_privkey_import_x509.3
+man/man3/gnutls_privkey_init.3
+man/man3/gnutls_privkey_sign_data.3
+man/man3/gnutls_privkey_sign_hash.3
 man/man3/gnutls_protocol_get_id.3
 man/man3/gnutls_protocol_get_name.3
 man/man3/gnutls_protocol_get_version.3
@@ -357,6 +405,27 @@ man/man3/gnutls_psk_set_server_credentials_function.3
 man/man3/gnutls_psk_set_server_credentials_hint.3
 man/man3/gnutls_psk_set_server_dh_params.3
 man/man3/gnutls_psk_set_server_params_function.3
+man/man3/gnutls_pubkey_deinit.3
+man/man3/gnutls_pubkey_export.3
+man/man3/gnutls_pubkey_get_key_id.3
+man/man3/gnutls_pubkey_get_key_usage.3
+man/man3/gnutls_pubkey_get_pk_algorithm.3
+man/man3/gnutls_pubkey_get_pk_dsa_raw.3
+man/man3/gnutls_pubkey_get_pk_rsa_raw.3
+man/man3/gnutls_pubkey_get_preferred_hash_algorithm.3
+man/man3/gnutls_pubkey_get_verify_algorithm.3
+man/man3/gnutls_pubkey_import.3
+man/man3/gnutls_pubkey_import_dsa_raw.3
+man/man3/gnutls_pubkey_import_openpgp.3
+man/man3/gnutls_pubkey_import_pkcs11.3
+man/man3/gnutls_pubkey_import_pkcs11_url.3
+man/man3/gnutls_pubkey_import_privkey.3
+man/man3/gnutls_pubkey_import_rsa_raw.3
+man/man3/gnutls_pubkey_import_x509.3
+man/man3/gnutls_pubkey_init.3
+man/man3/gnutls_pubkey_set_key_usage.3
+man/man3/gnutls_pubkey_verify_data.3
+man/man3/gnutls_pubkey_verify_hash.3
 man/man3/gnutls_record_check_pending.3
 man/man3/gnutls_record_disable_padding.3
 man/man3/gnutls_record_get_direction.3
@@ -366,6 +435,7 @@ man/man3/gnutls_record_send.3
 man/man3/gnutls_record_set_max_size.3
 man/man3/gnutls_register_md5_handler.3
 man/man3/gnutls_rehandshake.3
+man/man3/gnutls_rnd.3
 man/man3/gnutls_rsa_export_get_modulus_bits.3
 man/man3/gnutls_rsa_export_get_pubkey.3
 man/man3/gnutls_rsa_params_cpy.3
@@ -377,19 +447,18 @@ man/man3/gnutls_rsa_params_import_pkcs1.3
 man/man3/gnutls_rsa_params_import_raw.3
 man/man3/gnutls_rsa_params_init.3
 man/man3/gnutls_safe_renegotiation_status.3
+man/man3/gnutls_sec_param_get_name.3
+man/man3/gnutls_sec_param_to_pk_bits.3
 man/man3/gnutls_server_name_get.3
 man/man3/gnutls_server_name_set.3
+man/man3/gnutls_session_channel_binding.3
 man/man3/gnutls_session_enable_compatibility_mode.3
-man/man3/gnutls_session_get_client_random.3
 man/man3/gnutls_session_get_data.3
 man/man3/gnutls_session_get_data2.3
 man/man3/gnutls_session_get_id.3
-man/man3/gnutls_session_get_master_secret.3
 man/man3/gnutls_session_get_ptr.3
-man/man3/gnutls_session_get_server_random.3
 man/man3/gnutls_session_is_resumed.3
 man/man3/gnutls_session_set_data.3
-man/man3/gnutls_session_set_finished_function.3
 man/man3/gnutls_session_set_ptr.3
 man/man3/gnutls_session_ticket_enable_client.3
 man/man3/gnutls_session_ticket_enable_server.3
@@ -424,12 +493,14 @@ man/man3/gnutls_supplemental_get_name.3
 man/man3/gnutls_transport_get_ptr.3
 man/man3/gnutls_transport_get_ptr2.3
 man/man3/gnutls_transport_set_errno.3
+man/man3/gnutls_transport_set_errno_function.3
 man/man3/gnutls_transport_set_global_errno.3
 man/man3/gnutls_transport_set_lowat.3
 man/man3/gnutls_transport_set_ptr.3
 man/man3/gnutls_transport_set_ptr2.3
 man/man3/gnutls_transport_set_pull_function.3
 man/man3/gnutls_transport_set_push_function.3
+man/man3/gnutls_transport_set_vec_push_function.3
 man/man3/gnutls_x509_crl_check_issuer.3
 man/man3/gnutls_x509_crl_deinit.3
 man/man3/gnutls_x509_crl_export.3
@@ -444,6 +515,7 @@ man/man3/gnutls_x509_crl_get_issuer_dn.3
 man/man3/gnutls_x509_crl_get_issuer_dn_by_oid.3
 man/man3/gnutls_x509_crl_get_next_update.3
 man/man3/gnutls_x509_crl_get_number.3
+man/man3/gnutls_x509_crl_get_raw_issuer_dn.3
 man/man3/gnutls_x509_crl_get_signature.3
 man/man3/gnutls_x509_crl_get_signature_algorithm.3
 man/man3/gnutls_x509_crl_get_this_update.3
@@ -451,6 +523,7 @@ man/man3/gnutls_x509_crl_get_version.3
 man/man3/gnutls_x509_crl_import.3
 man/man3/gnutls_x509_crl_init.3
 man/man3/gnutls_x509_crl_print.3
+man/man3/gnutls_x509_crl_privkey_sign.3
 man/man3/gnutls_x509_crl_set_authority_key_id.3
 man/man3/gnutls_x509_crl_set_crt.3
 man/man3/gnutls_x509_crl_set_crt_serial.3
@@ -485,6 +558,7 @@ man/man3/gnutls_x509_crq_get_version.3
 man/man3/gnutls_x509_crq_import.3
 man/man3/gnutls_x509_crq_init.3
 man/man3/gnutls_x509_crq_print.3
+man/man3/gnutls_x509_crq_privkey_sign.3
 man/man3/gnutls_x509_crq_set_attribute_by_oid.3
 man/man3/gnutls_x509_crq_set_basic_constraints.3
 man/man3/gnutls_x509_crq_set_challenge_password.3
@@ -493,6 +567,7 @@ man/man3/gnutls_x509_crq_set_key.3
 man/man3/gnutls_x509_crq_set_key_purpose_oid.3
 man/man3/gnutls_x509_crq_set_key_rsa_raw.3
 man/man3/gnutls_x509_crq_set_key_usage.3
+man/man3/gnutls_x509_crq_set_pubkey.3
 man/man3/gnutls_x509_crq_set_subject_alt_name.3
 man/man3/gnutls_x509_crq_set_version.3
 man/man3/gnutls_x509_crq_sign.3
@@ -524,12 +599,14 @@ man/man3/gnutls_x509_crt_get_issuer_alt_othername_oid.3
 man/man3/gnutls_x509_crt_get_issuer_dn.3
 man/man3/gnutls_x509_crt_get_issuer_dn_by_oid.3
 man/man3/gnutls_x509_crt_get_issuer_dn_oid.3
+man/man3/gnutls_x509_crt_get_issuer_unique_id.3
 man/man3/gnutls_x509_crt_get_key_id.3
 man/man3/gnutls_x509_crt_get_key_purpose_oid.3
 man/man3/gnutls_x509_crt_get_key_usage.3
 man/man3/gnutls_x509_crt_get_pk_algorithm.3
 man/man3/gnutls_x509_crt_get_pk_dsa_raw.3
 man/man3/gnutls_x509_crt_get_pk_rsa_raw.3
+man/man3/gnutls_x509_crt_get_preferred_hash_algorithm.3
 man/man3/gnutls_x509_crt_get_proxy.3
 man/man3/gnutls_x509_crt_get_raw_dn.3
 man/man3/gnutls_x509_crt_get_raw_issuer_dn.3
@@ -541,13 +618,18 @@ man/man3/gnutls_x509_crt_get_subject_alt_name.3
 man/man3/gnutls_x509_crt_get_subject_alt_name2.3
 man/man3/gnutls_x509_crt_get_subject_alt_othername_oid.3
 man/man3/gnutls_x509_crt_get_subject_key_id.3
+man/man3/gnutls_x509_crt_get_subject_unique_id.3
 man/man3/gnutls_x509_crt_get_verify_algorithm.3
 man/man3/gnutls_x509_crt_get_version.3
 man/man3/gnutls_x509_crt_import.3
+man/man3/gnutls_x509_crt_import_pkcs11.3
+man/man3/gnutls_x509_crt_import_pkcs11_url.3
 man/man3/gnutls_x509_crt_init.3
 man/man3/gnutls_x509_crt_list_import.3
+man/man3/gnutls_x509_crt_list_import_pkcs11.3
 man/man3/gnutls_x509_crt_list_verify.3
 man/man3/gnutls_x509_crt_print.3
+man/man3/gnutls_x509_crt_privkey_sign.3
 man/man3/gnutls_x509_crt_set_activation_time.3
 man/man3/gnutls_x509_crt_set_authority_key_id.3
 man/man3/gnutls_x509_crt_set_basic_constraints.3
@@ -565,6 +647,7 @@ man/man3/gnutls_x509_crt_set_key_purpose_oid.3
 man/man3/gnutls_x509_crt_set_key_usage.3
 man/man3/gnutls_x509_crt_set_proxy.3
 man/man3/gnutls_x509_crt_set_proxy_dn.3
+man/man3/gnutls_x509_crt_set_pubkey.3
 man/man3/gnutls_x509_crt_set_serial.3
 man/man3/gnutls_x509_crt_set_subject_alt_name.3
 man/man3/gnutls_x509_crt_set_subject_alternative_name.3
@@ -587,6 +670,7 @@ man/man3/gnutls_x509_privkey_export.3
 man/man3/gnutls_x509_privkey_export_dsa_raw.3
 man/man3/gnutls_x509_privkey_export_pkcs8.3
 man/man3/gnutls_x509_privkey_export_rsa_raw.3
+man/man3/gnutls_x509_privkey_export_rsa_raw2.3
 man/man3/gnutls_x509_privkey_fix.3
 man/man3/gnutls_x509_privkey_generate.3
 man/man3/gnutls_x509_privkey_get_key_id.3
@@ -595,7 +679,9 @@ man/man3/gnutls_x509_privkey_import.3
 man/man3/gnutls_x509_privkey_import_dsa_raw.3
 man/man3/gnutls_x509_privkey_import_pkcs8.3
 man/man3/gnutls_x509_privkey_import_rsa_raw.3
+man/man3/gnutls_x509_privkey_import_rsa_raw2.3
 man/man3/gnutls_x509_privkey_init.3
+man/man3/gnutls_x509_privkey_sec_param.3
 man/man3/gnutls_x509_privkey_sign_data.3
 man/man3/gnutls_x509_privkey_sign_hash.3
 man/man3/gnutls_x509_privkey_verify_data.3
@@ -605,18 +691,17 @@ man/man3/gnutls_x509_rdn_get_oid.3
 share/doc/gnutls/TODO
 share/doc/gnutls/gnutls.ps
 share/examples/gnutls/ex-alert.c
+share/examples/gnutls/ex-cert-select-pkcs11.c
 share/examples/gnutls/ex-cert-select.c
 share/examples/gnutls/ex-client-psk.c
 share/examples/gnutls/ex-client-resume.c
 share/examples/gnutls/ex-client-srp.c
-share/examples/gnutls/ex-client-tlsia.c
 share/examples/gnutls/ex-client1.c
 share/examples/gnutls/ex-client2.c
 share/examples/gnutls/ex-crq.c
 share/examples/gnutls/ex-pkcs12.c
 share/examples/gnutls/ex-rfc2818.c
 share/examples/gnutls/ex-serv-anon.c
-share/examples/gnutls/ex-serv-export.c
 share/examples/gnutls/ex-serv-pgp.c
 share/examples/gnutls/ex-serv-psk.c
 share/examples/gnutls/ex-serv-srp.c