Index: ios/web/public/ssl_status.h |
diff --git a/ios/web/public/ssl_status.h b/ios/web/public/ssl_status.h |
index 18549e9d07ec0072184b08862c4b4ada879a97f2..705c6ccb70187b2b009d19c8b1db76dc86f686fe 100644 |
--- a/ios/web/public/ssl_status.h |
+++ b/ios/web/public/ssl_status.h |
@@ -9,6 +9,7 @@ |
#include "ios/web/public/security_style.h" |
#include "net/cert/cert_status_flags.h" |
+#include "net/cert/x509_certificate.h" |
namespace web { |
@@ -27,19 +28,22 @@ struct SSLStatus { |
}; |
SSLStatus(); |
+ SSLStatus(const SSLStatus& other); |
~SSLStatus(); |
bool Equals(const SSLStatus& status) const { |
return security_style == status.security_style && |
- cert_id == status.cert_id && |
+ !!certificate.get() == !!status.certificate.get() && |
+ (certificate.get() ? certificate->Equals(status.certificate.get()) |
Eugene But (OOO till 7-30)
2016/09/08 16:57:46
Should this return false if |certificate| is null
jam
2016/09/08 17:03:24
Yes that should return false since the certificate
|
+ : true) && |
cert_status == status.cert_status && |
security_bits == status.security_bits && |
content_status == status.content_status; |
- // |cert_status_host| is not used for comparison intentionally. |
+ // |cert_status_host| is not used for comparison intentionally. |
} |
web::SecurityStyle security_style; |
- int cert_id; |
+ scoped_refptr<net::X509Certificate> certificate; |
net::CertStatus cert_status; |
int security_bits; |
int connection_status; |