Use new BoringSSL scopers in //components.

components/webcrypto/algorithms/rsa_oaep.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 <openssl/evp.h>
+#include <openssl/mem.h>
+#include <openssl/rsa.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <string.h>
 
 #include "base/memory/ptr_util.h"
 #include "components/webcrypto/algorithms/rsa.h"
 #include "components/webcrypto/algorithms/util.h"
 #include "components/webcrypto/blink_key_handle.h"
 #include "components/webcrypto/crypto_data.h"
 #include "components/webcrypto/status.h"
 #include "crypto/openssl_util.h"
-#include "crypto/scoped_openssl_types.h"
 #include "third_party/WebKit/public/platform/WebCryptoAlgorithmParams.h"
 #include "third_party/WebKit/public/platform/WebCryptoKeyAlgorithm.h"
 
 namespace webcrypto {
 
 namespace {
 
 typedef int (*InitFunc)(EVP_PKEY_CTX* ctx);
 typedef int (*EncryptDecryptFunc)(EVP_PKEY_CTX* ctx,
                                   unsigned char* out,
@@ skipping 14 matching lines @@
                             const blink::WebCryptoKey& key,
                             const CryptoData& data,
                             std::vector<uint8_t>* buffer) {
   crypto::OpenSSLErrStackTracer err_tracer(FROM_HERE);
 
   EVP_PKEY* pkey = GetEVP_PKEY(key);
   const EVP_MD* digest = GetDigest(key.algorithm().rsaHashedParams()->hash());
   if (!digest)
     return Status::ErrorUnsupported();
 
-  crypto::ScopedEVP_PKEY_CTX ctx(EVP_PKEY_CTX_new(pkey, NULL));
+  bssl::UniquePtr<EVP_PKEY_CTX> ctx(EVP_PKEY_CTX_new(pkey, NULL));
 
   if (!init_func(ctx.get()) ||
       !EVP_PKEY_CTX_set_rsa_padding(ctx.get(), RSA_PKCS1_OAEP_PADDING) ||
       !EVP_PKEY_CTX_set_rsa_oaep_md(ctx.get(), digest) ||
       !EVP_PKEY_CTX_set_rsa_mgf1_md(ctx.get(), digest)) {
     return Status::OperationError();
   }
 
   const blink::WebVector<uint8_t>& label =
       algorithm.rsaOaepParams()->optionalLabel();
 
   if (label.size()) {
     // Make a copy of the label, since the ctx takes ownership of it when
     // calling set0_rsa_oaep_label().
-    crypto::ScopedOpenSSLBytes label_copy;
+    bssl::UniquePtr<uint8_t> label_copy;
     label_copy.reset(static_cast<uint8_t*>(OPENSSL_malloc(label.size())));
     memcpy(label_copy.get(), label.data(), label.size());
 
     if (1 != EVP_PKEY_CTX_set0_rsa_oaep_label(ctx.get(), label_copy.release(),
                                               label.size())) {
       return Status::OperationError();
     }
   }
 
   // Determine the maximum length of the output.
@@ skipping 61 matching lines @@
   }
 };
 
 }  // namespace
 
 std::unique_ptr<AlgorithmImplementation> CreateRsaOaepImplementation() {
   return base::WrapUnique(new RsaOaepImplementation);
 }
 
 }  // namespace webcrypto