1 files changed, 7 insertions, 1 deletions
diff --git a/src/lib/x509/x509_dn.cpp b/src/lib/x509/x509_dn.cpp
index ce1300e53..e705fe74d 100644
--- a/src/lib/x509/x509_dn.cpp
+++ b/src/lib/x509/x509_dn.cpp
@@ -79,7 +79,13 @@ std::multimap<std::string, std::string> X509_DN::contents() const
    {
    std::multimap<std::string, std::string> retval;
    for(auto i = m_dn_info.begin(); i != m_dn_info.end(); ++i)
-      multimap_insert(retval, OIDS::lookup(i->first), i->second.value());
+      {
+      std::string str_value = OIDS::oid2str(i->first);
+
+      if(str_value.empty())
+         str_value = i->first.as_string();
+      multimap_insert(retval, str_value, i->second.value());
+      }
    return retval;
    }