 e02040107b
			
		
	
	
		e02040107b
		
			
		
	
	
	
	
		
			
			* WIP on stripping fw * Compact FW build - use RAM_EXEC=1 COMPACT=1 DEBUG=0 * Fixed uninitialized storage struct; small fixes to compact fw * Flasher srv w/mocked flash ops * Fixed typos & accomodated FFF changes * Alternative fw startup branch * Working load & jmp to RAM fw * +manifest processing for stage loader; + crc verification for stage payload * Fixed questionable code & potential leaks * Lowered screen update rate; added radio stack update stubs; working dfu write * Console EP with manifest & stage validation * Added microtar lib; minor ui fixes for updater * Removed microtar * Removed mtar #2 * Added a better version of microtar * TAR archive api; LFS backup & restore core * Recursive backup/restore * LFS worker thread * Added system apps to loader - not visible in UI; full update process with restarts * Typo fix * Dropped BL & f6; tooling for updater WIP * Minor py fixes * Minor fixes to make it build after merge * Ported flash workaround from BL + fixed visuals * Minor cleanup * Chmod + loader app search fix * Python linter fix * Removed usb stuff & float read support for staged loader == -10% of binary size * Added backup/restore & update pb requests * Added stub impl to RPC for backup/restore/update commands * Reworked TAR to use borrowed Storage api; slightly reduced build size by removing `static string`; hidden update-related RPC behind defines * Moved backup&restore to storage * Fixed new message types * Backup/restore/update RPC impl * Moved furi_hal_crc to LL; minor fixes * CRC HAL rework to LL * Purging STM HAL * Brought back minimal DFU boot mode (no gui); additional crc state checks * Added splash screen, BROKEN usb function * Clock init rework WIP * Stripped graphics from DFU mode * Temp fix for unused static fun * WIP update picker - broken! * Fixed UI * Bumping version * Fixed RTC setup * Backup to update folder instead of ext root * Removed unused scenes & more usb remnants from staged loader * CI updates * Fixed update bundle name * Temporary restored USB handler * Attempt to prevent .text corruption * Comments on how I spent this Saturday * Added update file icon * Documentation updates * Moved common code to lib folder * Storage: more unit tests * Storage: blocking dir open, differentiate file and dir when freed. * Major refactoring; added input processing to updater to allow retrying on failures (not very useful prob). Added API for extraction of thread return value * Removed re-init check for manifest * Changed low-level path manipulation to toolbox/path.h; makefile cleanup; tiny fix in lint.py * Increased update worker stack size * Text fixes in backup CLI * Displaying number of update stages to run; removed timeout in handling errors * Bumping version * Added thread cleanup for spawner thread * Updated build targets to exclude firmware bundle from 'ALL' * Fixed makefile for update_package; skipping VCP init for update mode (ugly) * Switched github build from ALL to update_package * Added +x for dist_update.sh * Cli: add total heap size to "free" command * Moved (RAM) suffix to build version instead of git commit no. * DFU comment * Some fixes suggested by clang-tidy * Fixed recursive PREFIX macro * Makefile: gather all new rules in updater namespace. FuriHal: rename bootloader to boot, isr safe delays * Github: correct build target name in firmware build * FuriHal: move target switch to boot * Makefile: fix firmware flash * Furi, FuriHal: move kernel start to furi, early init * Drop bootloader related stuff * Drop cube. Drop bootloader linker script. * Renamed update_hl, moved constants to #defines * Moved update-related boot mode to separate bitfield * Reworked updater cli to single entry point; fixed crash on tar cleanup * Added Python replacement for dist shell scripts * Linter fixes for dist.py +x * Fixes for environment suffix * Dropped bash scripts * Added dirty build flag to version structure & interfaces * Version string escapes * Fixed flag logic in dist.py; added support for App instances being imported and not terminating the whole program * Fixed fw address in ReadMe.md * Rpc: fix crash on double screen start * Return back original boot behavior and fix jump to system bootloader * Cleanup code, add error sequence for RTC * Update firmware readme * FuriHal: drop boot, restructure RTC registers usage and add header register check * Furi goes first * Toolchain: add ccache support * Renamed update bundle dir Co-authored-by: DrZlo13 <who.just.the.doctor@gmail.com> Co-authored-by: あく <alleteam@gmail.com>
		
			
				
	
	
		
			324 lines
		
	
	
		
			9.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			324 lines
		
	
	
		
			9.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| #include <furi_hal.h>
 | |
| #include <furi.h>
 | |
| 
 | |
| #include <lib/toolbox/args.h>
 | |
| #include <cli/cli.h>
 | |
| 
 | |
