Merge branch 'pr/101' into unleashed

Author: RogueMaster

applications/meta/application.fam

@@ -25,6 +25,7 @@ App(
         "bad_usb",
         "u2f",
         "elf_loader",
+        "totp",
     ],
 )
 
@@ -38,6 +39,11 @@ App(
         "INTAPP_MouseJacker",
         "INTAPP_NRFSniff",
         "INTAPP_TouchTunes",
+		
+        "APPS_WAVPlayer",
+        "APPS_SpectrumAnalyzer","APPS_BluetoothRemote","APPS_DolphinRestorer",
+		"APPS_DolphinBackup","APPS_MusicPlayer",
+        "APPS_SentrySafe","APPS_BarcodeGenerator","APPS_MouseJiggler",
     ],
 )
 
@@ -50,6 +56,9 @@ App(
         "INTAPP_GameOfLife",
         "INTAPP_Raycast",
         "INTAPP_Tetris",
+        "GAME_2048","GAME_Arkanoid","GAME_Dice",
+		"GAME_Snake","GAME_TicTacToe",,"GAME_MandelbrotSet"
+        "GAME_VideoPoker","GAME_FlappyBird",
     ],
 )
 
@@ -81,12 +90,13 @@ App(
 		"INTAPP_Chip8","INTAPP_Chess",
         "Clock",
         "UniRFRemix",
+		"totp",
         "APPS_WAVPlayer",
         "APPS_SpectrumAnalyzer","APPS_BluetoothRemote","APPS_DolphinRestorer",
-		"APPS_DolphinBackup","GAME_MandelbrotSet","APPS_MusicPlayer",
+		"APPS_DolphinBackup","APPS_MusicPlayer",
         "APPS_SentrySafe","APPS_BarcodeGenerator","APPS_MouseJiggler",
         "GAME_2048","GAME_Arkanoid","GAME_Dice",
-		"GAME_Snake","GAME_TicTacToe",
+		"GAME_Snake","GAME_TicTacToe",,"GAME_MandelbrotSet"
         "GAME_VideoPoker","GAME_FlappyBird",
     ],
 )

applications/totp/application.fam

@@ -0,0 +1,14 @@
+App(
+    appid="totp",
+    name="TOTP",
+    apptype=FlipperAppType.APP,
+    entry_point="totp_app",
+    cdefines=["APP_TOTP"],
+    requires=[
+        "gui",
+        "dialogs",
+    ],
+    stack_size=2 * 1024,
+    icon="A_U2F_14",
+    order=80,
+)

applications/totp/totp_app.c

