| Index: net/cert/cert_verify_proc_android.cc
|
| diff --git a/net/cert/cert_verify_proc_android.cc b/net/cert/cert_verify_proc_android.cc
|
| index bd747267a2e0c293465020e2ff35497d806f8c74..66ff8ba73089baf4d15f74cd5f3921ae5946ddb3 100644
|
| --- a/net/cert/cert_verify_proc_android.cc
|
| +++ b/net/cert/cert_verify_proc_android.cc
|
| @@ -32,8 +32,11 @@ bool VerifyFromAndroidTrustManager(const std::vector<std::string>& cert_bytes,
|
| std::vector<std::string> verified_chain;
|
|
|
| // TODO(joth): Fetch the authentication type from SSL rather than hardcode.
|
| - android::VerifyX509CertChain(cert_bytes, "RSA", hostname,
|
| - &status, &verify_result->is_issued_by_known_root,
|
| + android::VerifyX509CertChain(cert_bytes,
|
| + "RSA",
|
| + hostname,
|
| + &status,
|
| + &verify_result->is_issued_by_known_root,
|
| &verified_chain);
|
| switch (status) {
|
| case android::VERIFY_FAILED:
|
| @@ -79,7 +82,8 @@ bool VerifyFromAndroidTrustManager(const std::vector<std::string>& cert_bytes,
|
|
|
| HashValue sha1(HASH_VALUE_SHA1);
|
| base::SHA1HashBytes(reinterpret_cast<const uint8*>(spki_bytes.data()),
|
| - spki_bytes.size(), sha1.data());
|
| + spki_bytes.size(),
|
| + sha1.data());
|
| verify_result->public_key_hashes.push_back(sha1);
|
|
|
| HashValue sha256(HASH_VALUE_SHA256);
|
| @@ -102,10 +106,11 @@ bool GetChainDEREncodedBytes(X509Certificate* cert,
|
| cert_handles.insert(cert_handles.begin(), cert_handle);
|
|
|
| chain_bytes->reserve(cert_handles.size());
|
| - for (X509Certificate::OSCertHandles::const_iterator it =
|
| - cert_handles.begin(); it != cert_handles.end(); ++it) {
|
| + for (X509Certificate::OSCertHandles::const_iterator it = cert_handles.begin();
|
| + it != cert_handles.end();
|
| + ++it) {
|
| std::string cert_bytes;
|
| - if(!X509Certificate::GetDEREncoded(*it, &cert_bytes))
|
| + if (!X509Certificate::GetDEREncoded(*it, &cert_bytes))
|
| return false;
|
| chain_bytes->push_back(cert_bytes);
|
| }
|
| @@ -114,9 +119,11 @@ bool GetChainDEREncodedBytes(X509Certificate* cert,
|
|
|
| } // namespace
|
|
|
| -CertVerifyProcAndroid::CertVerifyProcAndroid() {}
|
| +CertVerifyProcAndroid::CertVerifyProcAndroid() {
|
| +}
|
|
|
| -CertVerifyProcAndroid::~CertVerifyProcAndroid() {}
|
| +CertVerifyProcAndroid::~CertVerifyProcAndroid() {
|
| +}
|
|
|
| bool CertVerifyProcAndroid::SupportsAdditionalTrustAnchors() const {
|
| return false;
|
|
|