| void crypto_cli_print_usage() {
 | |
|     printf("Usage:\r\n");
 | |
|     printf("crypto <cmd> <args>\r\n");
 | |
|     printf("Cmd list:\r\n");
 | |
|     printf(
 | |
|         "\tencrypt <key_slot:int> <iv:hex>\t - Using key from secure enclave and IV encrypt plain text with AES256CBC and encode to hex\r\n");
 | |
|     printf(
 | |
|         "\tdecrypt <key_slot:int> <iv:hex>\t - Using key from secure enclave and IV decrypt hex encoded encrypted with AES256CBC data to plain text\r\n");
 | |
|     printf("\thas_key <key_slot:int>\t - Check if secure enclave has key in slot\r\n");
 | |
|     printf(
 | |
|         "\tstore_key <key_slot:int> <key_type:str> <key_size:int> <key_data:hex>\t - Store key in secure enclave. !!! NON-REVERSABLE OPERATION - READ MANUAL FIRST !!!\r\n");
 | |
| };
 | |
| 
 | |
| void crypto_cli_encrypt(Cli* cli, string_t args) {
 | |
|     int key_slot = 0;
 | |
|     bool key_loaded = false;
 | |
|     uint8_t iv[16];
 | |
| 
 | |
|     do {
 | |
|         if(!args_read_int_and_trim(args, &key_slot) || !(key_slot > 0 && key_slot <= 100)) {
 | |
|             printf("Incorrect or missing slot, expected int 1-100");
 | |
|             break;
 | |
|         }
 | |
| 
 | |
|         if(!args_read_hex_bytes(args, iv, 16)) {
 | |
|             printf("Incorrect or missing IV, expected 16 bytes in hex");
 | |
|             break;
 | |
|         }
 | |
| 
 | |
|         if(!furi_hal_crypto_store_load_key(key_slot, iv)) {
 | |
|             printf("Unable to load key from slot %d", key_slot);
 | |
|             break;
 | |
|         }
 | |
|         key_loaded = true;
 | |
| 
 | |
|         printf("Enter plain text and press Ctrl+C to complete encryption:\r\n");
 | |
| 
 | |
|         string_t input;
 | |
|         string_init(input);
 | |
|         char c;
 | |
|         while(cli_read(cli, (uint8_t*)&c, 1) == 1) {
 | |
|             if(c == CliSymbolAsciiETX) {
 | |
|                 printf("\r\n");
 | |
|                 break;
 | |
|             } else if(c >= 0x20 && c < 0x7F) {
 | |
|                 putc(c, stdout);
 | |
|                 fflush(stdout);
 | |
|                 string_push_back(input, c);
 | |
|             } else if(c == CliSymbolAsciiCR) {
 | |
|                 printf("\r\n");
 | |
|                 string_cat_str(input, "\r\n");
 | |
|             }
 | |
|         }
 | |
| 
 | |
|         size_t size = string_size(input);
 | |
|         if(size > 0) {
 | |
|             // C-string null termination and block alignments
 | |
|             size++;
 | |
|             size_t remain = size % 16;
 | |
|             if(remain) {
 | |
|                 size = size - remain + 16;
 | |
|             }
 | |
|             string_reserve(input, size);
 | |
|             uint8_t* output = malloc(size);
 | |
|             if(!furi_hal_crypto_encrypt((const uint8_t*)string_get_cstr(input), output, size)) {
 | |
|                 printf("Failed to encrypt input");
 | |
|             } else {
 | |
|                 printf("Hex-encoded encrypted data:\r\n");
 | |
|                 for(size_t i = 0; i < size; i++) {
 | |
|                     if(i % 80 == 0) printf("\r\n");
 | |
|                     printf("%02x", output[i]);
 | |
|                 }
 | |
|                 printf("\r\n");
 | |
|             }
 | |
|             free(output);
 | |
|         } else {
 | |
|             printf("No input");
 | |
|         }
 | |
| 
 | |
|         string_clear(input);
 | |
|     } while(0);
 | |
| 
 | |
|     if(key_loaded) {
 | |
|         furi_hal_crypto_store_unload_key(key_slot);
 | |
|     }
 | |
| }
 | |
| 
 | |
