From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sat, 27 Aug 2011 18:48:04 +0000 (+0200)
Subject: XmppAddr -> UTF8String
X-Git-Tag: gnutls_3_0_2~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b544992357edd9e4128e065d710a82e9e4e4af24;p=thirdparty%2Fgnutls.git

XmppAddr -> UTF8String
---

diff --git a/NEWS b/NEWS
index ec47c60d14..2e934cc756 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,9 @@ See the end for copying conditions.
 
 * Version 3.0.2 (unreleased)
 
+** libgnutls: Corrected parsing of XMPP subject
+alternative names.
+
 ** libgnutls: Allow for out-of-order ChangeCipherSpec
 message in DTLS.
 
diff --git a/lib/x509/x509.c b/lib/x509/x509.c
index a8f6270ec9..5011c586f9 100644
--- a/lib/x509/x509.c
+++ b/lib/x509/x509.c
@@ -990,7 +990,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 ();