| Index: net/cert/x509_certificate.h
|
| diff --git a/net/cert/x509_certificate.h b/net/cert/x509_certificate.h
|
| index 7aa48f068fa12867bd59beb9014dc078c60654ae..620e30a281844eec923cebe5e4311728bc159f90 100644
|
| --- a/net/cert/x509_certificate.h
|
| +++ b/net/cert/x509_certificate.h
|
| @@ -51,9 +51,9 @@ typedef std::vector<scoped_refptr<X509Certificate> > CertificateList;
|
| class NET_EXPORT X509Certificate
|
| : public base::RefCountedThreadSafe<X509Certificate> {
|
| public:
|
| - // An OSCertHandle is a handle to a certificate object in the underlying
|
| - // crypto library. We assume that OSCertHandle is a pointer type on all
|
| - // platforms and that NULL represents an invalid OSCertHandle.
|
| +// An OSCertHandle is a handle to a certificate object in the underlying
|
| +// crypto library. We assume that OSCertHandle is a pointer type on all
|
| +// platforms and that NULL represents an invalid OSCertHandle.
|
| #if defined(OS_WIN)
|
| typedef PCCERT_CONTEXT OSCertHandle;
|
| #elif defined(OS_MACOSX)
|
| @@ -103,8 +103,8 @@ class NET_EXPORT X509Certificate
|
| FORMAT_PKCS7 = 1 << 2,
|
|
|
| // Automatically detect the format.
|
| - FORMAT_AUTO = FORMAT_SINGLE_CERTIFICATE | FORMAT_PEM_CERT_SEQUENCE |
|
| - FORMAT_PKCS7,
|
| + FORMAT_AUTO =
|
| + FORMAT_SINGLE_CERTIFICATE | FORMAT_PEM_CERT_SEQUENCE | FORMAT_PKCS7,
|
| };
|
|
|
| // PickleType is intended for deserializing certificates that were pickled
|
| @@ -133,8 +133,10 @@ class NET_EXPORT X509Certificate
|
|
|
| // Creates a X509Certificate from the ground up. Used by tests that simulate
|
| // SSL connections.
|
| - X509Certificate(const std::string& subject, const std::string& issuer,
|
| - base::Time start_date, base::Time expiration_date);
|
| + X509Certificate(const std::string& subject,
|
| + const std::string& issuer,
|
| + base::Time start_date,
|
| + base::Time expiration_date);
|
|
|
| // Create an X509Certificate from a handle to the certificate object in the
|
| // underlying crypto library. The returned pointer must be stored in a
|
| @@ -218,9 +220,7 @@ class NET_EXPORT X509Certificate
|
| const SHA1HashValue& fingerprint() const { return fingerprint_; }
|
|
|
| // The fingerprint of the intermediate CA certificates.
|
| - const SHA1HashValue& ca_fingerprint() const {
|
| - return ca_fingerprint_;
|
| - }
|
| + const SHA1HashValue& ca_fingerprint() const { return ca_fingerprint_; }
|
|
|
| // Gets the DNS names in the certificate. Pursuant to RFC 2818, Section 3.1
|
| // Server Identity, if the certificate has a subjectAltName extension of
|
| @@ -321,8 +321,7 @@ class NET_EXPORT X509Certificate
|
|
|
| // Obtains the DER encoded certificate data for |cert_handle|. On success,
|
| // returns true and writes the DER encoded certificate to |*der_encoded|.
|
| - static bool GetDEREncoded(OSCertHandle cert_handle,
|
| - std::string* der_encoded);
|
| + static bool GetDEREncoded(OSCertHandle cert_handle, std::string* der_encoded);
|
|
|
| // Returns the PEM encoded data from a DER encoded certificate. If the return
|
| // value is true, then the PEM encoded certificate is written to
|
| @@ -332,8 +331,7 @@ class NET_EXPORT X509Certificate
|
|
|
| // Returns the PEM encoded data from an OSCertHandle. If the return value is
|
| // true, then the PEM encoded certificate is written to |pem_encoded|.
|
| - static bool GetPEMEncoded(OSCertHandle cert_handle,
|
| - std::string* pem_encoded);
|
| + static bool GetPEMEncoded(OSCertHandle cert_handle, std::string* pem_encoded);
|
|
|
| // Encodes the entire certificate chain (this certificate and any
|
| // intermediate certificates stored in |intermediate_ca_certs_|) as a series
|
| @@ -361,8 +359,7 @@ class NET_EXPORT X509Certificate
|
|
|
| // Creates an OS certificate handle from the DER-encoded representation.
|
| // Returns NULL on failure.
|
| - static OSCertHandle CreateOSCertHandleFromBytes(const char* data,
|
| - int length);
|
| + static OSCertHandle CreateOSCertHandleFromBytes(const char* data, int length);
|
|
|
| #if defined(USE_NSS)
|
| // Creates an OS certificate handle from the DER-encoded representation.
|
| @@ -376,10 +373,9 @@ class NET_EXPORT X509Certificate
|
|
|
| // Creates all possible OS certificate handles from |data| encoded in a
|
| // specific |format|. Returns an empty collection on failure.
|
| - static OSCertHandles CreateOSCertHandlesFromBytes(
|
| - const char* data,
|
| - int length,
|
| - Format format);
|
| + static OSCertHandles CreateOSCertHandlesFromBytes(const char* data,
|
| + int length,
|
| + Format format);
|
|
|
| // Duplicates (or adds a reference to) an OS certificate handle.
|
| static OSCertHandle DupOSCertHandle(OSCertHandle cert_handle);
|
| @@ -405,8 +401,7 @@ class NET_EXPORT X509Certificate
|
|
|
| // Construct an X509Certificate from a handle to the certificate object
|
| // in the underlying crypto library.
|
| - X509Certificate(OSCertHandle cert_handle,
|
| - const OSCertHandles& intermediates);
|
| + X509Certificate(OSCertHandle cert_handle, const OSCertHandles& intermediates);
|
|
|
| ~X509Certificate();
|
|
|
|
|