6 files changed, 38 insertions, 5 deletions
diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp
index 8d38a5fd54..13bddcb3ea 100644
--- a/src/network/ssl/qsslcertificate.cpp
+++ b/src/network/ssl/qsslcertificate.cpp
@@ -662,7 +662,13 @@ QByteArray QSslCertificatePrivate::subjectInfoToString(QSslCertificate::SubjectI
     return str;
 }
 
+/*!
+    \fn uint qHash(const QSslCertificate &key, uint seed)
 
+    Returns the hash value for the \a key, using \a seed to seed the calculation.
+    \since 5.4
+    \relates QHash
+*/
 
 #ifndef QT_NO_DEBUG_STREAM
 QDebug operator<<(QDebug debug, const QSslCertificate &certificate)
diff --git a/src/network/ssl/qsslcertificate.h b/src/network/ssl/qsslcertificate.h
index d1290b1d42..e34ea97fc4 100644
--- a/src/network/ssl/qsslcertificate.h
+++ b/src/network/ssl/qsslcertificate.h
@@ -59,6 +59,10 @@ class QSslKey;
 class QSslCertificateExtension;
 class QStringList;
 
+class QSslCertificate;
+// qHash is a friend, but we can't use default arguments for friends (§8.3.6.4)
+Q_NETWORK_EXPORT uint qHash(const QSslCertificate &key, uint seed = 0) Q_DECL_NOTHROW;
+
 class QSslCertificatePrivate;
 class Q_NETWORK_EXPORT QSslCertificate
 {
@@ -145,6 +149,8 @@ private:
     QExplicitlySharedDataPointer<QSslCertificatePrivate> d;
     friend class QSslCertificatePrivate;
     friend class QSslSocketBackendPrivate;
+
+    friend Q_NETWORK_EXPORT uint qHash(const QSslCertificate &key, uint seed) Q_DECL_NOTHROW;
 };
 Q_DECLARE_SHARED(QSslCertificate)
 
diff --git a/src/network/ssl/qsslcertificate_openssl.cpp b/src/network/ssl/qsslcertificate_openssl.cpp
index 850654835d..1906c72ff8 100644
--- a/src/network/ssl/qsslcertificate_openssl.cpp
+++ b/src/network/ssl/qsslcertificate_openssl.cpp
@@ -62,6 +62,17 @@ bool QSslCertificate::operator==(const QSslCertificate &other) const
     return false;
 }
 
+uint qHash(const QSslCertificate &key, uint seed) Q_DECL_NOTHROW
+{
+    if (X509 * const x509 = key.d->x509) {
+        (void)q_X509_cmp(x509, x509); // populate x509->sha1_hash
+                                      // (if someone knows a better way...)
+        return qHashBits(x509->sha1_hash, SHA_DIGEST_LENGTH, seed);
+    } else {
+        return seed;
+    }
+}
+
 bool QSslCertificate::isNull() const
 {
     return d->null;
diff --git a/src/network/ssl/qsslcertificate_qt.cpp b/src/network/ssl/qsslcertificate_qt.cpp
index 16df4a8f73..d74042a95f 100644
--- a/src/network/ssl/qsslcertificate_qt.cpp
+++ b/src/network/ssl/qsslcertificate_qt.cpp
@@ -67,6 +67,12 @@ bool QSslCertificate::operator==(const QSslCertificate &other) const
     return d->derData == other.d->derData;
 }
 
+uint qHash(const QSslCertificate &key, uint seed) Q_DECL_NOTHROW
+{
+    // DER is the native encoding here, so toDer() is just "return d->derData":
+    return qHash(key.toDer(), seed);
+}
+
 bool QSslCertificate::isNull() const
 {
     return d->null;
diff --git a/src/network/ssl/qsslsocket_winrt.cpp b/src/network/ssl/qsslsocket_winrt.cpp
index c9ddd9ec1b..69f8b6d68a 100644
--- a/src/network/ssl/qsslsocket_winrt.cpp
+++ b/src/network/ssl/qsslsocket_winrt.cpp
@@ -70,11 +70,6 @@ inline uint qHash(const QSslError &error, uint seed)
     Q_DECL_NOEXCEPT_EXPR(noexcept(qHash(error)))
 { return (qHash(error.error()) ^ seed); }
 
-// For QSet<QSslCertificate>
-inline uint qHash(const QSslCertificate &certificate, uint seed)
-    Q_DECL_NOEXCEPT_EXPR(noexcept(qHash(certificate)))
-{ return (qHash(certificate.handle()) ^ seed); }
-
 bool QSslSocketPrivate::s_libraryLoaded = true;
 bool QSslSocketPrivate::s_loadRootCertsOnDemand = true;
 bool QSslSocketPrivate::s_loadedCiphersAndCerts = false;
diff --git a/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp b/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp
index 67cbd5059f..49ff1b48fe 100644
--- a/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp
+++ b/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp
@@ -70,6 +70,7 @@ public slots:
 
 #ifndef QT_NO_SSL
 private slots:
+    void hash();
     void emptyConstructor();
     void constructor_data();
     void constructor();
@@ -164,6 +165,14 @@ void tst_QSslCertificate::cleanupTestCase()
 
 #ifndef QT_NO_SSL
 
+void tst_QSslCertificate::hash()
+{
+    // mostly a compile-only test, to check that qHash(QSslCertificate) is found.
+    QSet<QSslCertificate> certs;
+    certs << QSslCertificate();
+    QCOMPARE(certs.size(), 1);
+}
+
 static QByteArray readFile(const QString &absFilePath)
 {
     QFile file(absFilePath);