update to gnutls-2.4.1

Changes:

** libgnutls: Fix local crash in gnutls_handshake. [GNUTLS-SA-2008-2]
** libgnutls: Fix memory leaks when doing a re-handshake.
** Fix compiler warnings.
** Fix ordering of -I's to avoid opencdk.h conflict with system headers.
** srptool: Fix a problem where --verify check does not succeed.

4 files changed, 67 insertions, 22 deletions

diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index 0c60f186956..54dd0c2b58a 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.70 2008/05/24 04:59:59 obache Exp $
+# $NetBSD: Makefile,v 1.71 2008/07/30 17:17:21 kefren Exp $
 
-DISTNAME=	gnutls-2.2.5
+DISTNAME=	gnutls-2.4.1
 CATEGORIES=	security devel
 MASTER_SITES=	http://josefsson.org/gnutls/releases/ \
 		ftp://ftp.gnutls.org/pub/gnutls/ \
diff --git a/security/gnutls/PLIST b/security/gnutls/PLIST
index 4f51fced41f..03af878c121 100644
--- a/security/gnutls/PLIST
+++ b/security/gnutls/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.31 2008/03/06 14:52:12 wiz Exp $
+@comment $NetBSD: PLIST,v 1.32 2008/07/30 17:17:21 kefren Exp $
 bin/certtool
 bin/gnutls-cli
 bin/gnutls-cli-debug
@@ -8,6 +8,7 @@ bin/libgnutls-extra-config
 bin/psktool
 bin/srptool
 include/gnutls/compat.h
+include/gnutls/crypto.h
 include/gnutls/extra.h
 include/gnutls/gnutls.h
 include/gnutls/gnutlsxx.h
@@ -65,15 +66,20 @@ man/man3/gnutls_certificate_free_cas.3
 man/man3/gnutls_certificate_free_credentials.3
 man/man3/gnutls_certificate_free_crls.3
 man/man3/gnutls_certificate_free_keys.3
+man/man3/gnutls_certificate_get_openpgp_keyring.3
 man/man3/gnutls_certificate_get_ours.3
 man/man3/gnutls_certificate_get_peers.3
+man/man3/gnutls_certificate_get_x509_cas.3
+man/man3/gnutls_certificate_get_x509_crls.3
 man/man3/gnutls_certificate_send_x509_rdn_sequence.3
 man/man3/gnutls_certificate_server_set_request.3
 man/man3/gnutls_certificate_server_set_retrieve_function.3
 man/man3/gnutls_certificate_set_dh_params.3
 man/man3/gnutls_certificate_set_openpgp_key.3
 man/man3/gnutls_certificate_set_openpgp_key_file.3
+man/man3/gnutls_certificate_set_openpgp_key_file2.3
 man/man3/gnutls_certificate_set_openpgp_key_mem.3
+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
@@ -113,6 +119,10 @@ man/man3/gnutls_compression_list.3
 man/man3/gnutls_compression_set_priority.3
 man/man3/gnutls_credentials_clear.3
 man/man3/gnutls_credentials_set.3
+man/man3/gnutls_crypto_cipher_register.3
+man/man3/gnutls_crypto_digest_register.3
+man/man3/gnutls_crypto_mac_register.3
+man/man3/gnutls_crypto_rnd_register.3
 man/man3/gnutls_db_check_entry.3
 man/man3/gnutls_db_get_ptr.3
 man/man3/gnutls_db_remove_session.3
@@ -153,6 +163,7 @@ man/man3/gnutls_handshake_get_last_out.3
 man/man3/gnutls_handshake_set_max_packet_length.3
 man/man3/gnutls_handshake_set_post_client_hello_function.3
 man/man3/gnutls_handshake_set_private_extensions.3
+man/man3/gnutls_hex2bin.3
 man/man3/gnutls_hex_decode.3
 man/man3/gnutls_hex_encode.3
 man/man3/gnutls_ia_allocate_client_credentials.3
@@ -191,26 +202,64 @@ man/man3/gnutls_malloc.3
 man/man3/gnutls_openpgp_crt_check_hostname.3
 man/man3/gnutls_openpgp_crt_deinit.3
 man/man3/gnutls_openpgp_crt_export.3