@@ -0,0 +1,207 @@
+#include <furi.h>
+#include <furi_hal.h>
+
+#include <gui/gui.h>
+#include <input/input.h>
+
+#include <notification/notification_messages.h>
+
+#include <totp.h>
+#include "totp_app.h"
+
+#include <base32.h>
+#include <time.h>
+
+#include <toolbox/path.h>
+#include <flipper_format/flipper_format.h>
+
+static const char* totp_file_header = "Flipper TOTP storage";
+static const uint32_t totp_file_version = 1;
+
+typedef enum {
+    TotpEventTypeTick,
+    TotpEventTypeInput,
+} TotpEventType;
+
+typedef struct {
+    TotpEventType type;
+    InputEvent input;
+    uint32_t code;
+} TotpEvent;
+
+uint8_t keyId = 0;
+uint8_t keys = 3;
+uint8_t* base32key[] = {
+    (unsigned char*)"JBSWY3DPEHPK3PXP",
+    (unsigned char*)"AMOGUSYOBABOBAAA",
+    (unsigned char*)"AMOGUSAAAAAAAAAA"};
+const char* keyNames[] = {"Test Key 1", "Test Key 2", "Amogus key"};
+
+int keyLengths[] = {10, 10, 10};
+
+static void totp_app_draw_callback(Canvas* canvas, void* ctx) {
+    osMessageQueueId_t event_queue = ctx;
+    TotpEvent event;
+    osMessageQueueGet(event_queue, &event, NULL, osWaitForever);
+
+    uint8_t hmacKey[20];
+
+    int timezone = -3;
+
+    canvas_clear(canvas);
+    canvas_set_font(canvas, FontPrimary);
+    canvas_draw_str(canvas, 2, 10, "TOTP");
+    canvas_draw_str(canvas, 2, 30, keyNames[keyId]);
+
+    //FURI_LOG_I("TOTP", "key is %s", base32key[keyId]);
+
+    base32_decode(base32key[keyId], hmacKey, keyLengths[keyId]);
+    //FURI_LOG_I("TOTP", "len = %d", len);
+
+    //uint8_t hmacKey[] = {0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x21, 0xde, 0xad, 0xbe, 0xef}; // Secret key
+    TOTP(hmacKey, keyLengths[keyId], 30); // Secret key, Secret key length, Timestep (30s)
+
+    FuriHalRtcDateTime datetime = {0};
+    furi_hal_rtc_get_datetime(&datetime);
+
+    struct tm date = {0};
+    date.tm_hour = datetime.hour + timezone;
+    date.tm_min = datetime.minute;
+    date.tm_sec = datetime.second;
+    date.tm_mday = datetime.day;
+    date.tm_mon = datetime.month - 1;
+    date.tm_year = datetime.year - 1900;
+    // god i hate these 5 lines
+
+    uint32_t newCode = getCodeFromTimestamp(mktime(&date));
+    //FURI_LOG_I("TOTP", "%06ld", newCode);
+    char code_string[100] = "";
+    sprintf(code_string, "%06ld", newCode);
+    canvas_draw_str(canvas, 2, 20, code_string);
+    sprintf(code_string, "%d seconds left", 29 - date.tm_sec % 30);
+    canvas_draw_str(canvas, 2, 40, code_string);
+    sprintf(
+        code_string,
+        "%02d:%02d:%02d %02d-%02d-%04d",
+        datetime.hour + timezone,
+        datetime.minute,
+        datetime.second,
+        datetime.day,
+        datetime.month,
+        datetime.year);
+    canvas_draw_str(canvas, 2, 50, code_string);
+    canvas_draw_box(canvas, 0, 52, (29 - (date.tm_sec % 30)) * 4.414, 10);
+}
+
+static void totp_app_input_callback(InputEvent* input_event, void* ctx) {
+    furi_assert(ctx);
+    osMessageQueueId_t event_queue = ctx;
+
+    TotpEvent event = {.type = TotpEventTypeInput, .input = *input_event};
+    osMessageQueuePut(event_queue, &event, 0, osWaitForever);
+}
+
+void totp_app_update(void* ctx) {
+    furi_assert(ctx);
+    osMessageQueueId_t event_queue = ctx;
+    TotpEvent event = {.type = TotpEventTypeTick};
+    osMessageQueuePut(event_queue, &event, 0, 0);
+}
+
+int32_t totp_app(void* p) {
+    UNUSED(p);
+    bool saved = false;
+    Storage* storage = furi_record_open("storage");
+    FlipperFormat* file = flipper_format_file_alloc(storage);
+    string_t temp_str;
+    char key_name[50] = "";
+    string_init(temp_str);
+
+    do {
+        // Create nfc directory if necessary
+        if(!storage_simply_mkdir(storage, TOTP_APP_FOLDER)) break;
+        // Open file
+        string_printf(temp_str, "%s/%s%s", "/ext/totp", "keys", ".totp");
+        // Open file
+        if(!flipper_format_file_open_always(file, string_get_cstr(temp_str))) break;
+        // Write header
+        if(!flipper_format_write_header_cstr(file, totp_file_header, totp_file_version)) break;
+        // Write nfc device type
+        //nfc_device_prepare_format_string(dev, temp_str);
+
+        for(int key = 0; key < keys; key++) {
+            string_printf(temp_str, "%s", base32key[key]);
+            sprintf(key_name, "%s", keyNames[key]);
+
+            if(!flipper_format_write_string(file, key_name, temp_str)) break;
+        }
+        //if(!flipper_format_write_hex(file, "Totp key 1", base32key[0], sizeof(base32key[0])))
+        //    break;
+        // Write UID, ATQA, SAK
+        //if(!flipper_format_write_comment_cstr(file, "UID, ATQA and SAK are common for all formats"))
+        //    break;
+        //if(!flipper_format_write_hex(file, "UID", data->uid, data->uid_len)) break;
+        //if(!flipper_format_write_hex(file, "ATQA", data->atqa, 2)) break;
+        //if(!flipper_format_write_hex(file, "SAK", &data->sak, 1)) break;
+        // Save more data if necessary
+        //if(dev->format == NfcDeviceSaveFormatMifareUl) {
+        //    if(!nfc_device_save_mifare_ul_data(file, dev)) break;
+        //} else if(dev->format == NfcDeviceSaveFormatBankCard) {
+        //    if(!nfc_device_save_bank_card_data(file, dev)) break;
+        //}
+        saved = true;
+    } while(0);
+    if(saved) {
+        flipper_format_free(file);
+        furi_record_close("storage");
+    } else {
+        flipper_format_free(file);
+        furi_record_close("storage");
+    }
+
+    osMessageQueueId_t event_queue = osMessageQueueNew(8, sizeof(TotpEvent), NULL);
+    // Configure view port
+    ViewPort* view_port = view_port_alloc();
+    view_port_input_callback_set(view_port, totp_app_input_callback, event_queue);
+    view_port_draw_callback_set(view_port, totp_app_draw_callback, NULL);
+
+    // Register view port in GUI
+    Gui* gui = furi_record_open("gui");
+    gui_add_view_port(gui, view_port, GuiLayerFullscreen);
+    view_port_update(view_port);
+
+    osTimerId_t timer = osTimerNew(totp_app_update, osTimerPeriodic, event_queue, NULL);
+    osTimerStart(timer, osKernelGetTickFreq());
+
+    TotpEvent event;
+
+    while(1) {
+        view_port_update(view_port);
+        furi_check(osMessageQueueGet(event_queue, &event, NULL, osWaitForever) == osOK);
+
+        if((event.input.type == InputTypeShort) && (event.input.key == InputKeyBack)) {
+            break;
+        } else if((event.input.type == InputTypeShort) && (event.input.key == InputKeyRight)) {
+            if(keyId < keys - 1) {
+                keyId++;
+            } else {
+                keyId = 0;
+            }
+        } else if((event.input.type == InputTypeShort) && (event.input.key == InputKeyLeft)) {
+            if(keyId > 0) {
+                keyId--;
+            } else {
+                keyId = keys - 1;
+            }
+        }
+    }
+
+    osTimerDelete(timer);
+
+    gui_remove_view_port(gui, view_port);
+    view_port_free(view_port);
+    osMessageQueueDelete(event_queue);
+
+    furi_record_close("gui");
+    return 0;
+}

