summaryrefslogtreecommitdiffstats
path: root/net
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 /net
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 'net')
-rw-r--r--net/base/keygen_handler_openssl.cc2
-rw-r--r--net/cert/cert_verify_proc_openssl.cc4
-rw-r--r--net/cert/ct_objects_extractor_openssl.cc4
-rw-r--r--net/cert/sha256_legacy_support_openssl_win.cc5
-rw-r--r--net/cert/x509_certificate_openssl.cc8
-rw-r--r--net/cert/x509_util_openssl.cc19
-rw-r--r--net/cert/x509_util_openssl_unittest.cc2
-rw-r--r--net/socket/ssl_client_socket_openssl.cc3
-rw-r--r--net/ssl/scoped_openssl_types.h8
9 files changed, 26 insertions, 29 deletions
diff --git a/net/base/keygen_handler_openssl.cc b/net/base/keygen_handler_openssl.cc
index aeb64a8..38bb81a 100644
--- a/net/base/keygen_handler_openssl.cc
+++ b/net/base/keygen_handler_openssl.cc
@@ -23,7 +23,7 @@ std::string KeygenHandler::GenKeyAndSignChallenge() {
if (stores_key_)
OpenSSLPrivateKeyStore::StoreKeyPair(url_, pkey);
- crypto::ScopedOpenSSL<NETSCAPE_SPKI, NETSCAPE_SPKI_free>::Type spki(
+ crypto::ScopedOpenSSL<NETSCAPE_SPKI, NETSCAPE_SPKI_free> spki(
NETSCAPE_SPKI_new());
ASN1_STRING_set(spki.get()->spkac->challenge,
challenge_.data(), challenge_.size());
diff --git a/net/cert/cert_verify_proc_openssl.cc b/net/cert/cert_verify_proc_openssl.cc
index a74bbc3..890462e 100644
--- a/net/cert/cert_verify_proc_openssl.cc
+++ b/net/cert/cert_verify_proc_openssl.cc
@@ -204,10 +204,10 @@ int CertVerifyProcOpenSSL::VerifyInternal(
verify_result->cert_status |= CERT_STATUS_COMMON_NAME_INVALID;
}
- crypto::ScopedOpenSSL<X509_STORE_CTX, X509_STORE_CTX_free>::Type ctx(
+ crypto::ScopedOpenSSL<X509_STORE_CTX, X509_STORE_CTX_free> ctx(
X509_STORE_CTX_new());
- crypto::ScopedOpenSSL<STACK_OF(X509), sk_X509_free_fn>::Type intermediates(
+ crypto::ScopedOpenSSL<STACK_OF(X509), sk_X509_free_fn> intermediates(
sk_X509_new_null());
if (!intermediates.get())
return ERR_OUT_OF_MEMORY;
diff --git a/net/cert/ct_objects_extractor_openssl.cc b/net/cert/ct_objects_extractor_openssl.cc
index 7ec241f..80fed58 100644
--- a/net/cert/ct_objects_extractor_openssl.cc
+++ b/net/cert/ct_objects_extractor_openssl.cc
@@ -29,8 +29,8 @@ void FreeX509_EXTENSIONS(X509_EXTENSIONS* ptr) {
sk_X509_EXTENSION_pop_free(ptr, X509_EXTENSION_free);
}
-typedef crypto::ScopedOpenSSL<X509_EXTENSIONS, FreeX509_EXTENSIONS>::Type
- ScopedX509_EXTENSIONS;
+using ScopedX509_EXTENSIONS =
+ crypto::ScopedOpenSSL<X509_EXTENSIONS, FreeX509_EXTENSIONS>;
// The wire form of the OID 1.3.6.1.4.1.11129.2.4.2. See Section 3.3 of
// RFC6962.
diff --git a/net/cert/sha256_legacy_support_openssl_win.cc b/net/cert/sha256_legacy_support_openssl_win.cc
index 991f051..2c5fc70 100644
--- a/net/cert/sha256_legacy_support_openssl_win.cc
+++ b/net/cert/sha256_legacy_support_openssl_win.cc
@@ -18,8 +18,7 @@ namespace sha256_interception {
namespace {
-typedef crypto::ScopedOpenSSL<X509_ALGOR, X509_ALGOR_free>::Type
- ScopedX509_ALGOR;
+using ScopedX509_ALGOR = crypto::ScopedOpenSSL<X509_ALGOR, X509_ALGOR_free>;
// Parses |subject_signature| and writes the components into |*out_tbs_data|,
// |*out_algor|, and |*out_signature|. The BIT STRING in the signature must be
@@ -151,4 +150,4 @@ BOOL CryptVerifyCertificateSignatureExHook(
} // namespace sha256_interception
-} // namespace net \ No newline at end of file
+} // namespace net
diff --git a/net/cert/x509_certificate_openssl.cc b/net/cert/x509_certificate_openssl.cc
index e92f3a1..5d043d1 100644
--- a/net/cert/x509_certificate_openssl.cc
+++ b/net/cert/x509_certificate_openssl.cc
@@ -34,8 +34,8 @@ namespace net {
namespace {
-typedef crypto::ScopedOpenSSL<GENERAL_NAMES, GENERAL_NAMES_free>::Type
- ScopedGENERAL_NAMES;
+using ScopedGENERAL_NAMES =
+ crypto::ScopedOpenSSL<GENERAL_NAMES, GENERAL_NAMES_free>;
void CreateOSCertHandlesFromPKCS7Bytes(
const char* data, int length,
@@ -161,7 +161,7 @@ class X509InitSingleton {
ResetCertStore();
}
- crypto::ScopedOpenSSL<X509_STORE, X509_STORE_free>::Type store_;
+ crypto::ScopedOpenSSL<X509_STORE, X509_STORE_free> store_;
DISALLOW_COPY_AND_ASSIGN(X509InitSingleton);
};
@@ -404,7 +404,7 @@ bool X509Certificate::IsIssuedByEncoded(
// Convert to a temporary list of X509_NAME objects.
// It will own the objects it points to.
- crypto::ScopedOpenSSL<STACK_OF(X509_NAME), sk_X509_NAME_free_all>::Type
+ crypto::ScopedOpenSSL<STACK_OF(X509_NAME), sk_X509_NAME_free_all>
issuer_names(sk_X509_NAME_new_null());
if (!issuer_names.get())
return false;
diff --git a/net/cert/x509_util_openssl.cc b/net/cert/x509_util_openssl.cc
index 8ecd0dd..6bbf12d 100644
--- a/net/cert/x509_util_openssl.cc
+++ b/net/cert/x509_util_openssl.cc
@@ -23,16 +23,15 @@ namespace net {
namespace {
-typedef crypto::ScopedOpenSSL<ASN1_INTEGER, ASN1_INTEGER_free>::Type
- ScopedASN1_INTEGER;
-typedef crypto::ScopedOpenSSL<ASN1_OCTET_STRING, ASN1_OCTET_STRING_free>::Type
- ScopedASN1_OCTET_STRING;
-typedef crypto::ScopedOpenSSL<ASN1_STRING, ASN1_STRING_free>::Type
- ScopedASN1_STRING;
-typedef crypto::ScopedOpenSSL<ASN1_TIME, ASN1_TIME_free>::Type ScopedASN1_TIME;
-typedef crypto::ScopedOpenSSL<X509_EXTENSION, X509_EXTENSION_free>::Type
- ScopedX509_EXTENSION;
-typedef crypto::ScopedOpenSSL<X509_NAME, X509_NAME_free>::Type ScopedX509_NAME;
+using ScopedASN1_INTEGER =
+ crypto::ScopedOpenSSL<ASN1_INTEGER, ASN1_INTEGER_free>;
+using ScopedASN1_OCTET_STRING =
+ crypto::ScopedOpenSSL<ASN1_OCTET_STRING, ASN1_OCTET_STRING_free>;
+using ScopedASN1_STRING = crypto::ScopedOpenSSL<ASN1_STRING, ASN1_STRING_free>;
+using ScopedASN1_TIME = crypto::ScopedOpenSSL<ASN1_TIME, ASN1_TIME_free>;
+using ScopedX509_EXTENSION =
+ crypto::ScopedOpenSSL<X509_EXTENSION, X509_EXTENSION_free>;
+using ScopedX509_NAME = crypto::ScopedOpenSSL<X509_NAME, X509_NAME_free>;
const EVP_MD* ToEVP(x509_util::DigestAlgorithm alg) {
switch (alg) {
diff --git a/net/cert/x509_util_openssl_unittest.cc b/net/cert/x509_util_openssl_unittest.cc
index b6a2afe..070fba4 100644
--- a/net/cert/x509_util_openssl_unittest.cc
+++ b/net/cert/x509_util_openssl_unittest.cc
@@ -46,7 +46,7 @@ void VerifyChannelID(const std::string& domain,
const std::string& der_cert) {
// Origin Bound Cert OID.
static const char oid_string[] = "1.3.6.1.4.1.11129.2.1.6";
- crypto::ScopedOpenSSL<ASN1_OBJECT, ASN1_OBJECT_free>::Type oid_obj(
+ crypto::ScopedOpenSSL<ASN1_OBJECT, ASN1_OBJECT_free> oid_obj(
OBJ_txt2obj(oid_string, 0));
ASSERT_TRUE(oid_obj.get());
diff --git a/net/socket/ssl_client_socket_openssl.cc b/net/socket/ssl_client_socket_openssl.cc
index 764ce9e..f166b69 100644
--- a/net/socket/ssl_client_socket_openssl.cc
+++ b/net/socket/ssl_client_socket_openssl.cc
@@ -78,8 +78,7 @@ void FreeX509Stack(STACK_OF(X509)* ptr) {
sk_X509_pop_free(ptr, X509_free);
}
-typedef crypto::ScopedOpenSSL<STACK_OF(X509), FreeX509Stack>::Type
- ScopedX509Stack;
+using ScopedX509Stack = crypto::ScopedOpenSSL<STACK_OF(X509), FreeX509Stack>;
#if OPENSSL_VERSION_NUMBER < 0x1000103fL
// This method doesn't seem to have made it into the OpenSSL headers.
diff --git a/net/ssl/scoped_openssl_types.h b/net/ssl/scoped_openssl_types.h
index ca3b8f5..8bbdbd5 100644
--- a/net/ssl/scoped_openssl_types.h
+++ b/net/ssl/scoped_openssl_types.h
@@ -13,10 +13,10 @@
namespace net {
using ScopedPKCS8_PRIV_KEY_INFO =
- crypto::ScopedOpenSSL<PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO_free>::Type;
-using ScopedSSL = crypto::ScopedOpenSSL<SSL, SSL_free>::Type;
-using ScopedSSL_CTX = crypto::ScopedOpenSSL<SSL_CTX, SSL_CTX_free>::Type;
-using ScopedX509 = crypto::ScopedOpenSSL<X509, X509_free>::Type;
+ crypto::ScopedOpenSSL<PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO_free>;
+using ScopedSSL = crypto::ScopedOpenSSL<SSL, SSL_free>;
+using ScopedSSL_CTX = crypto::ScopedOpenSSL<SSL_CTX, SSL_CTX_free>;
+using ScopedX509 = crypto::ScopedOpenSSL<X509, X509_free>;
} // namespace net
generated by cgit v1.1 at 2025-03-11 01:38:09 +0000