Use QCryptographicHash::hash() more widely

... instead of the "usual" rule of three: ctor, addData(), result().

Not only does it generate less code in the caller, it's now also
faster.

Change-Id: I67c7eeb01f527b90e80a08f60c1c7f2ec1e49dd4
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

1 files changed, 2 insertions, 6 deletions

diff --git a/src/plugins/tls/shared/qsslsocket_qt.cpp b/src/plugins/tls/shared/qsslsocket_qt.cpp
index 128459ea19..8f8a87138f 100644
--- a/src/plugins/tls/shared/qsslsocket_qt.cpp
+++ b/src/plugins/tls/shared/qsslsocket_qt.cpp
@@ -109,15 +109,11 @@ static QByteArray _q_PKCS12_keygen(char id, const QByteArray &salt, const QStrin
     QByteArray A;
     QByteArray B;
     B.resize(v);
-    QCryptographicHash hash(QCryptographicHash::Sha1);
     for (int i = 0; i < c; ++i) {
         // hash r iterations
         QByteArray Ai = D + I;
-        for (int j = 0; j < r; ++j) {
-            hash.reset();
-            hash.addData(Ai);
-            Ai = hash.result();
-        }
+        for (int j = 0; j < r; ++j)
+            Ai = QCryptographicHash::hash(Ai, QCryptographicHash::Sha1);
 
         for (int j = 0; j < v; ++j)
             B[j] = Ai[j % u];