aboutsummaryrefslogtreecommitdiffstats
path: root/src/tls/tls_client.cpp
diff options
context:
space:
mode:
authorlloyd <[email protected]>2012-05-18 20:44:34 +0000
committerlloyd <[email protected]>2012-05-18 20:44:34 +0000
commit8383b0b503c812e45f2780217b048a19a8946853 (patch)
tree939403bad80ee2b1e13b69c82adc316422a9c7d6 /src/tls/tls_client.cpp
parentc691561f3198f481c13457433efbccc1c9fcd898 (diff)
Replace 0 and NULL pointer constants with nullptr. Also fix an old
style cast in secmem.h
Diffstat (limited to 'src/tls/tls_client.cpp')
-rw-r--r--src/tls/tls_client.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/tls/tls_client.cpp b/src/tls/tls_client.cpp
index feb9ef85f..1ca256f3e 100644
--- a/src/tls/tls_client.cpp
+++ b/src/tls/tls_client.cpp
@@ -132,7 +132,7 @@ void Client::alert_notify(const Alert& alert)
if(handshake_completed && state)
{
delete state;
- state = 0;
+ state = nullptr;
}
}
}
@@ -143,7 +143,7 @@ void Client::alert_notify(const Alert& alert)
void Client::process_handshake_msg(Handshake_Type type,
const std::vector<byte>& contents)
{
- if(state == 0)
+ if(!state)
throw Unexpected_Message("Unexpected handshake message from server");
if(type == HELLO_REQUEST)
@@ -157,7 +157,7 @@ void Client::process_handshake_msg(Handshake_Type type,
if(!secure_renegotiation.supported() && policy.require_secure_renegotiation())
{
delete state;
- state = 0;
+ state = nullptr;
// RFC 5746 section 4.2
send_alert(Alert(Alert::NO_RENEGOTIATION));
@@ -474,7 +474,7 @@ void Client::process_handshake_msg(Handshake_Type type,
session_manager.remove_entry(session_info.session_id());
delete state;
- state = 0;
+ state = nullptr;
handshake_completed = true;
}
else