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

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

Issue 2408063002: Switch remaining scoped_openssl_types uses to BoringSSL scopers. (Closed)
Patch Set: Created 4 years, 2 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
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 ea6c301180fc1f074e87d626246db8b72fe7d717..3e7a9b3a4da6fc69cec746a6c9ce69cf08c778be 100644
--- a/chrome/common/extensions/api/networking_private/networking_private_crypto.cc
+++ b/chrome/common/extensions/api/networking_private/networking_private_crypto.cc
@@ -17,7 +17,6 @@
#include "components/cast_certificate/cast_cert_validator.h"
#include "crypto/openssl_util.h"
#include "crypto/rsa_private_key.h"
-#include "crypto/scoped_openssl_types.h"
#include "net/cert/pem_tokenizer.h"
namespace {
@@ -129,7 +128,7 @@ bool EncryptByteString(const std::vector<uint8_t>& pub_key_der,
crypto::EnsureOpenSSLInit();
crypto::OpenSSLErrStackTracer err_tracer(FROM_HERE);
- crypto::ScopedRSA rsa(
+ bssl::UniquePtr<RSA> 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";
@@ -166,17 +165,17 @@ bool DecryptByteString(const std::string& private_key_pem,
return false;
}
- crypto::ScopedRSA rsa(EVP_PKEY_get1_RSA(private_key->key()));
- if (!rsa || RSA_size(rsa.get()) == 0) {
+ RSA* rsa = EVP_PKEY_get0_RSA(private_key->key());
davidben 2016/10/11 18:58:18 get0 is the same as get1 but doesn't take an unnec
+ if (!rsa || RSA_size(rsa) == 0) {
LOG(ERROR) << "Failed to get RSA key.";
return false;
}
uint8_t* output = reinterpret_cast<uint8_t*>(
- base::WriteInto(decrypted_output, RSA_size(rsa.get()) + 1));
+ base::WriteInto(decrypted_output, RSA_size(rsa) + 1));
int output_length =
RSA_private_decrypt(encrypted_data.size(), &encrypted_data[0], output,
- rsa.get(), RSA_PKCS1_PADDING);
+ rsa, RSA_PKCS1_PADDING);
if (output_length < 0) {
LOG(ERROR) << "Error during decryption.";
return false;

Powered by Google App Engine
This is Rietveld 408576698