summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2011-08-27 20:48:43 +0200
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2011-08-27 20:51:54 +0200
commitf23fc175f622a64543b1e7e0527fa69d0805d1bc (patch)
tree85087aeb20a284ca417f1266e28001a69c5b63cb
parentc4a8f333fc118ac454906e6ef056789b4069e4d2 (diff)
downloadgnutls-f23fc175f622a64543b1e7e0527fa69d0805d1bc.tar.gz
XmppAddr -> UTF8String
-rw-r--r--NEWS3
-rw-r--r--lib/x509/x509.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index cfa076b480..dc5482f8ab 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,9 @@ See the end for copying conditions.
* Version 2.12.10 (unreleased)
+** libgnutls: Corrected parsing of XMPP subject alternative
+names.
+
** libgnutls: gnutls_certificate_set_x509_key() and
gnutls_certificate_set_openpgp_key() operate as in 2.10.x
and allow the release of the private key during the
diff --git a/lib/x509/x509.c b/lib/x509/x509.c
index 8924ad6fc8..3e2948de29 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 ();