Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FL-3745] Write NTAG password and PACK to gen4 special pages #190

Merged
merged 6 commits into from
Apr 9, 2024
Merged

[FL-3745] Write NTAG password and PACK to gen4 special pages #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
47d45ab
Write password and PACK to gen4 special pages
Astrrra Mar 22, 2024
5e79ce7
Fix config re-allocation
Astrrra Mar 24, 2024
c112992
Merge branch 'dev' into astra/3745-gen4-ultralight-password-fix
skotopes Mar 26, 2024
53adfb1
Merge branch 'dev' into astra/3745-gen4-ultralight-password-fix
Astrrra Apr 8, 2024
5676ee7
Fix Gen4 NTAG/Ultralight writing
Astrrra Apr 9, 2024
d31f8fe
NfcMagic: update changelog
skotopes Apr 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions nfc_magic/.catalog/changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## 1.8
- Ultralight Various fixes and improvements

## 1.7
- Gen2/CUID write support

Expand Down
2 changes: 1 addition & 1 deletion nfc_magic/application.fam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ App(
],
stack_size=4 * 1024,
fap_description="Application for writing to NFC tags with modifiable sector 0",
fap_version="1.7",
fap_version="1.8",
fap_icon="assets/125_10px.png",
fap_category="NFC",
fap_icon_assets="assets",
Expand Down
135 changes: 103 additions & 32 deletions nfc_magic/magic/protocols/gen4/gen4_poller.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,15 +326,25 @@ static NfcCommand gen4_poller_write_mf_ultralight(Gen4Poller* instance) {
case MfUltralightTypeNTAGI2C2K:
case MfUltralightTypeNTAGI2CPlus1K:
case MfUltralightTypeNTAGI2CPlus2K:
FURI_LOG_D(TAG, "NTAG type");
instance->config[27] = Gen4PollerUltralightModeNTAG;
instance->total_blocks = 64 * 2;
break;

case MfUltralightTypeUnknown:
FURI_LOG_D(TAG, "Ultralight type");
instance->config[27] = Gen4PollerUltralightModeUL;
break;

case MfUltralightTypeMfulC:
FURI_LOG_D(TAG, "MfulC type");
instance->config[27] = Gen4PollerUltralightModeUL_C;
break;

case MfUltralightTypeUL11:
case MfUltralightTypeUL21:
// UL-C?
// UL?
default:
FURI_LOG_D(TAG, "EV1 type");
instance->config[27] = Gen4PollerUltralightModeUL_EV1;
break;
}
Expand All @@ -353,7 +363,6 @@ static NfcCommand gen4_poller_write_mf_ultralight(Gen4Poller* instance) {
instance->config[24] = iso3_data->atqa[0];
instance->config[25] = iso3_data->atqa[1];
instance->config[26] = iso3_data->sak;
instance->config[27] = 0x00;
instance->config[28] = instance->total_blocks - 1;
instance->config[29] = 0x01;

Expand Down Expand Up @@ -383,42 +392,104 @@ static NfcCommand gen4_poller_write_mf_ultralight(Gen4Poller* instance) {
} else {
uint8_t block[GEN4_POLLER_BLOCK_SIZE] = {};
bool write_success = true;
for(size_t i = 0; i < 8; i++) {
memcpy(block, &mfu_data->signature.data[i * 4], 4); //-V1086

if(mf_ultralight_support_feature(
mf_ultralight_get_feature_support_set(mfu_data->type),
MfUltralightFeatureSupportReadSignature)) {
FURI_LOG_D(TAG, "Writing Signature");
for(size_t i = 0; i < 8; i++) {
memcpy(block, &mfu_data->signature.data[i * 4], 4); //-V1086
Gen4PollerError error =
gen4_poller_write_block(instance, instance->password, 0xF2 + i, block);
if(error != Gen4PollerErrorNone) {
write_success = false;
break;
}
}
if(!write_success) {
FURI_LOG_E(TAG, "Failed to write Signature");
instance->state = Gen4PollerStateFail;
break;
}
} else {
FURI_LOG_D(TAG, "Signature is not supported, skipping");
}

if(mf_ultralight_support_feature(
mf_ultralight_get_feature_support_set(mfu_data->type),
MfUltralightFeatureSupportReadVersion)) {
FURI_LOG_D(TAG, "Writing Version part 1");
block[0] = mfu_data->version.header;
block[1] = mfu_data->version.vendor_id;
block[2] = mfu_data->version.prod_type;
block[3] = mfu_data->version.prod_subtype;
Gen4PollerError error =
gen4_poller_write_block(instance, instance->password, 0xF2 + i, block);
gen4_poller_write_block(instance, instance->password, 0xFA, block);
if(error != Gen4PollerErrorNone) {
write_success = false;
FURI_LOG_E(TAG, "Failed to write 1st part Version");
instance->state = Gen4PollerStateFail;
break;
}
}
if(!write_success) {
FURI_LOG_E(TAG, "Failed to write Signature");
instance->state = Gen4PollerStateFail;
break;
}

block[0] = mfu_data->version.header;
block[1] = mfu_data->version.vendor_id;
block[2] = mfu_data->version.prod_type;
block[3] = mfu_data->version.prod_subtype;
Gen4PollerError error =
gen4_poller_write_block(instance, instance->password, 0xFA, block);
if(error != Gen4PollerErrorNone) {
FURI_LOG_E(TAG, "Failed to write 1st part Version");
instance->state = Gen4PollerStateFail;
break;
FURI_LOG_D(TAG, "Writing Version part 2");
block[0] = mfu_data->version.prod_ver_major;
block[1] = mfu_data->version.prod_ver_minor;
block[2] = mfu_data->version.storage_size;
block[3] = mfu_data->version.protocol_type;
error = gen4_poller_write_block(instance, instance->password, 0xFB, block);
if(error != Gen4PollerErrorNone) {
FURI_LOG_E(TAG, "Failed to write 2nd part Version");
instance->state = Gen4PollerStateFail;
break;
}
} else {
FURI_LOG_D(TAG, "Version is not supported, skipping");
}

block[0] = mfu_data->version.prod_ver_major;
block[1] = mfu_data->version.prod_ver_minor;
block[2] = mfu_data->version.storage_size;
block[3] = mfu_data->version.protocol_type;
error = gen4_poller_write_block(instance, instance->password, 0xFB, block);
if(error != Gen4PollerErrorNone) {
FURI_LOG_E(TAG, "Failed to write 2nd part Version");
instance->state = Gen4PollerStateFail;
break;
if(mf_ultralight_support_feature(
mf_ultralight_get_feature_support_set(mfu_data->type),
MfUltralightFeatureSupportPasswordAuth)) {
FURI_LOG_D(TAG, "Writing Password");
MfUltralightConfigPages* config_pages = NULL;
if(mf_ultralight_get_config_page(mfu_data, &config_pages)) {
block[0] = config_pages->password.data[0];
block[1] = config_pages->password.data[1];
block[2] = config_pages->password.data[2];
block[3] = config_pages->password.data[3];
Gen4PollerError error =
gen4_poller_write_block(instance, instance->password, 0xE5, block);
if(error != Gen4PollerErrorNone) {
FURI_LOG_E(TAG, "Failed to write Password to sector E5");
instance->state = Gen4PollerStateFail;
break;
}
error = gen4_poller_write_block(instance, instance->password, 0xF0, block);
if(error != Gen4PollerErrorNone) {
FURI_LOG_E(TAG, "Failed to write Password to sector F0");
instance->state = Gen4PollerStateFail;
break;
}

FURI_LOG_D(TAG, "Writing PACK");
block[0] = config_pages->pack.data[0];
block[1] = config_pages->pack.data[1];
block[2] = 0x00;
block[3] = 0x00;
error = gen4_poller_write_block(instance, instance->password, 0xE6, block);
if(error != Gen4PollerErrorNone) {
FURI_LOG_E(TAG, "Failed to write PACK to sector E6");
instance->state = Gen4PollerStateFail;
break;
}
error = gen4_poller_write_block(instance, instance->password, 0xF1, block);
if(error != Gen4PollerErrorNone) {
FURI_LOG_E(TAG, "Failed to write PACK to sector F1");
instance->state = Gen4PollerStateFail;
break;
}
}
} else {
FURI_LOG_D(TAG, "Password is not supported, skipping");
}

instance->state = Gen4PollerStateSuccess;
Expand Down