diff options
| author | davidben@chromium.org <davidben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-25 06:03:08 +0000 |
|---|---|---|
| committer | davidben@chromium.org <davidben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-25 06:03:08 +0000 |
| commit | e7e883e316bf9c3bdfebdf87609442674ed1968d (patch) | |
| tree | 0ebb154be89380c3dbef9ee6df0af909dbd2b132 /net/socket | |
| parent | 7061b26dd3a23a98292870b667401d59cdf6f45b (diff) | |
| download | chromium_src-e7e883e316bf9c3bdfebdf87609442674ed1968d.zip chromium_src-e7e883e316bf9c3bdfebdf87609442674ed1968d.tar.gz chromium_src-e7e883e316bf9c3bdfebdf87609442674ed1968d.tar.bz2 | |
Switch to using SSL_get0_certificate_types for client auth.
Upstream added SSL_get0_certificate_types while we added
SSL_get_client_certificate_types in parallel. Switch to upstream's API.
BUG=388000
Review URL: https://codereview.chromium.org/415853002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285498 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket')
| -rw-r--r-- | net/socket/ssl_client_socket_openssl.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/socket/ssl_client_socket_openssl.cc b/net/socket/ssl_client_socket_openssl.cc index bf1358f..f824726 100644 --- a/net/socket/ssl_client_socket_openssl.cc +++ b/net/socket/ssl_client_socket_openssl.cc @@ -1339,9 +1339,8 @@ int SSLClientSocketOpenSSL::ClientCertRequestCallback(SSL* ssl, } const unsigned char* client_cert_types; - size_t num_client_cert_types; - SSL_get_client_certificate_types(ssl, &client_cert_types, - &num_client_cert_types); + size_t num_client_cert_types = + SSL_get0_certificate_types(ssl, &client_cert_types); for (size_t i = 0; i < num_client_cert_types; i++) { cert_key_types_.push_back( static_cast<SSLClientCertType>(client_cert_types[i])); |