Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(72)

Unified Diff: net/socket/ssl_client_socket_nss.cc

Issue 724553002: Remove implicit conversions from scoped_refptr to T* in net/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/proxy/dhcp_proxy_script_fetcher_win_unittest.cc ('k') | net/socket/tcp_socket_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/ssl_client_socket_nss.cc
diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc
index 6ed21cece431b55d0f9199bef2dda34d869b932e..3e5bde05fa7ce8a8619b29dae69c7181192147df 100644
--- a/net/socket/ssl_client_socket_nss.cc
+++ b/net/socket/ssl_client_socket_nss.cc
@@ -1290,7 +1290,7 @@ SECStatus SSLClientSocketNSS::Core::PlatformClientAuthHandler(
core->client_auth_cert_needed_ = !core->ssl_config_.send_client_cert;
#if defined(OS_WIN)
if (core->ssl_config_.send_client_cert) {
- if (core->ssl_config_.client_cert) {
+ if (core->ssl_config_.client_cert.get()) {
PCCERT_CONTEXT cert_context =
core->ssl_config_.client_cert->os_cert_handle();
@@ -1685,7 +1685,7 @@ int SSLClientSocketNSS::Core::HandleNSSError(PRErrorCode nss_error) {
// re-insert the smart card if not.
if ((net_error == ERR_SSL_CLIENT_AUTH_CERT_NO_PRIVATE_KEY ||
net_error == ERR_SSL_CLIENT_AUTH_SIGNATURE_FAILED) &&
- ssl_config_.send_client_cert && ssl_config_.client_cert) {
+ ssl_config_.send_client_cert && ssl_config_.client_cert.get()) {
CertSetCertificateContextProperty(
ssl_config_.client_cert->os_cert_handle(),
CERT_KEY_PROV_HANDLE_PROP_ID, 0, NULL);
@@ -2436,7 +2436,7 @@ void SSLClientSocketNSS::Core::UpdateStapledOCSPResponse() {
if (IsOCSPStaplingSupported()) {
#if defined(OS_WIN)
- if (nss_handshake_state_.server_cert) {
+ if (nss_handshake_state_.server_cert.get()) {
CRYPT_DATA_BLOB ocsp_response_blob;
ocsp_response_blob.cbData = ocsp_responses->items[0].len;
ocsp_response_blob.pbData = ocsp_responses->items[0].data;
« no previous file with comments | « net/proxy/dhcp_proxy_script_fetcher_win_unittest.cc ('k') | net/socket/tcp_socket_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698