+man/man3/gnutls_openpgp_crt_get_auth_subkey.3
 man/man3/gnutls_openpgp_crt_get_creation_time.3
 man/man3/gnutls_openpgp_crt_get_expiration_time.3
 man/man3/gnutls_openpgp_crt_get_fingerprint.3
-man/man3/gnutls_openpgp_crt_get_id.3
+man/man3/gnutls_openpgp_crt_get_key_id.3
 man/man3/gnutls_openpgp_crt_get_key_usage.3
 man/man3/gnutls_openpgp_crt_get_name.3
 man/man3/gnutls_openpgp_crt_get_pk_algorithm.3
+man/man3/gnutls_openpgp_crt_get_pk_dsa_raw.3
+man/man3/gnutls_openpgp_crt_get_pk_rsa_raw.3
+man/man3/gnutls_openpgp_crt_get_preferred_key_id.3
+man/man3/gnutls_openpgp_crt_get_revoked_status.3
+man/man3/gnutls_openpgp_crt_get_subkey_count.3
+man/man3/gnutls_openpgp_crt_get_subkey_creation_time.3
+man/man3/gnutls_openpgp_crt_get_subkey_expiration_time.3
+man/man3/gnutls_openpgp_crt_get_subkey_fingerprint.3
+man/man3/gnutls_openpgp_crt_get_subkey_id.3
+man/man3/gnutls_openpgp_crt_get_subkey_idx.3
+man/man3/gnutls_openpgp_crt_get_subkey_pk_algorithm.3
+man/man3/gnutls_openpgp_crt_get_subkey_pk_dsa_raw.3
+man/man3/gnutls_openpgp_crt_get_subkey_pk_rsa_raw.3
+man/man3/gnutls_openpgp_crt_get_subkey_revoked_status.3
+man/man3/gnutls_openpgp_crt_get_subkey_usage.3
 man/man3/gnutls_openpgp_crt_get_version.3
 man/man3/gnutls_openpgp_crt_import.3
 man/man3/gnutls_openpgp_crt_init.3
+man/man3/gnutls_openpgp_crt_print.3
+man/man3/gnutls_openpgp_crt_set_preferred_key_id.3
 man/man3/gnutls_openpgp_crt_verify_ring.3
 man/man3/gnutls_openpgp_crt_verify_self.3
 man/man3/gnutls_openpgp_keyring_check_id.3
 man/man3/gnutls_openpgp_keyring_deinit.3
+man/man3/gnutls_openpgp_keyring_get_crt.3
+man/man3/gnutls_openpgp_keyring_get_crt_count.3
 man/man3/gnutls_openpgp_keyring_import.3
 man/man3/gnutls_openpgp_keyring_init.3
 man/man3/gnutls_openpgp_privkey_deinit.3
+man/man3/gnutls_openpgp_privkey_export.3
+man/man3/gnutls_openpgp_privkey_export_dsa_raw.3
+man/man3/gnutls_openpgp_privkey_export_rsa_raw.3
+man/man3/gnutls_openpgp_privkey_export_subkey_dsa_raw.3
+man/man3/gnutls_openpgp_privkey_export_subkey_rsa_raw.3
+man/man3/gnutls_openpgp_privkey_get_fingerprint.3
+man/man3/gnutls_openpgp_privkey_get_key_id.3
 man/man3/gnutls_openpgp_privkey_get_pk_algorithm.3
+man/man3/gnutls_openpgp_privkey_get_preferred_key_id.3
+man/man3/gnutls_openpgp_privkey_get_revoked_status.3
+man/man3/gnutls_openpgp_privkey_get_subkey_count.3
+man/man3/gnutls_openpgp_privkey_get_subkey_creation_time.3
+man/man3/gnutls_openpgp_privkey_get_subkey_expiration_time.3
+man/man3/gnutls_openpgp_privkey_get_subkey_fingerprint.3
+man/man3/gnutls_openpgp_privkey_get_subkey_id.3
+man/man3/gnutls_openpgp_privkey_get_subkey_idx.3
+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_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
@@ -271,14 +320,17 @@ man/man3/gnutls_protocol_list.3
 man/man3/gnutls_protocol_set_priority.3
 man/man3/gnutls_psk_allocate_client_credentials.3
 man/man3/gnutls_psk_allocate_server_credentials.3
+man/man3/gnutls_psk_client_get_hint.3
 man/man3/gnutls_psk_free_client_credentials.3
 man/man3/gnutls_psk_free_server_credentials.3
