[Pkg-gnutls-commits] r1226 - in /packages/gnutls26/trunk/debian: changelog patches/24_XmppAddr-UTF8String.diff patches/series

[ametzler at users.alioth.debian.org]

Author: ametzler
Date: Sun Aug 28 06:21:21 2011
New Revision: 1226

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=1226
Log:
[24_XmppAddr-UTF8String.diff] Correct parsing of XMPP subject alternative names. Closes: #638586

Added:
    packages/gnutls26/trunk/debian/patches/24_XmppAddr-UTF8String.diff
Modified:
    packages/gnutls26/trunk/debian/changelog
    packages/gnutls26/trunk/debian/patches/series

Modified: packages/gnutls26/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/trunk/debian/changelog?rev=1226&op=diff
==============================================================================
--- packages/gnutls26/trunk/debian/changelog (original)
+++ packages/gnutls26/trunk/debian/changelog Sun Aug 28 06:21:21 2011
@@ -3,6 +3,8 @@
   * NOT RELEASED YET
   * Since libgnutls*-dbg contains debugging symbols of helper applications
     libgnutls26-dbg and libgnutls28-dbg are not co-installable. Add Conflicts.
+  * [24_XmppAddr-UTF8String.diff] Correct parsing of XMPP subject
+    alternative names. Closes: #638586
 
  -- Andreas Metzler <ametzler at debian.org>  Mon, 22 Aug 2011 19:33:34 +0200
 

Added: packages/gnutls26/trunk/debian/patches/24_XmppAddr-UTF8String.diff
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/trunk/debian/patches/24_XmppAddr-UTF8String.diff?rev=1226&op=file
==============================================================================
--- packages/gnutls26/trunk/debian/patches/24_XmppAddr-UTF8String.diff (added)
+++ packages/gnutls26/trunk/debian/patches/24_XmppAddr-UTF8String.diff Sun Aug 28 06:21:21 2011
@@ -1,0 +1,25 @@
+From f343d362c6467e95e9b5c368e1d33592c20c4d1a Mon Sep 17 00:00:00 2001
+From: Nikos Mavrogiannopoulos <nmav at gnutls.org>
+Date: Sat, 27 Aug 2011 20:48:43 +0200
+Subject: [PATCH] XmppAddr -> UTF8String
+
+---
+ lib/x509/x509.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/lib/x509/x509.c b/lib/x509/x509.c
+index 8924ad6..3e2948d 100644
+--- a/lib/x509/x509.c
++++ b/lib/x509/x509.c
+@@ -1048,7 +1048,7 @@ _gnutls_parse_general_name (ASN1_TYPE src, const char *src_name,
+               size_t orig_name_size = *name_size;
+ 
+               result = asn1_create_element
+-                (_gnutls_get_pkix (), "PKIX1.XmppAddr", &c2);
++                (_gnutls_get_pkix (), "PKIX1.UTF8String", &c2);
+               if (result != ASN1_SUCCESS)
+                 {
+                   gnutls_assert ();
+-- 
+1.7.5.4
+

Modified: packages/gnutls26/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/trunk/debian/patches/series?rev=1226&op=diff
==============================================================================
--- packages/gnutls26/trunk/debian/patches/series (original)
+++ packages/gnutls26/trunk/debian/patches/series Sun Aug 28 06:21:21 2011
@@ -5,3 +5,4 @@
 20_gcrypt15compat.diff
 21_gnutls-cli.man.diff
 22_export_gnutls_openpgp_privkey_sign_hash.diff
+24_XmppAddr-UTF8String.diff