Просмотр исходного кода

Merge picopass from https://github.com/flipperdevices/flipperzero-good-faps

Willy-JL 2 лет назад
Родитель
Сommit
895c821e31
2 измененных файлов с 3 добавлено и 2 удалено
  1. 2 0
      picopass/.catalog/README.md
  2. 1 2
      picopass/picopass_device.c

+ 2 - 0
picopass/.catalog/README.md

@@ -35,6 +35,8 @@ There are some situations when the offline loclass may not find a key, such as:
 
 
 Due to the nature of how secure picopass works, it is possible to emulate some public fields from a card and capture the reader's response, which can be used to authenticate.  Two of the pieces involved in this are the NR and MAC.
 Due to the nature of how secure picopass works, it is possible to emulate some public fields from a card and capture the reader's response, which can be used to authenticate.  Two of the pieces involved in this are the NR and MAC.
 
 
+These instructions are intended to be performed all at the same time.  If you use the card with the reader between Card Part 1 and Card Part 2, then Card Part 2 will fail.
+
 ## Card Part 1
 ## Card Part 1
 
 
 1. Place card against Flipper Zero
 1. Place card against Flipper Zero

+ 1 - 2
picopass/picopass_device.c

@@ -56,13 +56,13 @@ static bool picopass_device_save_file_seader(
             seader_file_header,
             seader_file_header,
             seader_file_version,
             seader_file_version,
             furi_string_get_cstr(file_path));
             furi_string_get_cstr(file_path));
+        storage_simply_mkdir(dev->storage, EXT_PATH("apps_data/seader"));
         if(!flipper_format_file_open_always(file, furi_string_get_cstr(file_path))) break;
         if(!flipper_format_file_open_always(file, furi_string_get_cstr(file_path))) break;
         if(!flipper_format_write_header_cstr(file, seader_file_header, seader_file_version)) break;
         if(!flipper_format_write_header_cstr(file, seader_file_header, seader_file_version)) break;
         if(!flipper_format_write_uint32(file, "Bits", (uint32_t*)&pacs->bitLength, 1)) break;
         if(!flipper_format_write_uint32(file, "Bits", (uint32_t*)&pacs->bitLength, 1)) break;
         if(!flipper_format_write_hex(file, "Credential", pacs->credential, PICOPASS_BLOCK_LEN))
         if(!flipper_format_write_hex(file, "Credential", pacs->credential, PICOPASS_BLOCK_LEN))
             break;
             break;
 
 
-        FURI_LOG_D(TAG, "Pre-sio");
         // Seader only captures 64 byte SIO so I'm going to leave it at that
         // Seader only captures 64 byte SIO so I'm going to leave it at that
         uint8_t sio[64];
         uint8_t sio[64];
 
 
@@ -78,7 +78,6 @@ static bool picopass_device_save_file_seader(
             }
             }
             if(!flipper_format_write_hex(file, "SIO", sio, sizeof(sio))) break;
             if(!flipper_format_write_hex(file, "SIO", sio, sizeof(sio))) break;
         }
         }
-        FURI_LOG_D(TAG, "post sio");
         if(!flipper_format_write_hex(
         if(!flipper_format_write_hex(
                file, "Diversifier", AA1[PICOPASS_CSN_BLOCK_INDEX].data, PICOPASS_BLOCK_LEN))
                file, "Diversifier", AA1[PICOPASS_CSN_BLOCK_INDEX].data, PICOPASS_BLOCK_LEN))
             break;
             break;