Skip to content

Commit fe31d0c

Browse files
committed
upd changelog
add fix by noproto
1 parent d79539c commit fe31d0c

2 files changed

Lines changed: 11 additions & 7 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
* OFW: **JS views finished**
1414
* OFW: BLE: improved pairing security
1515
* OFW: FeliCa Emulation: Handle certain Polling commands in firmware
16+
* OFW PR 4287: Fix Ultralight EV1 regression (by @noproto)
1617
* OFW PR 4271: NFC: **Ultralight C NFC App Key Management, Dictionary Attack** (by @noproto)
1718
* OFW PR 4265: NFC: **Fix read crash** with unexpectedly large MFC AUTH(0) response (by @WillyJL)
1819
* OFW PR 4251: CLI: **Fix long delay** with quick connect/disconnect (by @WillyJL)

applications/main/nfc/helpers/protocol_support/mf_ultralight/mf_ultralight.c

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -151,13 +151,16 @@ static NfcCommand
151151
if(!mf_ultralight_event->data->auth_context.skip_auth) {
152152
mf_ultralight_event->data->auth_context.password = instance->mf_ul_auth->password;
153153

154-
// Only set tdes_key for Manual/Reader auth types, not for dictionary attacks
155-
if(instance->mf_ul_auth->type == MfUltralightAuthTypeManual ||
156-
instance->mf_ul_auth->type == MfUltralightAuthTypeReader) {
157-
mf_ultralight_event->data->key_request_data.key = instance->mf_ul_auth->tdes_key;
158-
mf_ultralight_event->data->key_request_data.key_provided = true;
159-
} else {
160-
mf_ultralight_event->data->key_request_data.key_provided = false;
154+
if(data->type == MfUltralightTypeMfulC) {
155+
// Only set tdes_key for Manual/Reader auth types, not for dictionary attacks
156+
if(instance->mf_ul_auth->type == MfUltralightAuthTypeManual ||
157+
instance->mf_ul_auth->type == MfUltralightAuthTypeReader) {
158+
mf_ultralight_event->data->key_request_data.key =
159+
instance->mf_ul_auth->tdes_key;
160+
mf_ultralight_event->data->key_request_data.key_provided = true;
161+
} else {
162+
mf_ultralight_event->data->key_request_data.key_provided = false;
163+
}
161164
}
162165
}
163166
} else if(mf_ultralight_event->type == MfUltralightPollerEventTypeAuthSuccess) {

0 commit comments

Comments
 (0)