From b52a9cbe1c582fc6484897b50f45636c4cfd877c Mon Sep 17 00:00:00 2001 From: Sebastião Guerra Date: Fri, 2 Oct 2026 09:06:05 -0300 Subject: Replace zero pointer constants with nullptr MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sebastião Guerra --- examples/sasltest/sasltest.cpp | 8 +++---- src/tls/tqca-tls.cpp | 50 +++++++++++++++++++++--------------------- src/tqca.cpp | 38 ++++++++++++++++---------------- src/tqca.h | 6 ++--- 4 files changed, 51 insertions(+), 51 deletions(-) diff --git a/examples/sasltest/sasltest.cpp b/examples/sasltest/sasltest.cpp index bc32134..85d6226 100644 --- a/examples/sasltest/sasltest.cpp +++ b/examples/sasltest/sasltest.cpp @@ -292,8 +292,8 @@ class ServerTest : public QServerSocket public: ServerTest(const TQString &_str, int _port) : QServerSocket(_port), port(_port) { - sock = 0; - sasl = 0; + sock = nullptr; + sasl = nullptr; realm = TQString::null; str = _str; } @@ -543,9 +543,9 @@ private: void close() { sock->deleteLater(); - sock = 0; + sock = nullptr; delete sasl; - sasl = 0; + sasl = nullptr; } }; diff --git a/src/tls/tqca-tls.cpp b/src/tls/tqca-tls.cpp index 4a71273..2b7ddeb 100644 --- a/src/tls/tqca-tls.cpp +++ b/src/tls/tqca-tls.cpp @@ -59,8 +59,8 @@ static TQByteArray lib_randomArray(int size) static bool lib_generateKeyIV(const EVP_CIPHER *_type, const TQByteArray &data, const TQByteArray &salt, TQByteArray *key, TQByteArray *iv, int keysize=-1) { TQByteArray k, i; - unsigned char *kp = 0; - unsigned char *ip = 0; + unsigned char *kp = nullptr; + unsigned char *ip = nullptr; #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) EVP_CIPHER type = *_type; EVP_CIPHER *loctype = &type; @@ -185,7 +185,7 @@ class EVPCipherContext : public TQCA_CipherContext public: EVPCipherContext() { - type = 0; + type = nullptr; } virtual ~EVPCipherContext() @@ -197,7 +197,7 @@ public: #else EVP_CIPHER_CTX_free(c); #endif - type = 0; + type = nullptr; } } @@ -217,7 +217,7 @@ public: bool generateKey(char *out, int keysize) { TQByteArray a; - if(!lib_generateKeyIV(getType(TQCA::CBC), lib_randomArray(128), lib_randomArray(2), &a, 0, keysize)) + if(!lib_generateKeyIV(getType(TQCA::CBC), lib_randomArray(128), lib_randomArray(2), &a, nullptr, keysize)) return false; memcpy(out, a.data(), a.size()); return true; @@ -226,7 +226,7 @@ public: bool generateIV(char *out) { TQByteArray a; - if(!lib_generateKeyIV(getType(TQCA::CBC), lib_randomArray(128), lib_randomArray(2), 0, &a)) + if(!lib_generateKeyIV(getType(TQCA::CBC), lib_randomArray(128), lib_randomArray(2), nullptr, &a)) return false; memcpy(out, a.data(), a.size()); return true; @@ -321,7 +321,7 @@ public: else if(mode == TQCA::CFB) return EVP_bf_cfb(); else - return 0; + return nullptr; } }; @@ -336,7 +336,7 @@ public: else if(mode == TQCA::CFB) return EVP_des_ede3_cfb(); else - return 0; + return nullptr; } }; @@ -352,7 +352,7 @@ public: else if(mode == TQCA::CFB) return EVP_aes_128_cfb(); else - return 0; + return nullptr; } }; @@ -367,7 +367,7 @@ public: else if(mode == TQCA::CFB) return EVP_aes_256_cfb(); else - return 0; + return nullptr; } }; #endif @@ -377,8 +377,8 @@ class RSAKeyContext : public TQCA_RSAKeyContext public: RSAKeyContext() { - pub = 0; - sec = 0; + pub = nullptr; + sec = nullptr; } ~RSAKeyContext() @@ -390,11 +390,11 @@ public: { if(pub) { RSA_free(pub); - pub = 0; + pub = nullptr; } if(sec) { RSA_free(sec); - sec = 0; + sec = nullptr; } } @@ -790,7 +790,7 @@ class CertContext : public TQCA_CertContext public: CertContext() { - x = 0; + x = nullptr; } ~CertContext() @@ -811,7 +811,7 @@ public: { if(x) { X509_free(x); - x = 0; + x = nullptr; serial = ""; v_subject = ""; @@ -991,10 +991,10 @@ public: ssl_init = true; } - ssl = 0; - context = 0; - cert = 0; - key = 0; + ssl = nullptr; + context = nullptr; + cert = nullptr; + key = nullptr; } ~TLSContext() @@ -1006,19 +1006,19 @@ public: { if(ssl) { SSL_free(ssl); - ssl = 0; + ssl = nullptr; } if(context) { SSL_CTX_free(context); - context = 0; + context = nullptr; } if(cert) { delete cert; - cert = 0; + cert = nullptr; } if(key) { delete key; - key = 0; + key = nullptr; } sendQueue.resize(0); @@ -1500,7 +1500,7 @@ public: return new CertContext; else if(cap == TQCA::CAP_TLS) return new TLSContext; - return 0; + return nullptr; } }; diff --git a/src/tqca.cpp b/src/tqca.cpp index cc5dad7..979a251 100644 --- a/src/tqca.cpp +++ b/src/tqca.cpp @@ -58,18 +58,18 @@ public: TQLibrary *lib = new TQLibrary(fname); if(!lib->load()) { delete lib; - return 0; + return nullptr; } void *s = lib->resolve("createProvider"); if(!s) { delete lib; - return 0; + return nullptr; } TQCAProvider *(*createProvider)() = (TQCAProvider *(*)())s; TQCAProvider *p = createProvider(); if(!p) { delete lib; - return 0; + return nullptr; } ProviderItem *i = new ProviderItem(lib, p); i->fname = fname; @@ -78,7 +78,7 @@ public: static ProviderItem *fromClass(TQCAProvider *p) { - ProviderItem *i = new ProviderItem(0, p); + ProviderItem *i = new ProviderItem(nullptr, p); return i; } @@ -242,7 +242,7 @@ static void *getContext(int cap) // this call will also trip a scan for new plugins if needed if(!TQCA::isSupported(cap)) - return 0; + return nullptr; TQPtrListIterator it(providerList); for(ProviderItem *i; (i = it.current()); ++it) { @@ -251,7 +251,7 @@ static void *getContext(int cap) return i->p->context(cap); } } - return 0; + return nullptr; } @@ -263,7 +263,7 @@ class Hash::Private public: Private() { - c = 0; + c = nullptr; } ~Private() @@ -329,7 +329,7 @@ class Cipher::Private public: Private() { - c = 0; + c = nullptr; } ~Private() @@ -410,7 +410,7 @@ void Cipher::reset(int dir, int mode, const TQByteArray &key, const TQByteArray d->mode = mode; d->key = key.copy(); d->iv = iv.copy(); - if(!d->c->setup(d->dir, d->mode, d->key.isEmpty() ? 0: d->key.data(), d->key.size(), d->iv.isEmpty() ? 0 : d->iv.data(), pad)) { + if(!d->c->setup(d->dir, d->mode, d->key.isEmpty() ? nullptr: d->key.data(), d->key.size(), d->iv.isEmpty() ? nullptr : d->iv.data(), pad)) { d->err = true; return; } @@ -519,7 +519,7 @@ class RSAKey::Private public: Private() { - c = 0; + c = nullptr; } ~Private() @@ -682,7 +682,7 @@ class Cert::Private public: Private() { - c = 0; + c = nullptr; } ~Private() @@ -712,7 +712,7 @@ Cert & Cert::operator=(const Cert &from) if ( from.d->c ) d->c = from.d->c->clone(); else - d->c = 0; + d->c = nullptr; return *this; } @@ -1262,7 +1262,7 @@ bool SASL::startClient(const TQString &service, const TQString &host, const TQSt } d->allowCSF = allowClientSendFirst; - d->c->setCoreProps(service, host, d->localPort != -1 ? &la : 0, d->remotePort != -1 ? &ra : 0); + d->c->setCoreProps(service, host, d->localPort != -1 ? &la : nullptr, d->remotePort != -1 ? &ra : nullptr); d->setSecurityProps(); if(!d->c->clientStart(mechlist)) @@ -1286,7 +1286,7 @@ bool SASL::startServer(const TQString &service, const TQString &host, const TQSt ra.port = d->remotePort; } - d->c->setCoreProps(service, host, d->localPort != -1 ? &la : 0, d->remotePort != -1 ? &ra : 0); + d->c->setCoreProps(service, host, d->localPort != -1 ? &la : nullptr, d->remotePort != -1 ? &ra : nullptr); d->setSecurityProps(); if(!d->c->serverStart(realm, mechlist, saslappname)) @@ -1299,7 +1299,7 @@ bool SASL::startServer(const TQString &service, const TQString &host, const TQSt void SASL::putServerFirstStep(const TQString &mech) { - int r = d->c->serverFirstStep(mech, 0); + int r = d->c->serverFirstStep(mech, nullptr); handleServerFirstStep(r); } @@ -1329,22 +1329,22 @@ void SASL::putStep(const TQByteArray &stepData) void SASL::setUsername(const TQString &user) { - d->c->setClientParams(&user, 0, 0, 0); + d->c->setClientParams(&user, nullptr, nullptr, nullptr); } void SASL::setAuthzid(const TQString &authzid) { - d->c->setClientParams(0, &authzid, 0, 0); + d->c->setClientParams(nullptr, &authzid, nullptr, nullptr); } void SASL::setPassword(const TQString &pass) { - d->c->setClientParams(0, 0, &pass, 0); + d->c->setClientParams(nullptr, nullptr, &pass, nullptr); } void SASL::setRealm(const TQString &realm) { - d->c->setClientParams(0, 0, 0, &realm); + d->c->setClientParams(nullptr, nullptr, nullptr, &realm); } void SASL::continueAfterParams() diff --git a/src/tqca.h b/src/tqca.h index bf84f60..7e540c0 100644 --- a/src/tqca.h +++ b/src/tqca.h @@ -154,7 +154,7 @@ namespace TQCA TQByteArray dyn_generateIV() const; void reset(int dir, int mode, const TQByteArray &key, const TQByteArray &iv, bool pad=true); bool update(const TQByteArray &a); - TQByteArray final(bool *ok=0); + TQByteArray final(bool *ok=nullptr); protected: Cipher(TQCA_CipherContext *, int dir, int mode, const TQByteArray &key, const TQByteArray &iv, bool pad); @@ -331,7 +331,7 @@ namespace TQCA }; enum Error { ErrHandshake, ErrCrypt }; - TLS(TQObject *parent=0); + TLS(TQObject *parent=nullptr); ~TLS(); void setCertificate(const Cert &cert, const RSAKey &key); @@ -389,7 +389,7 @@ namespace TQCA NoUser, RemoteUnavail }; - SASL(TQObject *parent=0); + SASL(TQObject *parent=nullptr); ~SASL(); static void setAppName(const TQString &name); -- cgit v1.2.3