| Index: net/cert/x509_cert_types.h
|
| diff --git a/net/cert/x509_cert_types.h b/net/cert/x509_cert_types.h
|
| deleted file mode 100644
|
| index 4e9340a4c0d8d6195f7ad26d5c4000d3710ed6e4..0000000000000000000000000000000000000000
|
| --- a/net/cert/x509_cert_types.h
|
| +++ /dev/null
|
| @@ -1,98 +0,0 @@
|
| -// Copyright (c) 2012 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 NET_CERT_X509_CERT_TYPES_H_
|
| -#define NET_CERT_X509_CERT_TYPES_H_
|
| -
|
| -#include <string.h>
|
| -
|
| -#include <map>
|
| -#include <set>
|
| -#include <string>
|
| -#include <vector>
|
| -
|
| -#include "base/logging.h"
|
| -#include "base/strings/string_piece.h"
|
| -#include "build/build_config.h"
|
| -#include "net/base/hash_value.h"
|
| -#include "net/base/net_export.h"
|
| -#include "net/cert/cert_status_flags.h"
|
| -
|
| -#if defined(OS_MACOSX) && !defined(OS_IOS)
|
| -#include <Security/x509defs.h>
|
| -#endif
|
| -
|
| -namespace base {
|
| -class Time;
|
| -} // namespace base
|
| -
|
| -namespace net {
|
| -
|
| -class X509Certificate;
|
| -
|
| -// CertPrincipal represents the issuer or subject field of an X.509 certificate.
|
| -struct NET_EXPORT CertPrincipal {
|
| - CertPrincipal();
|
| - explicit CertPrincipal(const std::string& name);
|
| - ~CertPrincipal();
|
| -
|
| -#if (defined(OS_MACOSX) && !defined(OS_IOS)) || defined(OS_WIN)
|
| - // Parses a BER-format DistinguishedName.
|
| - bool ParseDistinguishedName(const void* ber_name_data, size_t length);
|
| -#endif
|
| -
|
| -#if defined(OS_MACOSX) && !defined(OS_IOS)
|
| - // Compare this CertPrincipal with |against|, returning true if they're
|
| - // equal enough to be a possible match. This should NOT be used for any
|
| - // security relevant decisions.
|
| - // TODO(rsleevi): Remove once Mac client auth uses NSS for name comparison.
|
| - bool Matches(const CertPrincipal& against) const;
|
| -#endif
|
| -
|
| - // Returns a name that can be used to represent the issuer. It tries in this
|
| - // order: CN, O and OU and returns the first non-empty one found.
|
| - std::string GetDisplayName() const;
|
| -
|
| - // The different attributes for a principal, stored in UTF-8. They may be "".
|
| - // Note that some of them can have several values.
|
| -
|
| - std::string common_name;
|
| - std::string locality_name;
|
| - std::string state_or_province_name;
|
| - std::string country_name;
|
| -
|
| - std::vector<std::string> street_addresses;
|
| - std::vector<std::string> organization_names;
|
| - std::vector<std::string> organization_unit_names;
|
| - std::vector<std::string> domain_components;
|
| -};
|
| -
|
| -#if defined(OS_MACOSX) && !defined(OS_IOS)
|
| -// Compares two OIDs by value.
|
| -inline bool CSSMOIDEqual(const CSSM_OID* oid1, const CSSM_OID* oid2) {
|
| - return oid1->Length == oid2->Length &&
|
| - (memcmp(oid1->Data, oid2->Data, oid1->Length) == 0);
|
| -}
|
| -#endif
|
| -
|
| -// A list of ASN.1 date/time formats that ParseCertificateDate() supports,
|
| -// encoded in the canonical forms specified in RFC 2459/3280/5280.
|
| -enum CertDateFormat {
|
| - // UTCTime: Format is YYMMDDHHMMSSZ
|
| - CERT_DATE_FORMAT_UTC_TIME,
|
| -
|
| - // GeneralizedTime: Format is YYYYMMDDHHMMSSZ
|
| - CERT_DATE_FORMAT_GENERALIZED_TIME,
|
| -};
|
| -
|
| -// Attempts to parse |raw_date|, an ASN.1 date/time string encoded as
|
| -// |format|, and writes the result into |*time|. If an invalid date is
|
| -// specified, or if parsing fails, returns false, and |*time| will not be
|
| -// updated.
|
| -NET_EXPORT_PRIVATE bool ParseCertificateDate(const base::StringPiece& raw_date,
|
| - CertDateFormat format,
|
| - base::Time* time);
|
| -} // namespace net
|
| -
|
| -#endif // NET_CERT_X509_CERT_TYPES_H_
|
|
|