Fix.

diff --git a/NEWS b/NEWS
index 117b180c4dc04ec950b9b5a0f69bf1db5d4f8489..6d8b3ed60d80fd1c6fd2969c729f22a6409bf9f5 100644 (file)
--- 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 48363e274ebfd828d54e1a840e77504e9241ece6..5dc32f0a6260eb80e27275e0f2ba51a66a1c0bc7 100644 (file)
--- 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");