Copy some x509_certificate_model_nss functions to src/chromeos

chromeos/network/certificate_helper.h

Index: chromeos/network/certificate_helper.h
diff --git a/chromeos/network/certificate_helper.h b/chromeos/network/certificate_helper.h
new file mode 100644
index 0000000000000000000000000000000000000000..388b4f81c7fdf4207c587e9145841b27537f6c20
--- /dev/null
+++ b/chromeos/network/certificate_helper.h
@@ -0,0 +1,45 @@
+// Copyright 2017 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.
+
+#ifndef CHROMEOS_NETWORK_CERTIFICATE_HELPER_H_
+#define CHROMEOS_NETWORK_CERTIFICATE_HELPER_H_
+
+#include <cert.h>
+#include <string>
+
+#include "net/cert/cert_type.h"
+#include "net/cert/x509_certificate.h"
+
+namespace chromeos {
+namespace certificate {
+
+// Selected functions from chrome/common/net/x509_certificate_model.cc
+
+// Decodes the certificate type from |cert|.
+net::CertType GetCertType(net::X509Certificate::OSCertHandle cert);
+
+// Extracts the token name from |cert|->slot if it exists or returns an empty
+// string.
+std::string GetCertTokenName(CERTCertificate* cert);

[pmarko, 2017/05/11 12:32:46]

This is the only one taking CERTCertificate* instead of OSCertHandle, but I see
that it gets the same thing passed in at the callsite as GetCertType. Is that
fine?

[stevenjb, 2017/05/12 19:27:50]

That's a good catch. I copied this one from nsNSSCertificate.h which is why it
is different.

X509Certificate::OSCertHandle is typedef'd to 'struct CERTCertificateStr' in
x509_certificate.h, and CERTCertificateStr is typedefid to CERTCertificate in
x509_util_nss.h, so that is why this works.

I will change this to use net::X509Certificate::OSCertHandle instead for
consistency.

[mattm, 2017/05/12 22:27:54]

Just fyi, in the future OSCertHandle will not be a CERTCertificate (see
crbug.com/671420). So you could make things that will be a CERTCertificate
explicitly say that. Or not. There's tons of stuff that will need to be changed,
so don't worry about it if you don't want to.

+
+// Returns the common name for |cert_handle|->issuer or |alternative_text| if
+// the common name is missing or empty.
+std::string GetIssuerCommonName(net::X509Certificate::OSCertHandle cert_handle,
+                                const std::string& alternative_text);
+
+// Returns the common name for |cert_handle|->subject converted to unicode,
+// or |cert_handle|->nickname if it is unavailable or empty.

[tbarzic, 2017/05/11 19:48:31]

nit: s/it/the subject name/

[stevenjb, 2017/05/12 19:27:50]

Done.

+// NOTE: Unlike x509_certificate_model::GetCertNameOrNickname in src/chrome,
+// this does not include the raw unformatted version.

[tbarzic, 2017/05/11 19:48:31]

wdyt about:
Unlike x509_certificate_model::GetCertNameOrNickname in src/chrome,
the raw unformated name or nickmane will not be included in the returned value.

[stevenjb, 2017/05/12 19:27:50]

Done.

+std::string GetCertNameOrNickname(
+    net::X509Certificate::OSCertHandle cert_handle);
+
+// Returns the unformated ASCII common name for |cert_handle|->subject.
+std::string GetCertAsciiNameOrNickname(
+    net::X509Certificate::OSCertHandle cert_handle);
+
+}  // namespace certificate
+}  // namespace chromeos
+
+#endif  // CHROMEOS_NETWORK_CERTIFICATE_HELPER_H_