diff options
| author | Peter Hartmann <peter.hartmann@nokia.com> | 2011-08-03 18:36:55 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-04 16:13:33 +0200 |
| commit | 8ef86d05f199ebab216da43d5e0a9dc322b657b3 (patch) | |
| tree | ea8fac9adf6ce41b530bdb2bc6f4b79010f871f9 /src/network/ssl/qsslcertificate.cpp | |
| parent | 69d6012de469185aa70c86fec69fcb908acfde0c (diff) | |
QSslCertificate: deprecate alternateSubjectNames()
... and add a new method subjectAlternativeNames() instead. This was
a typo in the API.
Change-Id: Id8704c387c9ff8e1af2b9a524ff628f5c053a294
Reviewed-on: http://codereview.qt.nokia.com/2618
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Diffstat (limited to 'src/network/ssl/qsslcertificate.cpp')
| -rw-r--r-- | src/network/ssl/qsslcertificate.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp index 94273b0754..af265db6e4 100644 --- a/src/network/ssl/qsslcertificate.cpp +++ b/src/network/ssl/qsslcertificate.cpp @@ -426,7 +426,7 @@ QList<QByteArray> QSslCertificate::issuerInfoAttributes() const /*! Returns the list of alternative subject names for this - certificate. The alternate subject names typically contain host + certificate. The alternative names typically contain host names, optionally with wildcards, that are valid for this certificate. @@ -437,9 +437,9 @@ QList<QByteArray> QSslCertificate::issuerInfoAttributes() const \sa subjectInfo() */ -QMultiMap<QSsl::AlternateNameEntryType, QString> QSslCertificate::alternateSubjectNames() const +QMultiMap<QSsl::AlternativeNameEntryType, QString> QSslCertificate::subjectAlternativeNames() const { - QMultiMap<QSsl::AlternateNameEntryType, QString> result; + QMultiMap<QSsl::AlternativeNameEntryType, QString> result; if (!d->x509) return result; @@ -922,7 +922,7 @@ QDebug operator<<(QDebug debug, const QSslCertificate &certificate) << ',' << certificate.digest().toBase64() << ',' << certificate.issuerInfo(QSslCertificate::Organization) << ',' << certificate.subjectInfo(QSslCertificate::Organization) - << ',' << certificate.alternateSubjectNames() + << ',' << certificate.subjectAlternativeNames() #ifndef QT_NO_TEXTSTREAM << ',' << certificate.effectiveDate() << ',' << certificate.expiryDate() |