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

Unified Diff: chrome/common/extensions/api/networking_private/networking_private_crypto.cc

Issue 1452853002: Convert vector_as_array to vector::data in //chrome{,cast,os}. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@vector-data
Patch Set: Created 5 years, 1 month 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
Index: chrome/common/extensions/api/networking_private/networking_private_crypto.cc
diff --git a/chrome/common/extensions/api/networking_private/networking_private_crypto.cc b/chrome/common/extensions/api/networking_private/networking_private_crypto.cc
index 62d49fe19078552e78d4060ce000db31188ab226..b02c79842f28cab50e59e9c15eadcfd106931c26 100644
--- a/chrome/common/extensions/api/networking_private/networking_private_crypto.cc
+++ b/chrome/common/extensions/api/networking_private/networking_private_crypto.cc
@@ -11,7 +11,6 @@
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
-#include "base/stl_util.h"
#include "base/strings/string_util.h"
#include "crypto/openssl_util.h"
#include "crypto/rsa_private_key.h"
@@ -116,8 +115,8 @@ bool EncryptByteString(const std::vector<uint8_t>& pub_key_der,
crypto::EnsureOpenSSLInit();
crypto::OpenSSLErrStackTracer err_tracer(FROM_HERE);
- crypto::ScopedRSA rsa(RSA_public_key_from_bytes(vector_as_array(&pub_key_der),
- pub_key_der.size()));
+ crypto::ScopedRSA rsa(
+ RSA_public_key_from_bytes(pub_key_der.data(), pub_key_der.size()));
if (!rsa || RSA_size(rsa.get()) == 0) {
LOG(ERROR) << "Failed to parse public key";
return false;
@@ -126,7 +125,7 @@ bool EncryptByteString(const std::vector<uint8_t>& pub_key_der,
encrypted_output->resize(RSA_size(rsa.get()));
int encrypted_length = RSA_public_encrypt(
data.size(), reinterpret_cast<const uint8_t*>(data.data()),
- vector_as_array(encrypted_output), rsa.get(), RSA_PKCS1_PADDING);
+ encrypted_output->data(), rsa.get(), RSA_PKCS1_PADDING);
if (encrypted_length < 0) {
LOG(ERROR) << "Error during decryption";
return false;
« no previous file with comments | « chrome/browser/policy/test/local_policy_test_server.cc ('k') | chromecast/media/cdm/chromecast_init_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698