diff options
| author | Mårten Nordheim <marten.nordheim@qt.io> | 2018-08-07 10:29:46 +0200 |
|---|---|---|
| committer | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2018-08-09 05:34:51 +0000 |
| commit | 89d4c600a512d9aea35bb4d763e43fe81b138824 (patch) | |
| tree | 8d2d0fc816b940ea6a17c42c3153aff7464fddd7 /src/network/ssl/qsslcertificate_openssl.cpp | |
| parent | c1117ac496df9f7e47fdc82306bb4e20848a04d4 (diff) | |
Ssl: clang-tidy modernize-use-nullptr
And reflow the text where it exceeds the 100 column limit.
Change-Id: I0d270c6a74a4c6ecba30e4e4d38a5d8f2cf81040
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/network/ssl/qsslcertificate_openssl.cpp')
| -rw-r--r-- | src/network/ssl/qsslcertificate_openssl.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/network/ssl/qsslcertificate_openssl.cpp b/src/network/ssl/qsslcertificate_openssl.cpp index fce150d79d..e87264c972 100644 --- a/src/network/ssl/qsslcertificate_openssl.cpp +++ b/src/network/ssl/qsslcertificate_openssl.cpp @@ -187,7 +187,8 @@ QMultiMap<QSsl::AlternativeNameEntryType, QString> QSslCertificate::subjectAlter if (!d->x509) return result; - STACK_OF(GENERAL_NAME) *altNames = (STACK_OF(GENERAL_NAME)*)q_X509_get_ext_d2i(d->x509, NID_subject_alt_name, 0, 0); + STACK_OF(GENERAL_NAME) *altNames = (STACK_OF(GENERAL_NAME) *)q_X509_get_ext_d2i( + d->x509, NID_subject_alt_name, nullptr, nullptr); if (altNames) { for (int i = 0; i < q_sk_GENERAL_NAME_num(altNames); ++i) { @@ -289,7 +290,7 @@ static QVariant x509UnknownExtensionToValue(X509_EXTENSION *ext) // If this extension can be converted if (meth->i2v && ext_internal) { - STACK_OF(CONF_VALUE) *val = meth->i2v(meth, ext_internal, 0); + STACK_OF(CONF_VALUE) *val = meth->i2v(meth, ext_internal, nullptr); QVariantMap map; QVariantList list; @@ -527,7 +528,7 @@ QByteArray QSslCertificatePrivate::QByteArray_from_X509(X509 *x509, QSsl::Encodi } // Use i2d_X509 to convert the X509 to an array. - int length = q_i2d_X509(x509, 0); + int length = q_i2d_X509(x509, nullptr); QByteArray array; array.resize(length); char *data = array.data(); @@ -604,11 +605,11 @@ static QMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name) X509_NAME_ENTRY *e = q_X509_NAME_get_entry(name, i); QByteArray name = QSslCertificatePrivate::asn1ObjectName(q_X509_NAME_ENTRY_get_object(e)); - unsigned char *data = 0; + unsigned char *data = nullptr; int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e)); info.insertMulti(name, QString::fromUtf8((char*)data, size)); #if QT_CONFIG(opensslv11) - q_CRYPTO_free(data, 0, 0); + q_CRYPTO_free(data, nullptr, 0); #else q_CRYPTO_free(data); #endif @@ -679,7 +680,7 @@ QList<QSslCertificate> QSslCertificatePrivate::certificatesFromPem(const QByteAr QByteArray::fromRawData(pem.data() + startPos, endPos - startPos)); const unsigned char *data = (const unsigned char *)decoded.data(); - if (X509 *x509 = q_d2i_X509(0, &data, decoded.size())) { + if (X509 *x509 = q_d2i_X509(nullptr, &data, decoded.size())) { certificates << QSslCertificate_from_X509(x509); q_X509_free(x509); } @@ -697,7 +698,7 @@ QList<QSslCertificate> QSslCertificatePrivate::certificatesFromDer(const QByteAr int size = der.size(); while (size > 0 && (count == -1 || certificates.size() < count)) { - if (X509 *x509 = q_d2i_X509(0, &data, size)) { + if (X509 *x509 = q_d2i_X509(nullptr, &data, size)) { certificates << QSslCertificate_from_X509(x509); q_X509_free(x509); } else { |