1 files changed, 2 insertions, 2 deletions
diff --git a/Swiften/TLS/OpenSSL/OpenSSLCertificate.cpp b/Swiften/TLS/OpenSSL/OpenSSLCertificate.cpp
index 17ac8cc..8d2d965 100644
--- a/Swiften/TLS/OpenSSL/OpenSSLCertificate.cpp
+++ b/Swiften/TLS/OpenSSL/OpenSSLCertificate.cpp
@@ -3,73 +3,73 @@
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/TLS/OpenSSL/OpenSSLCertificate.h>
 
 #include <Swiften/Base/ByteArray.h>
 #include <Swiften/Base/Log.h>
 
 #undef X509_NAME // Windows.h defines this, and  for some reason, it doesn't get undeffed properly in x509.h
 #include <openssl/x509v3.h>
 
 #pragma GCC diagnostic ignored "-Wold-style-cast"
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #pragma clang diagnostic ignored "-Wcast-align"
 #pragma clang diagnostic ignored "-Wsign-conversion"
 
 namespace Swift {
 
 OpenSSLCertificate::OpenSSLCertificate(std::shared_ptr<X509> cert) : cert(cert) {
     parse();
 }
 
 
 OpenSSLCertificate::OpenSSLCertificate(const ByteArray& der) {
 #if OPENSSL_VERSION_NUMBER <= 0x009070cfL
     unsigned char* p = const_cast<unsigned char*>(vecptr(der));
 #else
     const unsigned char* p = vecptr(der);
 #endif
-    cert = std::shared_ptr<X509>(d2i_X509(NULL, &p, der.size()), X509_free);
+    cert = std::shared_ptr<X509>(d2i_X509(nullptr, &p, der.size()), X509_free);
     if (!cert) {
         SWIFT_LOG(warning) << "Error creating certificate from DER data" << std::endl;
     }
     parse();
 }
 
 ByteArray OpenSSLCertificate::toDER() const {
     ByteArray result;
     if (!cert) {
         return result;
     }
-    result.resize(i2d_X509(cert.get(), NULL));
+    result.resize(i2d_X509(cert.get(), nullptr));
     unsigned char* p = vecptr(result);
     i2d_X509(cert.get(), &p);
     return result;
 }
 
 void OpenSSLCertificate::parse() {
     if (!cert) {
         return;
     }
     // Subject name
     X509_NAME* subjectName = X509_get_subject_name(cert.get());
     if (subjectName) {
         // Subject name
         ByteArray subjectNameData;
         subjectNameData.resize(256);
         X509_NAME_oneline(X509_get_subject_name(cert.get()), reinterpret_cast<char*>(vecptr(subjectNameData)), static_cast<unsigned int>(subjectNameData.size()));
         this->subjectName = byteArrayToString(subjectNameData);
 
         // Common name
         int cnLoc = X509_NAME_get_index_by_NID(subjectName, NID_commonName, -1);
         while (cnLoc != -1) {
             X509_NAME_ENTRY* cnEntry = X509_NAME_get_entry(subjectName, cnLoc);
             ASN1_STRING* cnData = X509_NAME_ENTRY_get_data(cnEntry);
             commonNames.push_back(byteArrayToString(createByteArray(reinterpret_cast<const char*>(cnData->data), cnData->length)));
             cnLoc = X509_NAME_get_index_by_NID(subjectName, NID_commonName, cnLoc);
         }
     }
 
     // subjectAltNames
     int subjectAltNameLoc = X509_get_ext_by_NID(cert.get(), NID_subject_alt_name, -1);