| Index: net/ssl/ssl_config.h
|
| diff --git a/net/ssl/ssl_config.h b/net/ssl/ssl_config.h
|
| index 7ac743e2a017360b4c00e6a71f4b8a4cc843bfa8..59a1b18f2f7e40bb378fc54f2d159946a2ab5d2f 100644
|
| --- a/net/ssl/ssl_config.h
|
| +++ b/net/ssl/ssl_config.h
|
| @@ -56,11 +56,6 @@ struct NET_EXPORT SSLConfig {
|
| // be NULL if user doesn't care about the cert status.
|
| bool IsAllowedBadCert(X509Certificate* cert, CertStatus* cert_status) const;
|
|
|
| - // Same as above except works with DER encoded certificates instead
|
| - // of X509Certificate.
|
| - bool IsAllowedBadCert(const base::StringPiece& der_cert,
|
| - CertStatus* cert_status) const;
|
| -
|
| // Returns the set of flags to use for certificate verification, which is a
|
| // bitwise OR of CertVerifier::VerifyFlags that represent this SSLConfig's
|
| // configuration.
|
| @@ -141,10 +136,12 @@ struct NET_EXPORT SSLConfig {
|
|
|
| struct NET_EXPORT CertAndStatus {
|
| CertAndStatus();
|
| + CertAndStatus(scoped_refptr<X509Certificate> cert, CertStatus status);
|
| + CertAndStatus(const CertAndStatus&);
|
| ~CertAndStatus();
|
|
|
| - std::string der_cert;
|
| - CertStatus cert_status;
|
| + scoped_refptr<X509Certificate> cert;
|
| + CertStatus cert_status = 0;
|
| };
|
|
|
| // Add any known-bad SSL certificate (with its cert status) to
|
|
|