Merge lp:~libqtelegram-team/telegram-app/dev-401 into lp:telegram-app/dev

[Roberto Mier Escandon]

Changed default DC from 1 to 4. This is a workaround to fix the problem. Not known exactly the cause of the bug but this fixes it
Also simplified the process of processResPQAnswer in DcAuth class. This way code is better to be figured out if needed to be changed (and avoids original telegram-cli code way)

[lp:~libqtelegram-team/telegram-app/dev-401]

138. By Roberto Mier Escandon on 2015-01-07

fixed as review comments

139. By Roberto Mier Escandon on 2015-01-07

merged dev

[Roberto Mier Escandon (rmescandon)]

- Modified pToBigEndian way of compare to know the length
- removed not well formated blank space

NOTE: findDivider() method searches for a divider for pq value so that
p = divider
q = pq / divider

or reverse if p < q

[Michał Karnicki (karni)]

review: Approve

=== modified file 'lib/core/constants.h'
--- lib/core/constants.h	2014-12-09 17:28:59 +0000
+++ lib/core/constants.h	2015-01-07 16:21:39 +0000
@@ -28,8 +28,6 @@
 #define ENCRYPT_BUFFER_INTS 16384
 #define DECRYPT_BUFFER_INTS 16384
 
-#define LIBQTELEGRAM_SERVER "173.240.5.1"
-#define LIBQTELEGRAM_SERVER_TEST "173.240.5.253"
 // These are the the original
 #define LIBQTELEGRAM_APP_HASH "c68fd5e560aa84dd4b6ad6f489164790"
 #define LIBQTELEGRAM_APP_ID 12433
@@ -40,6 +38,13 @@
 //#define LIBQTELEGRAM_APP_HASH "4b7f87d44de5e0a22248597939c848ae"
 //#define LIBQTELEGRAM_APP_ID 11986
 
+#define PRODUCTION_DEFAULT_DC_ID 4
+#define PRODUCTION_DEFAULT_DC_HOST "149.154.167.91"
+#define PRODUCTION_DEFAULT_DC_PORT 443
+#define TEST_DEFAULT_DC_ID 1
+#define TEST_DEFAULT_DC_HOST "173.240.5.253"
+#define TEST_DEFAULT_DC_PORT 80
+
 #define LIBQTELEGRAM_BUILD "001"
 #define LIBQTELEGRAM_VERSION "1.0.0-SNAPSHOT"
 
 
=== modified file 'lib/core/dcauth.cpp'
--- lib/core/dcauth.cpp	2014-12-02 13:01:22 +0000
+++ lib/core/dcauth.cpp	2015-01-07 16:21:39 +0000
@@ -107,44 +107,9 @@
 
     uint p1 = 0, p2 = 0;
 
-    qCDebug(TG_AUTH_DCAUTH) << what << "received";
-
-    qint32 it = 0;
-    quint64 g = 0;
-    for (i = 0; i < 3 || it < 1000; i++) {
-        qint32 q = ((lrand48() & 15) + 17) % what;
-        quint64 x = (qint64)lrand48 () % (what - 1) + 1, y = x;
-        qint32 lim = 1 << (i + 18);
-        qint32 j;
-        for (j = 1; j < lim; j++) {
-            ++it;
-            quint64 a = x, b = x, c = q;
-            while (b) {
-                if (b & 1) {
-                    c += a;
-                    if (c >= what) {
-                        c -= what;
-                    }
-                }
-                a += a;
-                if (a >= what) {
-                    a -= what;
-                }
-                b >>= 1;
-            }
-            x = c;
-            quint64 z = x < y ? what + x - y : x - y;
-            g = Utils::gcd (z, what);
-            if (g != 1) {
-                break;
-            }
-            if (!(j & (j - 1))) {
-                y = x;
-            }
-        }
-        if (g > 1 && g < what) break;
-    }
-
+    qCDebug(TG_AUTH_DCAUTH) << "received pq =" << what;
+
+    qint64 g = Utils::findDivider(what);
     mAsserter.check(g > 1 && g < what);
     p1 = g;
     p2 = what / g;
@@ -152,7 +117,7 @@
         uint t = p1; p1 = p2; p2 = t;
     }
 
-    qCDebug(TG_AUTH_DCAUTH) << "p1=" << p1 << ", p2=" << p2 << ", " << it << "iterations";
+    qCDebug(TG_AUTH_DCAUTH) << "p1 =" << p1 << ", p2 =" << p2;
 
     mAsserter.check(*(qint32 *) (from) == TL_Vector);
     qint32 fingerprints_num = *(qint32 *)(from + 4);