| void crypto_cli_decrypt(Cli* cli, string_t args) {
 | |
|     int key_slot = 0;
 | |
|     bool key_loaded = false;
 | |
|     uint8_t iv[16];
 | |
| 
 | |
|     do {
 | |
|         if(!args_read_int_and_trim(args, &key_slot) || !(key_slot > 0 && key_slot <= 100)) {
 | |
|             printf("Incorrect or missing slot, expected int 1-100");
 | |
|             break;
 | |
|         }
 | |
| 
 | |
|         if(!args_read_hex_bytes(args, iv, 16)) {
 | |
|             printf("Incorrect or missing IV, expected 16 bytes in hex");
 | |
|             break;
 | |
|         }
 | |
| 
 | |
|         if(!furi_hal_crypto_store_load_key(key_slot, iv)) {
 | |
|             printf("Unable to load key from slot %d", key_slot);
 | |
|             break;
 | |
|         }
 | |
|         key_loaded = true;
 | |
| 
 | |
|         printf("Enter Hex-encoded data and press Ctrl+C to complete decryption:\r\n");
 | |
| 
 | |
|         string_t hex_input;
 | |
|         string_init(hex_input);
 | |
|         char c;
 | |
|         while(cli_read(cli, (uint8_t*)&c, 1) == 1) {
 | |
|             if(c == CliSymbolAsciiETX) {
 | |
|                 printf("\r\n");
 | |
|                 break;
 | |
|             } else if(c >= 0x20 && c < 0x7F) {
 | |
|                 putc(c, stdout);
 | |
|                 fflush(stdout);
 | |
|                 string_push_back(hex_input, c);
 | |
|             } else if(c == CliSymbolAsciiCR) {
 | |
|                 printf("\r\n");
 | |
|             }
 | |
|         }
 | |
| 
 | |
|         string_strim(hex_input);
 | |
|         size_t hex_size = string_size(hex_input);
 | |
|         if(hex_size > 0 && hex_size % 2 == 0) {
 | |
|             size_t size = hex_size / 2;
 | |
|             uint8_t* input = malloc(size);
 | |
|             uint8_t* output = malloc(size);
 | |
| 
 | |
|             if(args_read_hex_bytes(hex_input, input, size)) {
 | |
|                 if(furi_hal_crypto_decrypt(input, output, size)) {
 | |
|                     printf("Decrypted data:\r\n");
 | |
|                     printf("%s\r\n", output);
 | |
|                 } else {
 | |
|                     printf("Failed to decrypt\r\n");
 | |
|                 }
 | |
|             } else {
 | |
|                 printf("Failed to parse input");
 | |
|             }
 | |
| 
 | |
|             free(input);
 | |
|             free(output);
 | |
|         } else {
 | |
|             printf("Invalid or empty input");
 | |
|         }
 | |
| 
 | |
|         string_clear(hex_input);
 | |
|     } while(0);
 | |
| 
 | |
|     if(key_loaded) {
 | |
|         furi_hal_crypto_store_unload_key(key_slot);
 | |
|     }
 | |
| }
 | |
| 
 | |
| void crypto_cli_has_key(Cli* cli, string_t args) {
 | |
|     int key_slot = 0;
 | |
|     uint8_t iv[16];
 | |
| 
 | |
|     do {
 | |
|         if(!args_read_int_and_trim(args, &key_slot) || !(key_slot > 0 && key_slot <= 100)) {
 | |
|             printf("Incorrect or missing slot, expected int 1-100");
 | |
|             break;
 | |
|         }
 | |
| 
 | |
|         if(!furi_hal_crypto_store_load_key(key_slot, iv)) {
 | |
|             printf("Unable to load key from slot %d", key_slot);
 | |
|             break;
 | |
|         }
 | |
| 
 | |
|         printf("Successfully loaded key from slot %d", key_slot);
 | |
| 
 | |
|         furi_hal_crypto_store_unload_key(key_slot);
 | |
|     } while(0);
 | |
| }
 | |
| 
 | |
