Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1782)

Unified Diff: net/base/x509_certificate_openssl.cc

Issue 6805019: Move crypto files out of base, to a top level directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Fixes comments by eroman Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/base/x509_certificate_nss.cc ('k') | net/base/x509_certificate_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/x509_certificate_openssl.cc
===================================================================
--- net/base/x509_certificate_openssl.cc (revision 81350)
+++ net/base/x509_certificate_openssl.cc (working copy)
@@ -14,9 +14,9 @@
#include <openssl/x509v3.h>
#include "base/memory/singleton.h"
-#include "base/openssl_util.h"
#include "base/pickle.h"
#include "base/string_number_conversions.h"
+#include "crypto/openssl_util.h"
#include "net/base/cert_status_flags.h"
#include "net/base/cert_verify_result.h"
#include "net/base/net_errors.h"
@@ -31,9 +31,9 @@
void CreateOSCertHandlesFromPKCS7Bytes(
const char* data, int length,
X509Certificate::OSCertHandles* handles) {
- base::EnsureOpenSSLInit();
+ crypto::EnsureOpenSSLInit();
const unsigned char* der_data = reinterpret_cast<const unsigned char*>(data);
- base::ScopedOpenSSL<PKCS7, PKCS7_free> pkcs7_cert(
+ crypto::ScopedOpenSSL<PKCS7, PKCS7_free> pkcs7_cert(
d2i_PKCS7(NULL, &der_data, length));
if (!pkcs7_cert.get())
return;
@@ -99,7 +99,7 @@
if (!alt_name_ext)
return;
- base::ScopedOpenSSL<GENERAL_NAMES, GENERAL_NAMES_free> alt_names(
+ crypto::ScopedOpenSSL<GENERAL_NAMES, GENERAL_NAMES_free> alt_names(
reinterpret_cast<GENERAL_NAMES*>(X509V3_EXT_d2i(alt_name_ext)));
if (!alt_names.get())
return;
@@ -226,14 +226,14 @@
private:
friend struct DefaultSingletonTraits<X509InitSingleton>;
X509InitSingleton() {
- base::EnsureOpenSSLInit();
+ crypto::EnsureOpenSSLInit();
der_cache_ex_index_ = X509_get_ex_new_index(0, 0, 0, 0, DERCache_free);
DCHECK_NE(der_cache_ex_index_, -1);
ResetCertStore();
}
int der_cache_ex_index_;
- base::ScopedOpenSSL<X509_STORE, X509_STORE_free> store_;
+ crypto::ScopedOpenSSL<X509_STORE, X509_STORE_free> store_;
DISALLOW_COPY_AND_ASSIGN(X509InitSingleton);
};
@@ -308,7 +308,7 @@
}
void X509Certificate::Initialize() {
- base::EnsureOpenSSLInit();
+ crypto::EnsureOpenSSLInit();
fingerprint_ = CalculateFingerprint(cert_handle_);
ASN1_INTEGER* num = X509_get_serialNumber(cert_handle_);
@@ -346,7 +346,7 @@
const char* data, int length) {
if (length < 0)
return NULL;
- base::EnsureOpenSSLInit();
+ crypto::EnsureOpenSSLInit();
const unsigned char* d2i_data =
reinterpret_cast<const unsigned char*>(data);
// Don't cache this data via SetDERCache as this wire format may be not be
@@ -395,7 +395,7 @@
// static
X509Certificate* X509Certificate::CreateSelfSigned(
- base::RSAPrivateKey* key,
+ crypto::RSAPrivateKey* key,
const std::string& subject,
uint32 serial_number,
base::TimeDelta valid_duration) {
@@ -444,10 +444,10 @@
if (!VerifyHostname(hostname, cert_names))
verify_result->cert_status |= CERT_STATUS_COMMON_NAME_INVALID;
- base::ScopedOpenSSL<X509_STORE_CTX, X509_STORE_CTX_free> ctx(
+ crypto::ScopedOpenSSL<X509_STORE_CTX, X509_STORE_CTX_free> ctx(
X509_STORE_CTX_new());
- base::ScopedOpenSSL<STACK_OF(X509), sk_X509_free_fn> intermediates(
+ crypto::ScopedOpenSSL<STACK_OF(X509), sk_X509_free_fn> intermediates(
sk_X509_new_null());
if (!intermediates.get())
return ERR_OUT_OF_MEMORY;
« no previous file with comments | « net/base/x509_certificate_nss.cc ('k') | net/base/x509_certificate_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698