rpms/gnutls/F-10 gnutls-2.4.2-cve-2009-2730.patch, 1.1, 1.2 gnutls.spec, 1.38, 1.39

[Tomáš Mráz]

Author: tmraz

Update of /cvs/pkgs/rpms/gnutls/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6030

Modified Files:
	gnutls-2.4.2-cve-2009-2730.patch gnutls.spec 
Log Message:
* Wed Sep 23 2009 Tomas Mraz <tmraz at redhat.com> 2.4.2-5
- fix handling of hostname in openpgp certificates


gnutls-2.4.2-cve-2009-2730.patch:
 gnutls_str.c            |   45 ++++++++++++++++++++++++++-------------------
 gnutls_str.h            |    2 +-
 openpgp/pgp.c           |    2 +-
 x509/common.c           |   38 ++++++++++++++++++++++----------------
 x509/output.c           |   31 +++++++++++++++++++++++++++++++
 x509/rfc2818_hostname.c |   12 ++++++------
 6 files changed, 87 insertions(+), 43 deletions(-)

Index: gnutls-2.4.2-cve-2009-2730.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnutls/F-10/gnutls-2.4.2-cve-2009-2730.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gnutls-2.4.2-cve-2009-2730.patch	14 Aug 2009 12:24:51 -0000	1.1
+++ gnutls-2.4.2-cve-2009-2730.patch	23 Sep 2009 18:29:39 -0000	1.2
@@ -89,7 +89,7 @@ diff -up gnutls-2.4.2/lib/openpgp/pgp.c.
        if (ret == 0)
          {
 -          if (_gnutls_hostname_compare (dnsname, hostname))
-+          if (_gnutls_hostname_compare (dnsname, dnsnamesize, hostname))
++          if (_gnutls_hostname_compare (dnsname, dnsnamesize-1, hostname))
              return 1;
          }
      }


Index: gnutls.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnutls/F-10/gnutls.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- gnutls.spec	14 Aug 2009 12:24:51 -0000	1.38
+++ gnutls.spec	23 Sep 2009 18:29:40 -0000	1.39
@@ -1,7 +1,7 @@
 Summary: A TLS protocol implementation
 Name: gnutls
 Version: 2.4.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 # The libgnutls library is LGPLv2+, utilities and remaining libraries are GPLv3+
 License: GPLv3+ and LGPLv2+
 Group: System Environment/Libraries
@@ -152,6 +152,9 @@ fi
 %{_datadir}/guile/site/gnutls.scm
 
 %changelog
+* Wed Sep 23 2009 Tomas Mraz <tmraz at redhat.com> 2.4.2-5
+- fix handling of hostname in openpgp certificates
+
 * Fri Aug 14 2009 Tomas Mraz <tmraz at redhat.com> 2.4.2-4
 - fix CVE-2009-2730 - handling of NUL chars in certificate
   CNs and SANs