Use BoringSSL scopers in //net.

net/ssl/token_binding.cc

 // Copyright 2015 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 "net/ssl/token_binding.h"
 
+#include <openssl/bn.h>
 #include <openssl/bytestring.h>
 #include <openssl/ec.h>
 #include <openssl/ec_key.h>
+#include <openssl/ecdsa.h>
 #include <openssl/evp.h>
 #include <openssl/mem.h>
 
 #include "base/stl_util.h"
 #include "crypto/ec_private_key.h"
-#include "crypto/scoped_openssl_types.h"
 #include "net/base/net_errors.h"
 #include "net/ssl/ssl_config.h"
 
 namespace net {
 
 namespace {
 
 const size_t kUncompressedPointLen = 65;
 
 bool BuildTokenBindingID(crypto::ECPrivateKey* key, CBB* out) {
@@ skipping 21 matching lines @@
   size_t len = BN_num_bytes(order);
   out->resize(2 * len);
   if (!BN_bn2bin_padded(out->data(), len, ec_sig->r) ||
       !BN_bn2bin_padded(out->data() + len, len, ec_sig->s)) {
     return false;
   }
   return true;
 }
 
 ECDSA_SIG* RawToECDSA_SIG(EC_KEY* ec, base::StringPiece sig) {
-  crypto::ScopedECDSA_SIG raw_sig(ECDSA_SIG_new());
+  bssl::UniquePtr<ECDSA_SIG> raw_sig(ECDSA_SIG_new());
   const EC_GROUP* group = EC_KEY_get0_group(ec);
   const BIGNUM* order = EC_GROUP_get0_order(group);
   size_t group_size = BN_num_bytes(order);
   if (sig.size() != group_size * 2)
     return nullptr;
   const uint8_t* sigp = reinterpret_cast<const uint8_t*>(sig.data());
   if (!BN_bin2bn(sigp, group_size, raw_sig->r) ||
       !BN_bin2bn(sigp + group_size, group_size, raw_sig->s)) {
     return nullptr;
   }
   return raw_sig.release();
 }
 
 }  // namespace
 
 bool CreateTokenBindingSignature(base::StringPiece ekm,
                                  TokenBindingType type,
                                  crypto::ECPrivateKey* key,
                                  std::vector<uint8_t>* out) {
-  crypto::ScopedEVP_MD_CTX digest_ctx(EVP_MD_CTX_create());
+  bssl::ScopedEVP_MD_CTX digest_ctx;
   uint8_t tb_type = static_cast<uint8_t>(type);
   uint8_t key_type = static_cast<uint8_t>(TB_PARAM_ECDSAP256);
   uint8_t digest[EVP_MAX_MD_SIZE];
   unsigned int digest_len;
   if (!EVP_DigestInit(digest_ctx.get(), EVP_sha256()) ||
       !EVP_DigestUpdate(digest_ctx.get(), &tb_type, 1) ||
       !EVP_DigestUpdate(digest_ctx.get(), &key_type, 1) ||
       !EVP_DigestUpdate(digest_ctx.get(), ekm.data(), ekm.size()) ||
       !EVP_DigestFinal_ex(digest_ctx.get(), digest, &digest_len)) {
     return false;
   }
   EC_KEY* ec_key = EVP_PKEY_get0_EC_KEY(key->key());
   if (!ec_key)
     return false;
-  crypto::ScopedECDSA_SIG sig(ECDSA_do_sign(digest, digest_len, ec_key));
+  bssl::UniquePtr<ECDSA_SIG> sig(ECDSA_do_sign(digest, digest_len, ec_key));
   if (!sig)
     return false;
   return ECDSA_SIGToRaw(sig.get(), ec_key, out);
 }
 
 Error BuildTokenBindingMessageFromTokenBindings(
     const std::vector<base::StringPiece>& token_bindings,
     std::string* out) {
   CBB tb_message, child;
   if (!CBB_init(&tb_message, 0) ||
@@ skipping 82 matching lines @@
 
 bool VerifyTokenBindingSignature(base::StringPiece ec_point,
                                  base::StringPiece signature,
                                  TokenBindingType type,
                                  base::StringPiece ekm) {
   if (ec_point.size() != kUncompressedPointLen - 1)
     return false;
   uint8_t x9_62_ec_point[kUncompressedPointLen];
   x9_62_ec_point[0] = 4;
   memcpy(x9_62_ec_point + 1, ec_point.data(), kUncompressedPointLen - 1);
-  crypto::ScopedEC_Key key(EC_KEY_new_by_curve_name(NID_X9_62_prime256v1));
+  bssl::UniquePtr<EC_KEY> key(EC_KEY_new_by_curve_name(NID_X9_62_prime256v1));
   EC_KEY* keyp = key.get();
-  crypto::ScopedEC_POINT pub_key(EC_POINT_new(EC_KEY_get0_group(keyp)));
+  bssl::UniquePtr<EC_POINT> pub_key(EC_POINT_new(EC_KEY_get0_group(keyp)));
   if (!EC_POINT_oct2point(EC_KEY_get0_group(keyp), pub_key.get(),
                           x9_62_ec_point, kUncompressedPointLen, nullptr) ||
       !EC_KEY_set_public_key(keyp, pub_key.get())) {
     return false;
   }
 
-  crypto::ScopedEVP_MD_CTX digest_ctx(EVP_MD_CTX_create());
+  bssl::ScopedEVP_MD_CTX digest_ctx;
   uint8_t tb_type = static_cast<uint8_t>(type);
   uint8_t key_type = static_cast<uint8_t>(TB_PARAM_ECDSAP256);
   uint8_t digest[EVP_MAX_MD_SIZE];
   unsigned int digest_len;
   if (!EVP_DigestInit(digest_ctx.get(), EVP_sha256()) ||
       !EVP_DigestUpdate(digest_ctx.get(), &tb_type, 1) ||
       !EVP_DigestUpdate(digest_ctx.get(), &key_type, 1) ||
       !EVP_DigestUpdate(digest_ctx.get(), ekm.data(), ekm.size()) ||
       !EVP_DigestFinal_ex(digest_ctx.get(), digest, &digest_len)) {
     return false;
   }
 
-  crypto::ScopedECDSA_SIG sig(RawToECDSA_SIG(keyp, signature));
+  bssl::UniquePtr<ECDSA_SIG> sig(RawToECDSA_SIG(keyp, signature));
   if (!sig)
     return false;
   return !!ECDSA_do_verify(digest, digest_len, sig.get(), keyp);
 }
 
 }  // namespace net