applications/totp/totp_app.h

@@ -0,0 +1,4 @@
+#pragma once
+
+#define TOTP_APP_FOLDER "/any/totp"
+#define TOTP_APP_EXTENSION ".totp"

assets/compiled/totp.pb.c

@@ -0,0 +1,15 @@
+/* Automatically generated nanopb constant definitions */
+/* Generated by nanopb-0.4.5 */
+
+#include "totp.pb.h"
+#if PB_PROTO_HEADER_VERSION != 40
+#error Regenerate this file with the current version of nanopb generator.
+#endif
+
+PB_BIND(PB_TOTP_TotpKey, PB_TOTP_TotpKey, AUTO)
+
+
+PB_BIND(PB_TOTP_getKeyIdsResponse, PB_TOTP_getKeyIdsResponse, AUTO)
+
+
+

assets/compiled/totp.pb.h

@@ -0,0 +1,68 @@
+/* Automatically generated nanopb header */
+/* Generated by nanopb-0.4.5 */
+
+#ifndef PB_PB_TOTP_TOTP_PB_H_INCLUDED
+#define PB_PB_TOTP_TOTP_PB_H_INCLUDED
+#include <pb.h>
+
+#if PB_PROTO_HEADER_VERSION != 40
+#error Regenerate this file with the current version of nanopb generator.
+#endif
+
+/* Struct definitions */
+typedef struct _PB_TOTP_TotpKey { 
+    char *key; 
+    uint32_t keyId; 
+} PB_TOTP_TotpKey;
+
+typedef struct _PB_TOTP_getKeyIdsResponse { 
+    uint32_t keysAmount; 
+    uint32_t *keyIds; 
+} PB_TOTP_getKeyIdsResponse;
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Initializer values for message structs */
+#define PB_TOTP_TotpKey_init_default             {NULL, 0}
+#define PB_TOTP_getKeyIdsResponse_init_default   {0, NULL}
+#define PB_TOTP_TotpKey_init_zero                {NULL, 0}
+#define PB_TOTP_getKeyIdsResponse_init_zero      {0, NULL}
+
+/* Field tags (for use in manual encoding/decoding) */
+#define PB_TOTP_TotpKey_key_tag                  1
+#define PB_TOTP_TotpKey_keyId_tag                2
+#define PB_TOTP_getKeyIdsResponse_keysAmount_tag 1
+#define PB_TOTP_getKeyIdsResponse_keyIds_tag     2
+
+/* Struct field encoding specification for nanopb */
+#define PB_TOTP_TotpKey_FIELDLIST(X, a) \
+X(a, POINTER,  SINGULAR, STRING,   key,               1) \
+X(a, STATIC,   SINGULAR, UINT32,   keyId,             2)
+#define PB_TOTP_TotpKey_CALLBACK NULL
+#define PB_TOTP_TotpKey_DEFAULT NULL
+
+#define PB_TOTP_getKeyIdsResponse_FIELDLIST(X, a) \
+X(a, STATIC,   SINGULAR, UINT32,   keysAmount,        1) \
+X(a, POINTER,  SINGULAR, UINT32,   keyIds,            2)
+#define PB_TOTP_getKeyIdsResponse_CALLBACK NULL
+#define PB_TOTP_getKeyIdsResponse_DEFAULT NULL
+
+extern const pb_msgdesc_t PB_TOTP_TotpKey_msg;
+extern const pb_msgdesc_t PB_TOTP_getKeyIdsResponse_msg;
+
+/* Defines for backwards compatibility with code written before nanopb-0.4.0 */
+#define PB_TOTP_TotpKey_fields &PB_TOTP_TotpKey_msg
+#define PB_TOTP_getKeyIdsResponse_fields &PB_TOTP_getKeyIdsResponse_msg
+
+/* Maximum encoded size of messages (where known) */
+/* PB_TOTP_TotpKey_size depends on runtime parameters */
+/* PB_TOTP_getKeyIdsResponse_size depends on runtime parameters */
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif

lib/TOTP-MCU/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019 Weravech
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.