summaryrefslogtreecommitdiffstats
path: root/extensions/common/cast/cast_cert_validator_openssl.cc
diff options
context:
space:
mode:
authordavidben <davidben@chromium.org>2015-02-20 16:51:33 -0800
committerCommit bot <commit-bot@chromium.org>2015-02-21 00:53:10 +0000
commite94fe096ed8c20a9388c6b321dc20a4b3eaa0a34 (patch)
tree42937ee5029fd600b1c9e0cd03c0c7d360895461 /extensions/common/cast/cast_cert_validator_openssl.cc
parentc8870c6897b0a970b8475f61e5823761c1b2589a (diff)
downloadchromium_src-e94fe096ed8c20a9388c6b321dc20a4b3eaa0a34.zip
chromium_src-e94fe096ed8c20a9388c6b321dc20a4b3eaa0a34.tar.gz
chromium_src-e94fe096ed8c20a9388c6b321dc20a4b3eaa0a34.tar.bz2
Convert crypto::ScopedOpenSSL to type aliases.
This avoids having to put '::Type' everywhere. BUG=none Review URL: https://codereview.chromium.org/948543002 Cr-Commit-Position: refs/heads/master@{#317462}
Diffstat (limited to 'extensions/common/cast/cast_cert_validator_openssl.cc')
-rw-r--r--extensions/common/cast/cast_cert_validator_openssl.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/extensions/common/cast/cast_cert_validator_openssl.cc b/extensions/common/cast/cast_cert_validator_openssl.cc
index 8c2e4c0..326aa49 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.",