Nfc: add basic Mifare DESFire support (#1024)
* Fix TextBox word wrap behavior * Wrap width is 120 pixels, not 140. (140 is larger than the screen!) * Glyph width already includes spacing; don't add 1 additional px * When starting a new line, include wrapped glyph width in new line_width. * Call canvas_set_font before text_box_insert_endline so that glyph width is calculated using correct font. Previous approach worked somewhat well using default TextBoxFontText but this version is more robust, particularly when using TextBoxFontHex. * Add basic Mifare DESFire reading, file/app browser * Fix build with APP_ARCHIVE=0 * Add bool type to flipper_format * Add ability to save and load DESFire card data * Skip over NfcSceneDeviceInfo when viewing saved DESFire info * mf_df_clear: don't leak master key settings key versions * When opening a DESFire card from Archive, retain UID emulation behavior * rm unnecessary \r\n * show Popup instead of leaving view in bad state * Move NfcReaderRequestData out of union This makes it safe to emulate DESFire/EMV without clobbering card data. * Display saved DESFire cards via NfcSceneDeviceInfo * Display and save file metadata even when contents are missing This can happen when a file doesn't allow unauthenticated reads (see the call to mf_df_parse_read_data_response in nfc_worker.c). Co-authored-by: Kevin Wallace <git+flipperzero@kevin.wallace.seattle.wa.us> Co-authored-by: あく <alleteam@gmail.com> Co-authored-by: gornekich <n.gorbadey@gmail.com>
This commit is contained in:
@@ -246,6 +246,36 @@ bool flipper_format_write_int32(
|
||||
return result;
|
||||
}
|
||||
|
||||
bool flipper_format_read_bool(
|
||||
FlipperFormat* flipper_format,
|
||||
const char* key,
|
||||
bool* data,
|
||||
const uint16_t data_size) {
|
||||
return flipper_format_stream_read_value_line(
|
||||
flipper_format->stream,
|
||||
key,
|
||||
FlipperStreamValueBool,
|
||||
data,
|
||||
data_size,
|
||||
flipper_format->strict_mode);
|
||||
}
|
||||
|
||||
bool flipper_format_write_bool(
|
||||
FlipperFormat* flipper_format,
|
||||
const char* key,
|
||||
const bool* data,
|
||||
const uint16_t data_size) {
|
||||
furi_assert(flipper_format);
|
||||
FlipperStreamWriteData write_data = {
|
||||
.key = key,
|
||||
.type = FlipperStreamValueBool,
|
||||
.data = data,
|
||||
.data_size = data_size,
|
||||
};
|
||||
bool result = flipper_format_stream_write_value_line(flipper_format->stream, &write_data);
|
||||
return result;
|
||||
}
|
||||
|
||||
bool flipper_format_read_float(
|
||||
FlipperFormat* flipper_format,
|
||||
const char* key,
|
||||
@@ -391,6 +421,22 @@ bool flipper_format_update_int32(
|
||||
return result;
|
||||
}
|
||||
|
||||
bool flipper_format_update_bool(
|
||||
FlipperFormat* flipper_format,
|
||||
const char* key,
|
||||
const bool* data,
|
||||
const uint16_t data_size) {
|
||||
FlipperStreamWriteData write_data = {
|
||||
.key = key,
|
||||
.type = FlipperStreamValueBool,
|
||||
.data = data,
|
||||
.data_size = data_size,
|
||||
};
|
||||
bool result = flipper_format_stream_delete_key_and_write(
|
||||
flipper_format->stream, &write_data, flipper_format->strict_mode);
|
||||
return result;
|
||||
}
|
||||
|
||||
bool flipper_format_update_float(
|
||||
FlipperFormat* flipper_format,
|
||||
const char* key,
|
||||
@@ -489,6 +535,23 @@ bool flipper_format_insert_or_update_int32(
|
||||
return result;
|
||||
}
|
||||
|
||||
bool flipper_format_insert_or_update_bool(
|
||||
FlipperFormat* flipper_format,
|
||||
const char* key,
|
||||
const bool* data,
|
||||
const uint16_t data_size) {
|
||||
bool result = false;
|
||||
|
||||
if(!flipper_format_key_exist(flipper_format, key)) {
|
||||
flipper_format_seek_to_end(flipper_format);
|
||||
result = flipper_format_write_bool(flipper_format, key, data, data_size);
|
||||
} else {
|
||||
result = flipper_format_update_bool(flipper_format, key, data, data_size);
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
bool flipper_format_insert_or_update_float(
|
||||
FlipperFormat* flipper_format,
|
||||
const char* key,
|
||||
|
@@ -329,6 +329,34 @@ bool flipper_format_write_int32(
|
||||
const int32_t* data,
|
||||
const uint16_t data_size);
|
||||
|
||||
/**
|
||||
* Read array of bool by key
|
||||
* @param flipper_format Pointer to a FlipperFormat instance
|
||||
* @param key Key
|
||||
* @param data Value
|
||||
* @param data_size Values count
|
||||
* @return True on success
|
||||
*/
|
||||
bool flipper_format_read_bool(
|
||||
FlipperFormat* flipper_format,
|
||||
const char* key,
|
||||
bool* data,
|
||||
const uint16_t data_size);
|
||||
|
||||
/**
|
||||
* Write key and array of bool
|
||||
* @param flipper_format Pointer to a FlipperFormat instance
|
||||
* @param key Key
|
||||
* @param data Value
|
||||
* @param data_size Values count
|
||||
* @return True on success
|
||||
*/
|
||||
bool flipper_format_write_bool(
|
||||
FlipperFormat* flipper_format,
|
||||
const char* key,
|
||||
const bool* data,
|
||||
const uint16_t data_size);
|
||||
|
||||
/**
|
||||
* Read array of float by key
|
||||
* @param flipper_format Pointer to a FlipperFormat instance
|
||||
@@ -456,6 +484,19 @@ bool flipper_format_update_int32(
|
||||
const int32_t* data,
|
||||
const uint16_t data_size);
|
||||
|
||||
/**
|
||||
* Updates the value of the first matching key to a bool array value. Sets the RW pointer to a position at the end of inserted data.
|
||||
* @param flipper_format Pointer to a FlipperFormat instance
|
||||
* @param key Key
|
||||
* @param data Value
|
||||
* @return True on success
|
||||
*/
|
||||
bool flipper_format_update_bool(
|
||||
FlipperFormat* flipper_format,
|
||||
const char* key,
|
||||
const bool* data,
|
||||
const uint16_t data_size);
|
||||
|
||||
/**
|
||||
* Updates the value of the first matching key to a float array value. Sets the RW pointer to a position at the end of inserted data.
|
||||
* @param flipper_format Pointer to a FlipperFormat instance
|
||||
@@ -537,6 +578,20 @@ bool flipper_format_insert_or_update_int32(
|
||||
const int32_t* data,
|
||||
const uint16_t data_size);
|
||||
|
||||
/**
|
||||
* Updates the value of the first matching key to a bool array value, or adds the key and value if the key did not exist.
|
||||
* Sets the RW pointer to a position at the end of inserted data.
|
||||
* @param flipper_format Pointer to a FlipperFormat instance
|
||||
* @param key Key
|
||||
* @param data Value
|
||||
* @return True on success
|
||||
*/
|
||||
bool flipper_format_insert_or_update_bool(
|
||||
FlipperFormat* flipper_format,
|
||||
const char* key,
|
||||
const bool* data,
|
||||
const uint16_t data_size);
|
||||
|
||||
/**
|
||||
* Updates the value of the first matching key to a float array value, or adds the key and value if the key did not exist.
|
||||
* Sets the RW pointer to a position at the end of inserted data.
|
||||
|
@@ -285,6 +285,10 @@ bool flipper_format_stream_write_value_line(Stream* stream, FlipperStreamWriteDa
|
||||
const uint32_t* data = write_data->data;
|
||||
string_printf(value, "%" PRId32, data[i]);
|
||||
}; break;
|
||||
case FlipperStreamValueBool: {
|
||||
const bool* data = write_data->data;
|
||||
string_printf(value, data[i] ? "true" : "false");
|
||||
}; break;
|
||||
default:
|
||||
furi_crash("Unknown FF type");
|
||||
}
|
||||
@@ -372,6 +376,11 @@ bool flipper_format_stream_read_value_line(
|
||||
uint32_t* data = _data;
|
||||
scan_values = sscanf(string_get_cstr(value), "%" PRId32, &data[i]);
|
||||
}; break;
|
||||
case FlipperStreamValueBool: {
|
||||
bool* data = _data;
|
||||
data[i] = !string_cmpi_str(value, "true");
|
||||
scan_values = 1;
|
||||
}; break;
|
||||
default:
|
||||
furi_crash("Unknown FF type");
|
||||
}
|
||||
|
@@ -15,6 +15,7 @@ typedef enum {
|
||||
FlipperStreamValueFloat,
|
||||
FlipperStreamValueInt32,
|
||||
FlipperStreamValueUint32,
|
||||
FlipperStreamValueBool,
|
||||
} FlipperStreamValue;
|
||||
|
||||
typedef struct {
|
||||
|
Reference in New Issue
Block a user