x509_certificate_model_openssl: implement GetCertNameOrNickname, GetTitle

chrome/common/net/x509_certificate_model_openssl.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/net/x509_certificate_model.h"
 
 #include <openssl/obj_mac.h>
 #include <openssl/sha.h>
 #include <openssl/x509v3.h>
 
@@ skipping 26 matching lines @@
   return ret;
 }
 
 }  // namespace
 
 namespace x509_certificate_model {
 
 using net::X509Certificate;
 
 std::string GetCertNameOrNickname(X509Certificate::OSCertHandle cert_handle) {
-  // TODO(bulach): implement me.
-  return "";
+  std::string name =
+      ProcessIDN(GetSubjectCommonName(cert_handle, std::string()));
+  if (!name.empty())
+    return name;
+
+  char buf[256];
+  if (X509_NAME_oneline(X509_get_subject_name(cert_handle), buf, sizeof(buf)))

[Ryan Sleevi, 2014/05/15 05:53:05]

1) X509_NAME_online is deprecated and has been for some time.
2) Using a fixed buffer is non-ideal.

Luckily, switching to X509_NAME_print_ex to a memory BIO will handle both cases.

[mattm, 2014/05/20 06:29:32]

Done.

+    return buf;
+
+  return std::string();
 }
 
 std::string GetTokenName(X509Certificate::OSCertHandle cert_handle) {
   // TODO(bulach): implement me.
   return "";
 }
 
 std::string GetVersion(net::X509Certificate::OSCertHandle cert_handle) {
   unsigned long version = X509_get_version(cert_handle);
   if (version != ULONG_MAX)
@@ skipping 74 matching lines @@
   return AlternativeWhenEmpty(ret, alternative_text);
 }
 
 bool GetTimes(X509Certificate::OSCertHandle cert_handle,
               base::Time* issued, base::Time* expires) {
   return x509_util::ParseDate(X509_get_notBefore(cert_handle), issued) &&
          x509_util::ParseDate(X509_get_notAfter(cert_handle), expires);
 }
 
 std::string GetTitle(net::X509Certificate::OSCertHandle cert_handle) {
-  // TODO(bulach): implement me.
-  return "";
+  // TODO(mattm): merge GetTitle and GetCertNameOrNickname?
+  // Is there any reason GetCertNameOrNickname calls ProcessIDN and this
+  // doesn't?
+  std::string title =
+      GetSubjectCommonName(cert_handle, std::string());
+  if (!title.empty())
+    return title;
+
+  char buf[256];
+  if (X509_NAME_oneline(X509_get_subject_name(cert_handle), buf, sizeof(buf)))
+    return buf;
+
+  return std::string();
 }
 
 std::string GetIssuerName(net::X509Certificate::OSCertHandle cert_handle) {
   return GetKeyValuesFromName(X509_get_issuer_name(cert_handle));
 }
 
 std::string GetSubjectName(net::X509Certificate::OSCertHandle cert_handle) {
   return GetKeyValuesFromName(X509_get_subject_name(cert_handle));
 }
 
@@ skipping 71 matching lines @@
   return "";
 }
 
 std::string ProcessRawBitsSignatureWrap(
     net::X509Certificate::OSCertHandle cert_handle) {
   // TODO(bulach): implement me.
   return "";
 }
 
 }  // namespace x509_certificate_model