+man/man3/gnutls_psk_netconf_derive_key.3
 man/man3/gnutls_psk_server_get_username.3
 man/man3/gnutls_psk_set_client_credentials.3
 man/man3/gnutls_psk_set_client_credentials_function.3
 man/man3/gnutls_psk_set_params_function.3
 man/man3/gnutls_psk_set_server_credentials_file.3
 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_record_check_pending.3
@@ -453,7 +505,11 @@ man/man3/gnutls_x509_crt_sign.3
 man/man3/gnutls_x509_crt_sign2.3
 man/man3/gnutls_x509_crt_verify.3
 man/man3/gnutls_x509_crt_verify_data.3
+man/man3/gnutls_x509_dn_deinit.3
+man/man3/gnutls_x509_dn_export.3
 man/man3/gnutls_x509_dn_get_rdn_ava.3
+man/man3/gnutls_x509_dn_import.3
+man/man3/gnutls_x509_dn_init.3
 man/man3/gnutls_x509_dn_oid_known.3
 man/man3/gnutls_x509_privkey_cpy.3
 man/man3/gnutls_x509_privkey_deinit.3
@@ -482,6 +538,7 @@ share/doc/gnutls/TODO
 share/doc/gnutls/gnutls.ps
 share/examples/gnutls/ex-alert.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
@@ -493,6 +550,7 @@ 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
 share/examples/gnutls/ex-serv1.c
 share/examples/gnutls/ex-session-info.c
@@ -506,6 +564,7 @@ share/locale/ms/LC_MESSAGES/gnutls.mo
 share/locale/nl/LC_MESSAGES/gnutls.mo
 share/locale/pl/LC_MESSAGES/gnutls.mo
 share/locale/sv/LC_MESSAGES/gnutls.mo
+share/locale/vi/LC_MESSAGES/gnutls.mo
 @dirrm share/examples/gnutls
 @dirrm share/doc/gnutls
 @dirrm include/gnutls
diff --git a/security/gnutls/distinfo b/security/gnutls/distinfo
index 4c168f8fda3..8b1d1e851c5 100644
--- a/security/gnutls/distinfo
+++ b/security/gnutls/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.44 2008/05/22 13:18:52 tnn Exp $
+$NetBSD: distinfo,v 1.45 2008/07/30 17:17:21 kefren Exp $
 
-SHA1 (gnutls-2.2.5.tar.bz2) = 7620d092c790f0a5ac5486c3563786ca8777083d
-RMD160 (gnutls-2.2.5.tar.bz2) = dd48a780849fc81c0a688116984eab8f41ea8ebf
-Size (gnutls-2.2.5.tar.bz2) = 4920322 bytes
+SHA1 (gnutls-2.4.1.tar.bz2) = 7a439542e6344d5ccf11a29431a0600e7fe1c735
+RMD160 (gnutls-2.4.1.tar.bz2) = 4e21a82047add916b8ccce8aa82c36b2c9bcff90
+Size (gnutls-2.4.1.tar.bz2) = 4940118 bytes
 SHA1 (patch-aa) = b2024cb515196e64efcdbba227f05db9eb07c236
 SHA1 (patch-ab) = d30748128877d2ec5942d2b852f23a05d36102d0
-SHA1 (patch-ad) = 585a6b64cc52403d83804ef22726110c4aae6169
 SHA1 (patch-ae) = f505476ce0477dc547e8698d205d6ba26fe85f48
 SHA1 (patch-af) = bd4701640dfef5bfdce87d620befd93098b0dff3
diff --git a/security/gnutls/patches/patch-ad b/security/gnutls/patches/patch-ad
deleted file mode 100644
index fb778c30708..00000000000
--- a/security/gnutls/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2007/10/23 11:43:57 wiz Exp $
-
---- lib/x509/output.c.orig	2007-09-27 11:17:18.000000000 +0000
-+++ lib/x509/output.c
-@@ -84,7 +84,7 @@ asciiprint (gnutls_string * str, const c
-   size_t j;
- 
-   for (j = 0; j < len; j++)
--    if (isprint (data[j]))
-+    if (isprint ((unsigned char) data[j]))
-       addf (str, "%c", (unsigned char) data[j]);
-     else
-       addf (str, ".");