| void crypto_cli_store_key(Cli* cli, string_t args) {
 | |
|     int key_slot = 0;
 | |
|     int key_size = 0;
 | |
|     string_t key_type;
 | |
|     string_init(key_type);
 | |
| 
 | |
|     uint8_t data[32 + 12] = {};
 | |
|     FuriHalCryptoKey key;
 | |
|     key.data = data;
 | |
|     size_t data_size = 0;
 | |
| 
 | |
|     do {
 | |
|         if(!args_read_int_and_trim(args, &key_slot)) {
 | |
|             printf("Incorrect or missing key type, expected master, simple or encrypted");
 | |
|             break;
 | |
|         }
 | |
|         if(!args_read_string_and_trim(args, key_type)) {
 | |
|             printf("Incorrect or missing key type, expected master, simple or encrypted");
 | |
|             break;
 | |
|         }
 | |
| 
 | |
|         if(string_cmp_str(key_type, "master") == 0) {
 | |
|             if(key_slot != 0) {
 | |
|                 printf("Master keyslot must be is 0");
 | |
|                 break;
 | |
|             }
 | |
|             key.type = FuriHalCryptoKeyTypeMaster;
 | |
|         } else if(string_cmp_str(key_type, "simple") == 0) {
 | |
|             if(key_slot < 1 || key_slot > 99) {
 | |
|                 printf("Simple keyslot must be in range");
 | |
|                 break;
 | |
|             }
 | |
|             key.type = FuriHalCryptoKeyTypeSimple;
 | |
|         } else if(string_cmp_str(key_type, "encrypted") == 0) {
 | |
|             key.type = FuriHalCryptoKeyTypeEncrypted;
 | |
|             data_size += 12;
 | |
|         } else {
 | |
|             printf("Incorrect or missing key type, expected master, simple or encrypted");
 | |
|             break;
 | |
|         }
 | |
| 
 | |
|         if(!args_read_int_and_trim(args, &key_size)) {
 | |
|             printf("Incorrect or missing key size, expected 128 or 256");
 | |
|             break;
 | |
|         }
 | |
| 
 | |
|         if(key_size == 128) {
 | |
|             key.size = FuriHalCryptoKeySize128;
 | |
|             data_size += 16;
 | |
|         } else if(key_size == 256) {
 | |
|             key.size = FuriHalCryptoKeySize256;
 | |
|             data_size += 32;
 | |
|         } else {
 | |
|             printf("Incorrect or missing key size, expected 128 or 256");
 | |
|         }
 | |
| 
 | |
|         if(!args_read_hex_bytes(args, data, data_size)) {
 | |
|             printf("Incorrect or missing key data, expected hex encoded key with or without IV.");
 | |
|             break;
 | |
|         }
 | |
| 
 | |
|         if(key_slot > 0) {
 | |
|             uint8_t iv[16];
 | |
|             if(key_slot > 1) {
 | |
|                 if(!furi_hal_crypto_store_load_key(key_slot - 1, iv)) {
 | |
|                     printf(
 | |
|                         "Slot %d before %d is empty, which is not allowed",
 | |
|                         key_slot - 1,
 | |
|                         key_slot);
 | |
|                     break;
 | |
|                 }
 | |
|                 furi_hal_crypto_store_unload_key(key_slot - 1);
 | |
|             }
 | |
| 
 | |
|             if(furi_hal_crypto_store_load_key(key_slot, iv)) {
 | |
|                 furi_hal_crypto_store_unload_key(key_slot);
 | |
|                 printf("Key slot %d is already used", key_slot);
 | |
|                 break;
 | |
|             }
 | |
|         }
 | |
| 
 | |
|         uint8_t slot;
 | |
|         if(furi_hal_crypto_store_add_key(&key, &slot)) {
 | |
|             printf("Success. Stored to slot: %d", slot);
 | |
|         } else {
 | |
|             printf("Failure");
 | |
|         }
 | |
|     } while(0);
 | |
| 
 | |
|     string_clear(key_type);
 | |
| }
 | |
| 
 | |
| static void crypto_cli(Cli* cli, string_t args, void* context) {
 | |
|     string_t cmd;
 | |
|     string_init(cmd);
 | |
| 
 | |
|     do {
 | |
|         if(!args_read_string_and_trim(args, cmd)) {
 | |
|             crypto_cli_print_usage();
 | |
|             break;
 | |
|         }
 | |
| 
 | |
|         if(string_cmp_str(cmd, "encrypt") == 0) {
 | |
|             crypto_cli_encrypt(cli, args);
 | |
|             break;
 | |
|         }
 | |
| 
 | |
|         if(string_cmp_str(cmd, "decrypt") == 0) {
 | |
|             crypto_cli_decrypt(cli, args);
 | |
|             break;
 | |
|         }
 | |
| 
 | |
|         if(string_cmp_str(cmd, "has_key") == 0) {
 | |
|             crypto_cli_has_key(cli, args);
 | |
|             break;
 | |
|         }
 | |
| 
 | |
|         if(string_cmp_str(cmd, "store_key") == 0) {
 | |
|             crypto_cli_store_key(cli, args);
 | |
|             break;
 | |
|         }
 | |
| 
 | |
|         crypto_cli_print_usage();
 | |
|     } while(false);
 | |
| 
 | |
|     string_clear(cmd);
 | |
| }
 | |
| 
 | |
| void crypto_on_system_start() {
 | |
| #ifdef SRV_CLI
 | |
|     Cli* cli = furi_record_open("cli");
 | |
|     cli_add_command(cli, "crypto", CliCommandFlagDefault, crypto_cli, NULL);
 | |
|     furi_record_close("cli");
 | |
| #else
 | |
|     UNUSED(crypto_cli);
 | |
| #endif
 | |
| }
 |