Switch remaining scoped_openssl_types uses to BoringSSL scopers.

chrome/common/extensions/api/networking_private/networking_private_crypto.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/extensions/api/networking_private/networking_private_crypto.h"
 
 #include <openssl/digest.h>
 #include <openssl/evp.h>
 #include <openssl/rsa.h>
 #include <openssl/x509.h>
 #include <stddef.h>
 
 #include <memory>
 
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #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 {
 
 namespace cast_crypto = ::cast_certificate;
 
 // Parses |pem_data| for a PEM block of |pem_type|.
 // Returns true if a |pem_type| block is found, storing the decoded result in
 // |der_output|.
 bool GetDERFromPEM(const std::string& pem_data,
@@ skipping 91 matching lines @@
   }
   return true;
 }
 
 bool EncryptByteString(const std::vector<uint8_t>& pub_key_der,
                        const std::string& data,
                        std::vector<uint8_t>* encrypted_output) {
   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";
     return false;
   }
 
   encrypted_output->resize(RSA_size(rsa.get()));
   int encrypted_length = RSA_public_encrypt(
       data.size(), reinterpret_cast<const uint8_t*>(data.data()),
       encrypted_output->data(), rsa.get(), RSA_PKCS1_PADDING);
@@ skipping 16 matching lines @@
     LOG(ERROR) << "Failed to parse private key PEM.";
     return false;
   }
   std::unique_ptr<crypto::RSAPrivateKey> private_key(
       crypto::RSAPrivateKey::CreateFromPrivateKeyInfo(private_key_data));
   if (!private_key || !private_key->key()) {
     LOG(ERROR) << "Failed to parse private key DER.";
     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 unnecessary reference.

+  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;
   }
   decrypted_output->resize(output_length);
   return true;
 }
 
 }  // namespace networking_private_crypto