Use BoringSSL scopers in //net.

net/base/keygen_handler_openssl.cc

 // Copyright (c) 2011 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/bytestring.h>
 #include <openssl/digest.h>
 #include <openssl/evp.h>
 #include <openssl/mem.h>
 #include <stdint.h>
 
 #include <memory>
 
 #include "base/base64.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/strings/string_piece.h"
-#include "crypto/auto_cbb.h"
 #include "crypto/openssl_util.h"
 #include "crypto/rsa_private_key.h"
-#include "crypto/scoped_openssl_types.h"
 #include "net/base/keygen_handler.h"
 #include "net/base/openssl_private_key_store.h"
 
 namespace net {
 
 std::string KeygenHandler::GenKeyAndSignChallenge() {
   std::unique_ptr<crypto::RSAPrivateKey> key(
       crypto::RSAPrivateKey::Create(key_size_in_bits_));
   EVP_PKEY* pkey = key->key();
 
@@ skipping 16 matching lines @@
   //
   // The signature is over the PublicKeyAndChallenge.
 
   // TODO(davidben): If we gain another consumer, factor this code out into
   // shared logic, sharing OID definitions with the verifier, to support signing
   // other X.509-style structures.
 
   crypto::OpenSSLErrStackTracer tracer(FROM_HERE);
 
   // Serialize up to the PublicKeyAndChallenge.
-  crypto::AutoCBB cbb;
+  bssl::ScopedCBB cbb;
   CBB spkac, public_key_and_challenge, challenge;
   if (!CBB_init(cbb.get(), 0) ||
       !CBB_add_asn1(cbb.get(), &spkac, CBS_ASN1_SEQUENCE) ||
       !CBB_add_asn1(&spkac, &public_key_and_challenge, CBS_ASN1_SEQUENCE) ||
       !EVP_marshal_public_key(&public_key_and_challenge, pkey) ||
       !CBB_add_asn1(&public_key_and_challenge, &challenge,
                     CBS_ASN1_IA5STRING) ||
       !CBB_add_bytes(&challenge,
                      reinterpret_cast<const uint8_t*>(challenge_.data()),
                      challenge_.size()) ||
       !CBB_flush(&spkac)) {
     return std::string();
   }
 
   // Hash what's been written so far.
-  crypto::ScopedEVP_MD_CTX ctx(EVP_MD_CTX_create());
+  bssl::ScopedEVP_MD_CTX ctx;
   if (!EVP_DigestSignInit(ctx.get(), nullptr, EVP_md5(), nullptr, pkey) ||
       !EVP_DigestSignUpdate(ctx.get(), CBB_data(&spkac), CBB_len(&spkac))) {
     return std::string();
   }
 
   // The DER encoding of 1.2.840.113549.1.1.4, MD5 with RSA encryption.
   static const uint8_t kMd5WithRsaEncryption[] = {
       0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x04,
   };
 
@@ skipping 31 matching lines @@
     return std::string();
   }
   std::string result;
   base::Base64Encode(
       base::StringPiece(reinterpret_cast<const char*>(der), der_len), &result);
   OPENSSL_free(der);
   return result;
 }
 
 }  // namespace net