Add a test for GH #1252

4 files changed, 61 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;
    }
 
diff --git a/src/tests/data/misc_certs/opcuactt_ca.der b/src/tests/data/misc_certs/opcuactt_ca.der
new file mode 100644
index 000000000..35e8e5cb0
--- /dev/null
+++ b/src/tests/data/misc_certs/opcuactt_ca.der
diff --git a/src/tests/data/misc_certs/opcuactt_ca.pem b/src/tests/data/misc_certs/opcuactt_ca.pem
new file mode 100644
index 000000000..1987a0a07
--- /dev/null
+++ b/src/tests/data/misc_certs/opcuactt_ca.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDMAXkiTXQ8mQnY
+n+99br/MU9dRvUzliOZRu0owQnAgTtH2Rl+Q9icXQyhcowaiCv6DFrvPlR1MKMux
+kJngiOYLI10gLgXjiO4pd53IPNa60+6j4Xgobl7lfCGnSwbYVE8OYl0MyjfrC8Ca
+OmbYYVLvgBSW2fPyBHrucCBTB+f4FT+Wuu473hmNHrRx8WT9H9GjRcUQ+RkDqI8S
+1ydcQdGu6BWTHCvvRtdxvDk+4WzBdtgoSkGeFBZa3BAnsHTMiKHzMogeqNUGPHVJ
+hBobqxLha1ztkRvaIByuidNN1lZAhnonkFNU5QAykPqSAaem1RwPi6xA5VQUxCoz
+LmZBvubHAgMBAAECggEBAJtOM82tcWQAjcJgX436FgGTgkQz/KpxggWOs3fx3DJ8
+TtNR18cf3bqT4dJEOfR6si9Ry0DIoDkuhYN0NfD9x0OLdIXfA5So1cazzWZ3CnHI
+jdAtAbCl9ZB245fcQiXGaTjmIThvagqCM+o1s73euaiitQnyewgv6PZEXhdX2Xy+
+Mqm1gXi0edyegSdjVRYd1vfx0S52R1TfoLWUy471VlOsKTo+ukUARryB36VA8iNh
+0Wn2419zMyjt1ocOIU0RGFFag7wjZ7rGhv+p9Bb92gBrKkbC/2UWgJRpO4OZ17zX
+R3AajPW30e4iUYgFqvDpEhi48N9G7zAxia1FWF0VR8ECgYEA/KVK6trcbxy8Ohqd
+hBQUkElCAnBvkIY+OStAieLMppVEvQfMgTWiOCzub4hiGKkPZUK9ibmQgDzcXbZy
+bB1cXVK6nwAEfABTYzifu2ADJCDOBd3B1PXW2waLHuMVI0CEnySmADDUJ5+LmZm/
+um6j4iGcJIGZjGNVMQTdTampcs8CgYEAzrbcOMBaQZMW5fDD21x/tGwiNmyIBpNC
+M865xHjRHFvGdVkWoIvm2wLV5O7AZMzqc5h6sOxCTj2E4dlWnshn0pTBR48epyXl
+cv287G2czafQsttyEJq83InV3JlwycyOy2/EJOCuL/T2O8nGJlNTTUEQbC6Udu8v
+/r/HGkO9qokCgYB0LaqCzzwY2FTyPzT5/KXsJ9Pz/TJAeor4jRwzjBjh7bhbWM/B
+ByHexUKsBUJe5rdOsF8qiyuY3OPVMEXz05iazaVF4qMtRpUSBoLljmRDY9Z5uh0d
+SiOQOrUU8gXRXSTfbeHsKogU5Hg0nRAesiwom54K55HtjewqC3uc8A0c3wKBgQDC
+XNNiFRKIN7o/CAvQFQAKb+YXUCLyM8H6nnSzFHph9LT8n4CUAhdVdCwTrp196eLE
+P+mUswCBOnzYMpesgniEWtQE6cADn7FHVuctUr8t641irs1oaWYM4xkP68JOLCVT
+iUpe9lcxxl1DyCuk25ImwHelkIKN9cYl/MJDotASKQKBgFMX48y7qyqYTZUnXHza
+g8yVwpU3DaynPNd7IHwC2/Nj1jZW79Tg8YHzKxujvHSByyqt7UOY8oMTdywzqAh5
+JH3Z9JfPKFTp18cNk8Z0vhPnNV5lQPPXKaWsW7YW62AuDYTX/CwL9+Z+sCIQ/WBz
+MMcuPWIKk0t5acScslBtLdk3
+-----END PRIVATE KEY-----
diff --git a/src/tests/unit_x509.cpp b/src/tests/unit_x509.cpp
index aab0b83d5..da60348c8 100644
--- a/src/tests/unit_x509.cpp
+++ b/src/tests/unit_x509.cpp
@@ -11,6 +11,7 @@
 
    #include <botan/calendar.h>
    #include <botan/pkcs10.h>
+   #include <botan/pkcs8.h>
    #include <botan/x509self.h>
    #include <botan/x509path.h>
    #include <botan/x509_ca.h>
@@ -358,6 +359,30 @@ Test::Result test_x509_dates()
    return result;
    }
 
+Test::Result test_crl_dn_name()
+   {
+   Test::Result result("CRL DN name");
+
+   // See GH #1252
+
+   const Botan::OID dc_oid("0.9.2342.19200300.100.1.25");
+
+   Botan::X509_Certificate cert(Test::data_file("misc_certs/opcuactt_ca.der"));
+
+   Botan::DataSource_Stream key_input(Test::data_file("misc_certs/opcuactt_ca.pem"));
+   std::unique_ptr<Botan::Private_Key> key = Botan::PKCS8::load_key(key_input);
+   Botan::X509_CA ca(cert, *key, "SHA-256", Test::rng());
+
+   Botan::X509_CRL crl = ca.new_crl(Test::rng());
+
+   result.confirm("matches issuer cert", crl.issuer_dn() == cert.subject_dn());
+
+   result.confirm("contains DC component",
+                  crl.issuer_dn().get_attributes().count(dc_oid) == 1);
+
+   return result;
+   }
+
 Test::Result test_x509_utf8()
    {
    Test::Result result("X509 with UTF-8 encoded fields");
@@ -1219,6 +1244,7 @@ class X509_Cert_Unit_Tests final : public Test
          results.push_back(test_hashes("ECDSA"));
          results.push_back(test_x509_utf8());
          results.push_back(test_x509_bmpstring());
+         results.push_back(test_crl_dn_name());
 
          return results;
          }