| Index: extensions/common/cast/cast_cert_validator_openssl.cc
|
| diff --git a/extensions/common/cast/cast_cert_validator_openssl.cc b/extensions/common/cast/cast_cert_validator_openssl.cc
|
| index 8c2e4c0721ed7019e8b07651538d16ab624490a3..326aa498db4167cc83b5f0e964d9ca79ca0117cf 100644
|
| --- a/extensions/common/cast/cast_cert_validator_openssl.cc
|
| +++ b/extensions/common/cast/cast_cert_validator_openssl.cc
|
| @@ -18,14 +18,13 @@
|
| #include "extensions/browser/api/cast_channel/cast_auth_ica.h"
|
| #include "net/cert/x509_certificate.h"
|
| #include "net/cert/x509_util_openssl.h"
|
| +#include "net/ssl/scoped_openssl_types.h"
|
|
|
| namespace extensions {
|
| namespace core_api {
|
| namespace cast_crypto {
|
| namespace {
|
|
|
| -typedef crypto::ScopedOpenSSL<X509, X509_free>::Type ScopedX509;
|
| -
|
| class CertVerificationContextOpenSSL : public CertVerificationContext {
|
| public:
|
| // Takes ownership of the passed-in x509 object
|
| @@ -80,7 +79,7 @@ class CertVerificationContextOpenSSL : public CertVerificationContext {
|
| }
|
|
|
| private:
|
| - ScopedX509 x509_;
|
| + net::ScopedX509 x509_;
|
| };
|
|
|
| } // namespace
|
| @@ -127,7 +126,7 @@ VerificationResult VerifyDeviceCert(
|
| const uint8_t* device_cert_der_ptr =
|
| reinterpret_cast<const uint8_t*>(device_cert.data());
|
| const uint8_t* device_cert_der_end = device_cert_der_ptr + device_cert.size();
|
| - ScopedX509 device_cert_x509(
|
| + net::ScopedX509 device_cert_x509(
|
| d2i_X509(NULL, &device_cert_der_ptr, device_cert.size()));
|
| if (!device_cert_x509 || device_cert_der_ptr != device_cert_der_end) {
|
| return VerificationResult("Failed to parse device certificate.",
|
|
|