Merge pull request #793 from deXol/developBleTOTPCredentials

[BLE] TOTP secret length increase to 64 bytes

Author: limpkin

src/MPDeviceBleImpl.cpp

@@ -659,7 +659,7 @@ void MPDeviceBleImpl::createTOTPCredMessage(const QString &service, const QStrin
     QByteArray loginArr = bleProt->toByteArray(login);
     Common::fill(loginArr, MPNodeBLE::LOGIN_LENGTH - loginArr.size(), ZERO_BYTE);
     data.append(loginArr);
-    // 380->411 TOTP secret key
+    // 380->443 TOTP secret key
     QByteArray secKeyArr;
     secKeyArr.append(secretKey);
     if (secKeyArr.length() > SECRET_KEY_LENGTH)
@@ -669,13 +669,13 @@ void MPDeviceBleImpl::createTOTPCredMessage(const QString &service, const QStrin
     }
     Common::fill(secKeyArr, SECRET_KEY_LENGTH - secKeyArr.size(), ZERO_BYTE);
     data.append(secKeyArr);
-    // 412 TOTP secret key length
+    // 444 TOTP secret key length
     data.append(secretKey.size());
-    // 413 TOTP number of digits
+    // 445 TOTP number of digits
     data.append(codeSize);
-    // 414 TOTP time step
+    // 456 TOTP time step
     data.append(timeStep);
-    // 415 TOTP SHA version
+    // 447 TOTP SHA version
     data.append(ZERO_BYTE);
 
     mmmTOTPStoreArray.append(data);

src/MPDeviceBleImpl.h

@@ -222,7 +222,7 @@ public slots:
     const static int FIRST_DATA_STARTING_ADDR = 10;
     const static int STATUS_MSG_SIZE_WITH_BATTERY = 5;
     const static int BATTERY_BYTE = 1;
-    const static int SECRET_KEY_LENGTH = 32;
+    const static int SECRET_KEY_LENGTH = 64;
     static constexpr int UPLOAD_PASSWORD_BYTE_SIZE = 16;
     const QByteArray DEFAULT_BUNDLE_PASSWORD = "\x63\x44\x31\x91\x3a\xfd\x23\xff\xb3\xac\x93\x69\x22\x5b\xf3\xc0";
 };

src/Mooltipass/MPNodeBLE.h

@@ -59,8 +59,8 @@ class MPNodeBLE : public MPNode
     static constexpr int KEY_AFTER_LOGIN_ADDR_START = 260;
     static constexpr int KEY_AFTER_PWD_ADDR_START = 262;
     static constexpr int PWD_BLANK_FLAG = 266;
-    static constexpr int TOTP_TIME_STEP = 434;
-    static constexpr int TOTP_CODE_SIZE = 436;
+    static constexpr int TOTP_TIME_STEP = 466;
+    static constexpr int TOTP_CODE_SIZE = 468;
     static constexpr int KEY_AFTER_LENGTH = 2;
     static constexpr char BLANK_CHAR = 0x01;
 };

src/TOTPCredential.ui

@@ -62,7 +62,7 @@
           </size>
          </property>
          <property name="maxLength">
-          <number>48</number>
+          <number>72</number>
          </property>
         </widget>
        </item>