@@ -175,31 +140,11 @@
     p.appendInt(TL_PQInnerData);
     p.appendCString(buffer + 57, clen);
 
-    if (p1 < 256) {
-        clen = 1;
-    } else if (p1 < 65536) {
-        clen = 2;
-    } else if (p1 < 16777216) {
-        clen = 3;
-    } else {
-        clen = 4;
-    }
-    p1 = __builtin_bswap32 (p1);
-    p.appendCString((char *)&p1 + 4 - clen, clen);
-    p1 = __builtin_bswap32 (p1);
+    QByteArray p1BigEndianBytes = Utils::pToBigEndian(p1);
+    p.appendBytes(p1BigEndianBytes);
 
-    if (p2 < 256) {
-        clen = 1;
-    } else if (p2 < 65536) {
-        clen = 2;
-    } else if (p2 < 16777216) {
-        clen = 3;
-    } else {
-        clen = 4;
-    }
-    p2 = __builtin_bswap32 (p2);
-    p.appendCString((char *)&p2 + 4 - clen, clen);
-    p2 = __builtin_bswap32 (p2);
+    QByteArray p2BigEndianBytes = Utils::pToBigEndian(p2);
+    p.appendBytes(p2BigEndianBytes);
 
     p.appendInts((qint32 *) m_nonce, 4);
     p.appendInts((qint32 *) m_serverNonce, 4);
@@ -215,32 +160,8 @@
     p.appendInt(TL_ReqDHParams);
     p.appendInts((qint32 *) m_nonce, 4);
     p.appendInts((qint32 *) m_serverNonce, 4);
-
-    if (p1 < 256) {
-        clen = 1;
-    } else if (p1 < 65536) {
-        clen = 2;
-    } else if (p1 < 16777216) {
-        clen = 3;
-    } else {
-        clen = 4;
-    }
-    p1 = __builtin_bswap32 (p1);
-    p.appendCString((char *)&p1 + 4 - clen, clen);
-    p1 = __builtin_bswap32 (p1);
-    if (p2 < 256) {
-        clen = 1;
-    } else if (p2 < 65536) {
-        clen = 2;
-    } else if (p2 < 16777216) {
-        clen = 3;
-    } else {
-        clen = 4;
-    }
-    p2 = __builtin_bswap32 (p2);
-    p.appendCString((char *)&p2 + 4 - clen, clen);
-    p2 = __builtin_bswap32 (p2);
-
+    p.appendBytes(p1BigEndianBytes);
+    p.appendBytes(p2BigEndianBytes);
     p.appendLong(Settings::getInstance()->pkFingerprint());
     p.appendCString((char *) encryptBuffer, l);
 
 
=== modified file 'lib/core/dcprovider.cpp'
--- lib/core/dcprovider.cpp	2014-11-18 17:13:16 +0000
+++ lib/core/dcprovider.cpp	2015-01-07 16:21:39 +0000
@@ -1,8 +1,5 @@
 /*
  * Copyright 2014 Canonical Ltd.
- * Authors:
- *      Roberto Mier
- *      Tiago Herrmann
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -87,46 +84,54 @@
       */
 
     // 1.- Get the settings dcs, fullfill m_dcs map and current dc num
-    Settings *s = Settings::getInstance();
-    QList<DC *> dcsList = s->dcsList();
+    Settings *settings = Settings::getInstance();
+    QList<DC *> dcsList = settings->dcsList();
 
     Q_FOREACH (DC *dc, dcsList) {
         mDcs.insert(dc->id(), dc);
     }
 
+    qint32 defaultDcId = settings->testMode() ? TEST_DEFAULT_DC_ID : PRODUCTION_DEFAULT_DC_ID;
+
     // 2.- connect to working DC
