From: Simon Josefsson <simon@josefsson.org>
Date: Thu, 8 Feb 2007 08:30:19 +0000 (+0000)
Subject: Fix.
X-Git-Tag: gnutls_1_7_6~56
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7a157154591ef2a0ee9f2409153cfbf1e7d6109f;p=thirdparty%2Fgnutls.git

Fix.
---

diff --git a/NEWS b/NEWS
index 117b180c4d..6d8b3ed60d 100644
--- a/NEWS
+++ b/NEWS
@@ -10,8 +10,13 @@ The existing API gnutls_x509_crt_get_subject_alt_name may now return
 the new type GNUTLS_SAN_OTHERNAME together with the otherName value.
 To find out the otherName OID (necessary for proper parsing of the
 value), use the new API gnutls_x509_crt_get_subject_alt_othername_oid.
+For known OIDs, gnutls_x509_crt_get_subject_alt_othername_oid will
+return "virtual" SAN values, e.g., GNUTLS_SAN_OTHERNAME_XMPP to
+simplify OID matching.  Suggested by Matthias Wimmer <m@tthias.eu>.
 
 ** Certtool can print otherName SAN values for certificates.
+For known otherName OIDs (currently only id-on-xmppAddr as defined by
+RFC 3920), it will also print the name.
 
 ** Fix TLS 1.2 RSA signing in servers.
 Before it used the old-style MD5+SHA1 signature, but the TLS
diff --git a/lib/x509/x509.c b/lib/x509/x509.c
index 48363e274e..5dc32f0a62 100644
--- a/lib/x509/x509.c
+++ b/lib/x509/x509.c
@@ -879,10 +879,7 @@ parse_general_name (ASN1_TYPE src, const char *src_name,
   if (type == GNUTLS_SAN_OTHERNAME)
     {
       if (othername_oid)
-	{
-	  _gnutls_str_cat (nptr, sizeof (nptr), ".otherName.type-id");
-	  type = 0;
-	}
+	_gnutls_str_cat (nptr, sizeof (nptr), ".otherName.type-id");
       else
 	_gnutls_str_cat (nptr, sizeof (nptr), ".otherName.value");