← Back to branch summary

~ubuntu-branches/ubuntu/natty/gnutls26/natty

« back to all changes in this revision

Viewing changes to debian/patches/15_openpgp.diff

  • Committer: Bazaar Package Importer
  • Author(s): Andreas Metzler, debian/patches/15_openpgp.diff
  • Date: 2009-08-22 14:14:48 UTC
  • mfrom: (12.1.4 sid)
  • Revision ID: james.westby@ubuntu.com-20090822141448-ttb6n0wu9pazg3ho
Tags: 2.8.3-2
[ debian/patches/15_openpgp.diff ] The CVE-2009-2730 patch broke
openpgp connections.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/15_openpgp.diff
 
1
From 9eed44b4ef9538117cc134956b32bc8fd39534fd Mon Sep 17 00:00:00 2001
 
2
From: Simon Josefsson <simon@josefsson.org>
 
3
Date: Thu, 20 Aug 2009 10:21:09 +0000
 
4
Subject: Fix OpenPGP hostname comparison.
 
5
 
 
6
---
 
7
diff --git a/lib/openpgp/pgp.c b/lib/openpgp/pgp.c
 
8
index 8018ced..aa2a235 100644
 
9
--- a/lib/openpgp/pgp.c
 
10
+++ b/lib/openpgp/pgp.c
 
11
@@ -589,6 +589,10 @@ gnutls_openpgp_crt_check_hostname (gnutls_openpgp_crt_t key,
 
12
 
 
13
       if (ret == 0)
 
14
        {
 
15
+         /* Length returned by gnutls_openpgp_crt_get_name includes
 
16
+            the terminating zero. */
 
17
+         dnsnamesize--;
 
18
+
 
19
          if (_gnutls_hostname_compare (dnsname, dnsnamesize, hostname))
 
20
            return 1;
 
21
        }
 
22
--
 
23
cgit v0.8.2.1