diff options
| author | davidben <davidben@chromium.org> | 2016-03-01 15:47:47 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-01 23:48:37 +0000 |
| commit | 7dad2a3ec1c5eada75bdd6af49a17c85113814e8 (patch) | |
| tree | d8d4121ba870fc4f6554ba562353604a8718fc7d /net/socket | |
| parent | a4967ca6f74d502d20bf5f99b85d04b155351158 (diff) | |
| download | chromium_src-7dad2a3ec1c5eada75bdd6af49a17c85113814e8.zip chromium_src-7dad2a3ec1c5eada75bdd6af49a17c85113814e8.tar.gz chromium_src-7dad2a3ec1c5eada75bdd6af49a17c85113814e8.tar.bz2 | |
Cut down on usage of deprecated APIs in //crypto.
SSL_library_init is deprecated. It's CRYPTO_library_init. Switch from the
legacy ASN.1 APIs to the new parsers where feasible.
ECPrivateKey::CreateFromEncryptedPrivateKeyInfo is left alone for now as we
still need a new version of those APIs.
This also adds a scoper for CBB for use in later CLs.
BUG=499653
Review URL: https://codereview.chromium.org/1739403002
Cr-Commit-Position: refs/heads/master@{#378610}
Diffstat (limited to 'net/socket')
| -rw-r--r-- | net/socket/ssl_client_socket_openssl.cc | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/net/socket/ssl_client_socket_openssl.cc b/net/socket/ssl_client_socket_openssl.cc index b527c93..8a860f3 100644 --- a/net/socket/ssl_client_socket_openssl.cc +++ b/net/socket/ssl_client_socket_openssl.cc @@ -31,6 +31,7 @@ #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" @@ -116,18 +117,6 @@ bool EVP_MDToPrivateKeyHash(const EVP_MD* md, SSLPrivateKey::Hash* hash) { } } -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, @@ -2255,7 +2244,7 @@ int SSLClientSocketOpenSSL::TokenBindingAdd(const uint8_t** out, if (ssl_config_.token_binding_params.empty()) { return 0; } - ScopedCBB output; + crypto::AutoCBB output; CBB parameters_list; if (!CBB_init(output.get(), 7) || !CBB_add_u8(output.get(), kTbProtocolVersionMajor) || |