Update to 3.2.5:

* Version 3.2.5 (released 2013-10-23)

** libgnutls: Documentation and build-time fixes.

** libgnutls: Allow the generation of DH groups of less than 700 bits.

** libgnutls: Added several combinations of ciphersuites with SHA256 and SHA384 as MAC,
as well as Camellia with GCM.

** libdane: Added interfaces to allow initialization of dane_query_t from
external DNS resolutions, and to allow direct verification of a certificate
chain against a dane_query_t. Contributed by Christian Grothoff.

** libdane: Fixed a buffer overflow in dane_query_tlsa(). This could be
triggered by a DNS server supplying more than 4 DANE records. Report and fix
by Christian Grothoff.

** srptool: Fixed index command line option. Patch by Attila Molnar.

** gnutls-cli: Added support for inline commands, using the
--inline-commands-prefix and --inline-commands options. Patch by Raj Raman.

** certtool: pathlen constraint is now read correctly. Reported by
Christoph Seitz.

** API and ABI modifications:
gnutls_certificate_get_crt_raw: Added
dane_verify_crt_raw: Added
dane_raw_tlsa: Added


* Version 3.2.4 (released 2013-08-31)

** libgnutls: Fixes when session tickets and session DB are used.
Report and initial patch by Stefan Buehler.

** libgnutls: Added the RSA-PSK key exchange. Patch by by Frank Morgner,
based on previous patch by Bardenheuer GmbH and Bundesdruckerei GmbH.

** libgnutls: Added ciphersuites that use ARCFOUR with ECDHE. Patch
by Stefan Buehler.

** libgnutls: Added the PFS priority string option.

** libgnutls: Gnulib included files are strictly LGPLv2.

** libgnutls: Corrected gnutls_certificate_server_set_request().
Reported by Petr Pisar.

** API and ABI modifications:
gnutls_record_set_timeout: Exported

3 files changed, 8 insertions, 7 deletions

diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index eeee4a7dc6b..47f214777aa 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.131 2013/08/01 20:00:59 adam Exp $
+# $NetBSD: Makefile,v 1.132 2013/10/27 23:13:09 wiz Exp $
 
-DISTNAME=	gnutls-3.2.3
+DISTNAME=	gnutls-3.2.5
 CATEGORIES=	security devel
 MASTER_SITES=	ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/
 EXTRACT_SUFX=	.tar.xz
diff --git a/security/gnutls/PLIST b/security/gnutls/PLIST
index 1de158ae968..96195b657d5 100644
--- a/security/gnutls/PLIST
+++ b/security/gnutls/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.46 2013/08/01 20:00:59 adam Exp $
+@comment $NetBSD: PLIST,v 1.47 2013/10/27 23:13:09 wiz Exp $
 bin/certtool
 bin/danetool
 bin/gnutls-cli
@@ -72,6 +72,7 @@ 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_crt_raw.3
 man/man3/gnutls_certificate_get_issuer.3
 man/man3/gnutls_certificate_get_ours.3
 man/man3/gnutls_certificate_get_peers.3
diff --git a/security/gnutls/distinfo b/security/gnutls/distinfo
index 5c557bac7e2..e562d9d22f3 100644
--- a/security/gnutls/distinfo
+++ b/security/gnutls/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.97 2013/10/25 09:03:12 jperkin Exp $
+$NetBSD: distinfo,v 1.98 2013/10/27 23:13:09 wiz Exp $
 
-SHA1 (gnutls-3.2.3.tar.xz) = 18f5fffd1a0384944cb76cbedc0720c4726470f4
-RMD160 (gnutls-3.2.3.tar.xz) = bde21d617cbef1051b019a99915ebf51246819d2
-Size (gnutls-3.2.3.tar.xz) = 5119264 bytes
+SHA1 (gnutls-3.2.5.tar.xz) = 088eee3297d036754414f40ae49ef9ea9e83c679
+RMD160 (gnutls-3.2.5.tar.xz) = aeb4e709bbe2987d7363266bb86e9bfc98d7fb1c
+Size (gnutls-3.2.5.tar.xz) = 4987156 bytes
 SHA1 (patch-ae) = 71fbbeb43ac1689fca6fec7f8348d8534c1dc38a
 SHA1 (patch-gl_stdio.in.h) = b5802da2cccddd6fab73bd39c49f7d62bef58464
 SHA1 (patch-lib_Makefile.in) = 949df8644a1f6085d8ad63984188cee0518a837a