XmppAddr -> UTF8String

diff --git a/NEWS b/NEWS
index ec47c60d14171da3a06cadbb59e67ab17cb3c4e3..2e934cc7569d5208204567a2552e13fb453a5ffa 100644 (file)
--- 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 a8f6270ec9baf2c8791ce0f9a0fdbcdbed4f1e84..5011c586f96b55c576cac0128a8d4feacbcd9076 100644 (file)
--- 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 ();