OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "net/cert/cert_verify_result.h" | 5 #include "net/cert/cert_verify_result.h" |
6 | 6 |
7 #include <tuple> | 7 #include <tuple> |
8 | 8 |
9 #include "net/cert/x509_certificate.h" | 9 #include "net/cert/x509_certificate.h" |
10 | 10 |
(...skipping 18 matching lines...) Expand all Loading... |
29 has_sha1_leaf = false; | 29 has_sha1_leaf = false; |
30 is_issued_by_known_root = false; | 30 is_issued_by_known_root = false; |
31 is_issued_by_additional_trust_anchor = false; | 31 is_issued_by_additional_trust_anchor = false; |
32 common_name_fallback_used = false; | 32 common_name_fallback_used = false; |
33 | 33 |
34 public_key_hashes.clear(); | 34 public_key_hashes.clear(); |
35 ocsp_result = OCSPVerifyResult(); | 35 ocsp_result = OCSPVerifyResult(); |
36 } | 36 } |
37 | 37 |
38 bool CertVerifyResult::operator==(const CertVerifyResult& other) const { | 38 bool CertVerifyResult::operator==(const CertVerifyResult& other) const { |
39 return verified_cert->Equals(other.verified_cert.get()) && | 39 return (!!verified_cert == !!other.verified_cert) && |
| 40 (!verified_cert || verified_cert->Equals(other.verified_cert.get())) && |
40 std::tie(cert_status, has_md2, has_md4, has_md5, has_sha1, | 41 std::tie(cert_status, has_md2, has_md4, has_md5, has_sha1, |
41 has_sha1_leaf, public_key_hashes, is_issued_by_known_root, | 42 has_sha1_leaf, public_key_hashes, is_issued_by_known_root, |
42 is_issued_by_additional_trust_anchor, | 43 is_issued_by_additional_trust_anchor, |
43 common_name_fallback_used, ocsp_result) == | 44 common_name_fallback_used, ocsp_result) == |
44 std::tie(other.cert_status, other.has_md2, other.has_md4, | 45 std::tie(other.cert_status, other.has_md2, other.has_md4, |
45 other.has_md5, other.has_sha1, other.has_sha1_leaf, | 46 other.has_md5, other.has_sha1, other.has_sha1_leaf, |
46 other.public_key_hashes, other.is_issued_by_known_root, | 47 other.public_key_hashes, other.is_issued_by_known_root, |
47 other.is_issued_by_additional_trust_anchor, | 48 other.is_issued_by_additional_trust_anchor, |
48 other.common_name_fallback_used, other.ocsp_result); | 49 other.common_name_fallback_used, other.ocsp_result); |
49 } | 50 } |
50 | 51 |
51 } // namespace net | 52 } // namespace net |
OLD | NEW |