4 files changed, 10 insertions, 10 deletions

diff --git a/src/PolarSSL++/BlockingSslClientSocket.cpp b/src/PolarSSL++/BlockingSslClientSocket.cpp
index 699bc57ee..59e1281ac 100644
--- a/src/PolarSSL++/BlockingSslClientSocket.cpp
+++ b/src/PolarSSL++/BlockingSslClientSocket.cpp
@@ -48,7 +48,7 @@ bool cBlockingSslClientSocket::Connect(const AString & a_ServerName, UInt16 a_Po
 	}
 	
 	// If we have been assigned a trusted CA root cert store, push it into the SSL context:
-	if (m_CACerts.get() != NULL)
+	if (m_CACerts.get() != nullptr)
 	{
 		m_Ssl.SetCACerts(m_CACerts, m_ExpectedPeerName);
 	}
@@ -72,7 +72,7 @@ bool cBlockingSslClientSocket::Connect(const AString & a_ServerName, UInt16 a_Po
 bool cBlockingSslClientSocket::SetTrustedRootCertsFromString(const AString & a_CACerts, const AString & a_ExpectedPeerName)
 {
 	// Warn if used multiple times, but don't signal an error:
-	if (m_CACerts.get() != NULL)
+	if (m_CACerts.get() != nullptr)
 	{
 		LOGWARNING(
 			"SSL: Trying to set multiple trusted CA root cert stores, only the last one will be used. Name: %s",
diff --git a/src/PolarSSL++/CallbackSslContext.cpp b/src/PolarSSL++/CallbackSslContext.cpp
index c4d19b2a0..e061e3f03 100644
--- a/src/PolarSSL++/CallbackSslContext.cpp
+++ b/src/PolarSSL++/CallbackSslContext.cpp
@@ -12,7 +12,7 @@
 
 
 cCallbackSslContext::cCallbackSslContext(void) :
-	m_Callbacks(NULL)
+	m_Callbacks(nullptr)
 {
 	// Nothing needed, but the constructor needs to exist so
 }
@@ -32,7 +32,7 @@ cCallbackSslContext::cCallbackSslContext(cCallbackSslContext::cDataCallbacks & a
 
 int cCallbackSslContext::ReceiveEncrypted(unsigned char * a_Buffer, size_t a_NumBytes)
 {
-	if (m_Callbacks == NULL)
+	if (m_Callbacks == nullptr)
 	{
 		LOGWARNING("SSL: Trying to receive data with no callbacks, aborting.");
 		return POLARSSL_ERR_NET_RECV_FAILED;
@@ -46,7 +46,7 @@ int cCallbackSslContext::ReceiveEncrypted(unsigned char * a_Buffer, size_t a_Num
 
 int cCallbackSslContext::SendEncrypted(const unsigned char * a_Buffer, size_t a_NumBytes)
 {
-	if (m_Callbacks == NULL)
+	if (m_Callbacks == nullptr)
 	{
 		LOGWARNING("SSL: Trying to send data with no callbacks, aborting.");
 		return POLARSSL_ERR_NET_SEND_FAILED;
diff --git a/src/PolarSSL++/CryptoKey.cpp b/src/PolarSSL++/CryptoKey.cpp
index 0763c387b..7c4f021b3 100644
--- a/src/PolarSSL++/CryptoKey.cpp
+++ b/src/PolarSSL++/CryptoKey.cpp
@@ -123,7 +123,7 @@ int cCryptoKey::ParsePrivate(const void * a_Data, size_t a_NumBytes, const AStri
 	
 	if (a_Password.empty())
 	{
-		return pk_parse_key(&m_Pk, (const unsigned char *)a_Data, a_NumBytes, NULL, 0);
+		return pk_parse_key(&m_Pk, (const unsigned char *)a_Data, a_NumBytes, nullptr, 0);
 	}
 	else
 	{
diff --git a/src/PolarSSL++/SslContext.cpp b/src/PolarSSL++/SslContext.cpp
index 482470c3a..902267f90 100644
--- a/src/PolarSSL++/SslContext.cpp
+++ b/src/PolarSSL++/SslContext.cpp
@@ -46,7 +46,7 @@ int cSslContext::Initialize(bool a_IsClient, const SharedPtr<cCtrDrbgContext> &
 	
 	// Set the CtrDrbg context, create a new one if needed:
 	m_CtrDrbg = a_CtrDrbg;
-	if (m_CtrDrbg.get() == NULL)
+	if (m_CtrDrbg.get() == nullptr)
 	{
 		m_CtrDrbg.reset(new cCtrDrbgContext);
 		m_CtrDrbg->Initialize("MCServer", 8);
@@ -98,7 +98,7 @@ void cSslContext::SetOwnCert(const cX509CertPtr & a_OwnCert, const cRsaPrivateKe
 	ASSERT(m_IsValid);  // Call Initialize() first
 	
 	// Check that both the cert and the key is valid:
-	if ((a_OwnCert.get() == NULL) || (a_OwnCertPrivKey.get() == NULL))
+	if ((a_OwnCert.get() == nullptr) || (a_OwnCertPrivKey.get() == nullptr))
 	{
 		LOGWARNING("SSL: Own certificate is not valid, skipping the set.");
 		return;
@@ -121,7 +121,7 @@ void cSslContext::SetOwnCert(const cX509CertPtr & a_OwnCert, const cCryptoKeyPtr
 	ASSERT(m_IsValid);  // Call Initialize() first
 	
 	// Check that both the cert and the key is valid:
-	if ((a_OwnCert.get() == NULL) || (a_OwnCertPrivKey.get() == NULL))
+	if ((a_OwnCert.get() == nullptr) || (a_OwnCertPrivKey.get() == nullptr))
 	{
 		LOGWARNING("SSL: Own certificate is not valid, skipping the set.");
 		return;
@@ -150,7 +150,7 @@ void cSslContext::SetCACerts(const cX509CertPtr & a_CACert, const AString & a_Ex
 	
 	// Set the trusted CA root cert store:
 	ssl_set_authmode(&m_Ssl, SSL_VERIFY_REQUIRED);
-	ssl_set_ca_chain(&m_Ssl, m_CACerts->GetInternal(), NULL, m_ExpectedPeerName.empty() ? NULL : m_ExpectedPeerName.c_str());
+	ssl_set_ca_chain(&m_Ssl, m_CACerts->GetInternal(), nullptr, m_ExpectedPeerName.empty() ? nullptr : m_ExpectedPeerName.c_str());
 }