Move some functions from net/cert/x509_util_nss.cc into x509_certificate_nss.cc

net/cert/x509_util_nss.h

Index: net/cert/x509_util_nss.h
diff --git a/net/cert/x509_util_nss.h b/net/cert/x509_util_nss.h
index b5dfe795dfb3f1633e37b30f8b2817612121e2e0..7acabdf296ce5ce6e2499abde00412dd0c1c0cdb 100644
--- a/net/cert/x509_util_nss.h
+++ b/net/cert/x509_util_nss.h
@@ -10,44 +10,16 @@
 #include <string>
 #include <vector>
 
-#include "base/time/time.h"
 #include "net/base/net_export.h"
-#include "net/cert/x509_certificate.h"
-
-namespace base {
-class PickleIterator;
-}
 
 typedef struct CERTCertificateStr CERTCertificate;
-typedef struct CERTNameStr CERTName;
 typedef struct PK11SlotInfoStr PK11SlotInfo;
-typedef struct PLArenaPool PLArenaPool;
 typedef struct SECItemStr SECItem;
 
 namespace net {
 
 namespace x509_util {
 
-// Parses the Principal attribute from |name| and outputs the result in
-// |principal|. Returns true on success.
-bool ParsePrincipal(CERTName* name, CertPrincipal* principal);
-
-// Parses the date from |der_date| and outputs the result in |result|.
-// Returns true on success.
-bool ParseDate(const SECItem* der_date, base::Time* result);
-
-// Parses the serial number from |certificate|.
-std::string ParseSerialNumber(const CERTCertificate* certificate);
-
-// Gets the dNSName and iPAddress name fields from the subjectAltName
-// extension of |cert_handle|.
-// If |dns_names| is non-null, each dNSName will be stored in |*dns_names|.
-// If |ip_addrs| is non-null, each iPAddress will be stored in |*ip_addrs|.
-// Returns true if any dNSName or iPAddress was present.
-bool GetSubjectAltName(CERTCertificate* cert_handle,
-                       std::vector<std::string>* dns_names,
-                       std::vector<std::string>* ip_addrs);
-
 // Stores the values of all rfc822Name subjectAltNames from |cert_handle|
 // into |names|. If no names are present, clears |names|.
 // WARNING: This method does not validate that the rfc822Name is
@@ -77,45 +49,6 @@ NET_EXPORT void GetRFC822SubjectAltNames(CERTCertificate* cert_handle,
 NET_EXPORT void GetUPNSubjectAltNames(CERTCertificate* cert_handle,
                                       std::vector<std::string>* names);
 
-// Creates all possible OS certificate handles from |data| encoded in a specific
-// |format|. Returns an empty collection on failure.
-X509Certificate::OSCertHandles CreateOSCertHandlesFromBytes(
-    const char* data,
-    size_t length,
-    X509Certificate::Format format);
-
-// Reads a single certificate from |pickle_iter| and returns a platform-specific
-// certificate handle. Returns an invalid handle, NULL, on failure.
-X509Certificate::OSCertHandle ReadOSCertHandleFromPickle(
-    base::PickleIterator* pickle_iter);
-
-// Sets |*size_bits| to be the length of the public key in bits, and sets
-// |*type| to one of the |PublicKeyType| values. In case of
-// |kPublicKeyTypeUnknown|, |*size_bits| will be set to 0.
-void GetPublicKeyInfo(CERTCertificate* handle,
-                      size_t* size_bits,
-                      X509Certificate::PublicKeyType* type);
-
-// Create a list of CERTName objects from a list of DER-encoded X.509
-// DistinguishedName items. All objects are created in a given arena.
-// |encoded_issuers| is the list of encoded DNs.
-// |arena| is the arena used for all allocations.
-// |out| will receive the result list on success.
-// Return true on success. On failure, the caller must free the
-// intermediate CERTName objects pushed to |out|.
-bool GetIssuersFromEncodedList(
-    const std::vector<std::string>& issuers,
-    PLArenaPool* arena,
-    std::vector<CERTName*>* out);
-
-// Returns true iff a certificate is issued by any of the issuers listed
-// by name in |valid_issuers|.
-// |cert_chain| is the certificate's chain.
-// |valid_issuers| is a list of strings, where each string contains
-// a DER-encoded X.509 Distinguished Name.
-bool IsCertificateIssuedBy(const std::vector<CERTCertificate*>& cert_chain,
-                           const std::vector<CERTName*>& valid_issuers);
-
 // Generates a unique nickname for |slot|, returning |nickname| if it is
 // already unique.
 //