-    if (s->workingDcNum() == 1) {
-        // If dcId == 1, it's the default one, so call default host and port
-        if (!mDcs.value(1, 0)) {
-            mDcs[1] = new DC(1);
+    if (settings->workingDcNum() == defaultDcId) {
+        // If dcId == defaultDcId, it's the default one, so call default host and port
+        if (!mDcs.value(defaultDcId, 0)) {
+            mDcs[defaultDcId] = new DC(defaultDcId);
         }
         // if dc hasn't key created, create it
-        if (mDcs[1]->state() < DC::authKeyCreated) {
+        if (mDcs[defaultDcId]->state() < DC::authKeyCreated) {
+            QString defaultDcHost = PRODUCTION_DEFAULT_DC_HOST;
+            qint32 defaultDcPort = PRODUCTION_DEFAULT_DC_PORT;
+            if (settings->testMode()) {
+                defaultDcHost = TEST_DEFAULT_DC_HOST;
+                defaultDcPort = TEST_DEFAULT_DC_PORT;
+            }
             // create a dc authenticator based in dc info
-            s->testMode() ? mDcs[1]->setHost(LIBQTELEGRAM_SERVER_TEST) : mDcs[1]->setHost(LIBQTELEGRAM_SERVER);
-            mDcs[1]->setPort(443);
-            DCAuth *dcAuth = new DCAuth(mDcs[1], this);
-            mDcAuths.insert(1, dcAuth);
+            mDcs[defaultDcId]->setHost(defaultDcHost);
+            mDcs[defaultDcId]->setPort(defaultDcPort);
+            DCAuth *dcAuth = new DCAuth(mDcs[defaultDcId], this);
+            mDcAuths.insert(defaultDcId, dcAuth);
             connect(dcAuth, SIGNAL(fatalError()), this, SLOT(logOut()));
             connect(dcAuth, SIGNAL(fatalError()), this, SIGNAL(fatalError()));
             connect(dcAuth, SIGNAL(dcReady(DC*)), this, SLOT(onDcReady(DC*)));
             dcAuth->createAuthKey();
         } else {
-            onDcReady(mDcs[1]);
+            onDcReady(mDcs[defaultDcId]);
         }
 
     } else {
         // In any other case, the host and port have been retrieved from auth file settings and the DC object is already created
-        if (mDcs[s->workingDcNum()]->state() < DC::authKeyCreated) {
+        if (mDcs[settings->workingDcNum()]->state() < DC::authKeyCreated) {
             // create a dc authenticator based in dc info
-            DCAuth *dcAuth = new DCAuth(mDcs[s->workingDcNum()]);
-            mDcAuths.insert(s->workingDcNum(), dcAuth);
+            DCAuth *dcAuth = new DCAuth(mDcs[settings->workingDcNum()]);
+            mDcAuths.insert(settings->workingDcNum(), dcAuth);
             connect(dcAuth, SIGNAL(fatalError()), this, SLOT(logOut()));
             connect(dcAuth, SIGNAL(fatalError()), this, SIGNAL(fatalError()));
             connect(dcAuth, SIGNAL(dcReady(DC*)), this, SLOT(onDcReady(DC*)));
             dcAuth->createAuthKey();
         } else {
-            onDcReady(mDcs[s->workingDcNum()]);
+            onDcReady(mDcs[settings->workingDcNum()]);
         }
     }
 }
 
=== modified file 'lib/core/settings.cpp'
--- lib/core/settings.cpp	2014-11-18 17:13:16 +0000
+++ lib/core/settings.cpp	2015-01-07 16:21:39 +0000
@@ -144,7 +144,8 @@
 void Settings::readAuthFile() {
     QSettings settings(m_authFilename, QSettings::IniFormat);
     Settings::getInstance()->testMode() ? settings.beginGroup(ST_TEST) : settings.beginGroup(ST_PRODUCTION);
-    m_workingDcNum = settings.value(ST_WORKING_DC_NUM, 1).toInt();
+    qint32 defaultDcId = m_testMode ? TEST_DEFAULT_DC_ID : PRODUCTION_DEFAULT_DC_ID;
+    m_workingDcNum = settings.value(ST_WORKING_DC_NUM, defaultDcId).toInt();
     m_ourId = settings.value(ST_OUR_ID).toInt();
 
     qCDebug(TG_INIT_SETTINGS) << "workingDcNum:" << m_workingDcNum;
 
=== modified file 'lib/core/tlvalues.h'
--- lib/core/tlvalues.h	2014-11-18 17:13:16 +0000
+++ lib/core/tlvalues.h	2015-01-07 16:21:39 +0000
@@ -27,6 +27,7 @@
     TL_ResPQ = 0x05162463,
     TL_ReqDHParams = 0xd712e4be,
     TL_PQInnerData = 0x83c95aec,
+    TL_PQInnerDataTemp = 0x3c6a84d4,
     TL_ServerDHParamsOK = 0xd0e8075c,
     TL_ServerDHParamsFail = 0x79cb045d,
     TL_ServerDHInnerData = 0xb5890dba,
 
=== modified file 'lib/core/utils.cpp'
--- lib/core/utils.cpp	2014-11-17 20:28:24 +0000
+++ lib/core/utils.cpp	2015-01-07 16:21:39 +0000
@@ -33,6 +33,11 @@
 #include <QtMultimedia/QMediaResource>
 #include <QProcess>
 #include <QStringList>
+#include <QtCore>
+
+
+Q_LOGGING_CATEGORY(TG_UTILS, "tg.utils")
+
 
 Utils::Utils(QObject *parent) :
     QObject(parent)
@@ -157,16 +162,16 @@
     RSA *pubKey = NULL;
     FILE *f = fopen (publicKeyName.toLocal8Bit().data(), "r");
     if (f == NULL) {
-        qWarning() << "Couldn't open public key file" << publicKeyName;
+        qCWarning(TG_UTILS) << "Couldn't open public key file" << publicKeyName;
         return NULL;
     }
     pubKey = PEM_read_RSAPublicKey (f, NULL, NULL, NULL);
     fclose (f);
     if (pubKey == NULL) {
-        qWarning() << "PEM_read_RSAPublicKey returns NULL";
+        qCWarning(TG_UTILS) << "PEM_read_RSAPublicKey returns NULL";
         return NULL;
     }
-    qDebug() << "public key" << publicKeyName << "loaded successfully";
+    qCDebug(TG_UTILS) << "public key" << publicKeyName << "loaded successfully";
     return pubKey;
 }
 
@@ -312,3 +317,61 @@
 
     return filteredChars;
 }
+
+QByteArray Utils::pToBigEndian(quint32 p) {;
+    qint32 pLength;
+    if (p < (1 << 8)) {
+        pLength = 1;
+    } else if (p < (1 << 16)) {
+        pLength = 2;
+    } else if (p < (1 << 24)) {
+        pLength = 3;
+    } else {
+        pLength = 4;
+    }
+
+    uchar beP[4];
+    qToBigEndian(p, beP);
+
+    return QByteArray((const char *)beP, pLength);
+}
+
+qint64 Utils::findDivider(qint64 pq) {
+    qint32 it = 0;
+    quint64 g = 0;
+    for (int i = 0; i < 3 || it < 1000; i++) {
+        qint32 q = ((lrand48() & 15) + 17) % pq;
+        quint64 x = (qint64)lrand48 () % (pq - 1) + 1, y = x;
+        qint32 lim = 1 << (i + 18);
+        qint32 j;
+        for (j = 1; j < lim; j++) {
+            ++it;
+            quint64 a = x, b = x, c = q;
+            while (b) {
+                if (b & 1) {
+                    c += a;
+                    if (c >= pq) {
+                        c -= pq;
+                    }
+                }
+                a += a;
+                if (a >= pq) {
+                    a -= pq;
+                }
+                b >>= 1;
+            }
+            x = c;
+            quint64 z = x < y ? pq + x - y : x - y;
+            g = Utils::gcd(z, pq);
+            if (g != 1) {
+                break;
+            }
+            if (!(j & (j - 1))) {
+                y = x;
+            }
+        }
+        if (g > 1 && g < pq) break;
+    }
+    qCDebug(TG_UTILS) << "got" << g << "divider after" << it << "iterations";
+    return g;
+}
 
=== modified file 'lib/core/utils.h'
--- lib/core/utils.h	2014-11-17 11:31:25 +0000
+++ lib/core/utils.h	2015-01-07 16:21:39 +0000
@@ -35,6 +35,10 @@
 #include <QObject>
 #include <openssl/bn.h>
 #include "constants.h"
+#include <QLoggingCategory>
+
+Q_DECLARE_LOGGING_CATEGORY(TG_UTILS)
+
 
 class Utils : public QObject
 {
@@ -76,6 +80,9 @@
     static QString createThumbnail(const QString &resource);
 
     static QString parsePhoneNumberDigits(const QString &phoneNumber);
+
+    static QByteArray pToBigEndian(quint32 p);
+    static qint64 findDivider(qint64 pq);
 };
 
 #endif // UTILS_H
 
=== modified file 'qmlplugin/models/dialogsmodel.cpp'
--- qmlplugin/models/dialogsmodel.cpp	2014-12-15 15:56:52 +0000
+++ qmlplugin/models/dialogsmodel.cpp	2015-01-07 16:21:39 +0000
@@ -268,6 +268,7 @@
     }
 
     qCDebug(TG_PLUGIN_LOGIC) << "fetch more:" << mCanFetchMore;
+
     return mCanFetchMore;
 }