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>

5 files changed, 19 insertions, 11 deletions

diff --git a/src/network/ssl/qssl.cpp b/src/network/ssl/qssl.cpp
index 586c8944ca..17f8014e52 100644
--- a/src/network/ssl/qssl.cpp
+++ b/src/network/ssl/qssl.cpp
@@ -82,9 +82,9 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \enum QSsl::AlternateNameEntryType
+    \enum QSsl::AlternativeNameEntryType
 
-    Describes the key types for alternate name entries in QSslCertificate.
+    Describes the key types for alternative name entries in QSslCertificate.
 
     \value EmailEntry An email entry; the entry contains an email address that
     the certificate is valid for.
@@ -92,7 +92,7 @@ QT_BEGIN_NAMESPACE
     \value DnsEntry A DNS host name entry; the entry contains a host name
     entry that the certificate is valid for. The entry may contain wildcards.
 
-    \sa QSslCertificate::alternateSubjectNames()
+    \sa QSslCertificate::subjectAlternativeNames()
 
 */
 
diff --git a/src/network/ssl/qssl.h b/src/network/ssl/qssl.h
index 2ecd1c363c..7b76b64b4c 100644
--- a/src/network/ssl/qssl.h
+++ b/src/network/ssl/qssl.h
@@ -67,11 +67,15 @@ namespace QSsl {
         Dsa
     };
 
-    enum AlternateNameEntryType {
+    enum AlternativeNameEntryType {
         EmailEntry,
         DnsEntry
     };
 
+#if QT_DEPRECATED_SINCE(5,0)
+    typedef AlternativeNameEntryType AlternateNameEntryType;
+#endif
+
     enum SslProtocol {
         SslV3,
         SslV2,
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()
diff --git a/src/network/ssl/qsslcertificate.h b/src/network/ssl/qsslcertificate.h
index a057d7a17d..0498d162c4 100644
--- a/src/network/ssl/qsslcertificate.h
+++ b/src/network/ssl/qsslcertificate.h
@@ -48,6 +48,7 @@
 #include <QtCore/qcryptographichash.h>
 #include <QtCore/qregexp.h>
 #include <QtCore/qsharedpointer.h>
+#include <QtCore/qmap.h>
 #include <QtNetwork/qssl.h>
 
 typedef struct x509_st X509; // ### check if this works
@@ -65,7 +66,6 @@ class QIODevice;
 class QSslError;
 class QSslKey;
 class QStringList;
-template <typename T, typename U> class QMultiMap;
 
 class QSslCertificatePrivate;
 class Q_NETWORK_EXPORT QSslCertificate
@@ -106,7 +106,11 @@ public:
     QStringList subjectInfo(const QByteArray &attribute) const;
     QList<QByteArray> subjectInfoAttributes() const;
     QList<QByteArray> issuerInfoAttributes() const;
-    QMultiMap<QSsl::AlternateNameEntryType, QString> alternateSubjectNames() const;
+#if QT_DEPRECATED_SINCE(5,0)
+    QT_DEPRECATED inline QMultiMap<QSsl::AlternateNameEntryType, QString>
+                  alternateSubjectNames() const { return subjectAlternativeNames(); }
+#endif
+    QMultiMap<QSsl::AlternativeNameEntryType, QString> subjectAlternativeNames() const;
     QDateTime effectiveDate() const;
     QDateTime expiryDate() const;
     QSslKey publicKey() const;
diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
index 11b2ff8bcd..300a5c84d5 100644
--- a/src/network/ssl/qsslsocket_openssl.cpp
+++ b/src/network/ssl/qsslsocket_openssl.cpp
@@ -1435,7 +1435,7 @@ bool QSslSocketBackendPrivate::isMatchingHostname(const QSslCertificate &cert, c
         }
     }
 
-    foreach (const QString &altName, cert.alternateSubjectNames().values(QSsl::DnsEntry)) {
+    foreach (const QString &altName, cert.subjectAlternativeNames().values(QSsl::DnsEntry)) {
         if (isMatchingHostname(altName.toLower(), peerName.toLower())) {
             return true;
         }