Cut down on usage of deprecated APIs in //crypto.

net/socket/ssl_client_socket_openssl.cc

 // Copyright (c) 2012 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.
 
 // OpenSSL binding for SSLClientSocket. The class layout and general principle
 // of operation is derived from SSLClientSocketNSS.
 
 #include "net/socket/ssl_client_socket_openssl.h"
 
 #include <errno.h>
@@ skipping 13 matching lines @@
 #include "base/macros.h"
 #include "base/memory/singleton.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/profiler/scoped_tracker.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread_local.h"
 #include "base/values.h"
+#include "crypto/auto_cbb.h"
 #include "crypto/ec_private_key.h"
 #include "crypto/openssl_util.h"
 #include "crypto/scoped_openssl_types.h"
 #include "net/base/ip_address_number.h"
 #include "net/base/net_errors.h"
 #include "net/cert/cert_verifier.h"
 #include "net/cert/ct_ev_whitelist.h"
 #include "net/cert/ct_policy_enforcer.h"
 #include "net/cert/ct_policy_status.h"
 #include "net/cert/ct_verifier.h"
@@ skipping 64 matching lines @@
       *hash = SSLPrivateKey::Hash::SHA384;
       return true;
     case NID_sha512:
       *hash = SSLPrivateKey::Hash::SHA512;
       return true;
     default:
       return false;
   }
 }
 
-class ScopedCBB {
- public:
-  ScopedCBB() { CBB_zero(&cbb_); }
-  ~ScopedCBB() { CBB_cleanup(&cbb_); }
-
-  CBB* get() { return &cbb_; }
-
- private:
-  CBB cbb_;
-  DISALLOW_COPY_AND_ASSIGN(ScopedCBB);
-};
-
 scoped_ptr<base::Value> NetLogPrivateKeyOperationCallback(
     SSLPrivateKey::Type type,
     SSLPrivateKey::Hash hash,
     NetLogCaptureMode mode) {
   std::string type_str;
   switch (type) {
     case SSLPrivateKey::Type::RSA:
       type_str = "RSA";
       break;
     case SSLPrivateKey::Type::ECDSA:
@@ skipping 2110 matching lines @@
   // asynchronous private key operation.
   PumpReadWriteEvents();
 }
 
 int SSLClientSocketOpenSSL::TokenBindingAdd(const uint8_t** out,
                                             size_t* out_len,
                                             int* out_alert_value) {
   if (ssl_config_.token_binding_params.empty()) {
     return 0;
   }
-  ScopedCBB output;
+  crypto::ScopedCBB output;
   CBB parameters_list;
   if (!CBB_init(output.get(), 7) ||
       !CBB_add_u8(output.get(), kTbProtocolVersionMajor) ||
       !CBB_add_u8(output.get(), kTbProtocolVersionMinor) ||
       !CBB_add_u8_length_prefixed(output.get(), &parameters_list)) {
     *out_alert_value = SSL_AD_INTERNAL_ERROR;
     return -1;
   }
   for (size_t i = 0; i < ssl_config_.token_binding_params.size(); ++i) {
     if (!CBB_add_u8(&parameters_list, ssl_config_.token_binding_params[i])) {
@@ skipping 53 matching lines @@
       tb_was_negotiated_ = true;
       return 1;
     }
   }
 
   *out_alert_value = SSL_AD_ILLEGAL_PARAMETER;
   return 0;
 }
 
 }  // namespace net