388 Commits

Author	SHA1	Message	Date
Willy-JL	2353871ab7	Merge branch 'ofw-pr-3822' into js-backport-of-backport	2024-10-18 05:45:43 +01:00
noproto	db26c85b23	Backdoor known key logic still needs the current key	2024-10-18 00:46:24 -04:00
Willy-JL	9a568caf68	Merge branch 'ofw-pr-3822' into js-backport-of-backport	2024-10-18 05:34:27 +01:00
noproto	897817a829	Fix inconsistent assignment of known key and known key type/sector	2024-10-18 00:33:49 -04:00
Willy-JL	f4b9ed04ce	Merge branch 'ofw-pr-3822' into js-backport-of-backport	2024-10-18 04:43:46 +01:00
Willy-JL	a45b3e8e2f	Merge remote-tracking branch 'ul/dev' into js-backport-of-backport	2024-10-18 04:39:27 +01:00
noproto	1101748a21	Merge branch 'nestednonces' of https://github.com/noproto/flipperzero-firmware into nestednonces	2024-10-17 19:17:39 -04:00
noproto	4be9e79342	Fix multiple crashes and state machine logic	2024-10-17 19:16:30 -04:00
Mykhailo Shevchuk	c39edce7c6	Fixed bug with UL reading	2024-10-17 01:41:27 +03:00
Willy-JL	d8ef57ccb7	Merge remote-tracking branch 'ul/dev' into js-backport-of-backport	2024-10-16 18:57:58 +01:00
MMX	d72fad45e0	Merge pull request #825 from mishamyte/fix-read-pwd-protected-ul ... Read Ultralight block by block	2024-10-16 19:48:04 +03:00
Willy-JL	2f6faa1b7b	Merge remote-tracking branch 'ul/dev' into mntm-dev	2024-10-16 00:56:19 +01:00
Mykhailo Shevchuk	d3f192ac36	Read Ultralight block by block	2024-10-16 02:24:43 +03:00
Willy-JL	88dfe97a89	Merge remote-tracking branch 'ofw/dev' into mntm-dev	2024-10-15 23:43:33 +01:00
MX	7de26fb99b	Merge remote-tracking branch 'OFW/dev' into dev	2024-10-16 01:06:19 +03:00
MX	45bc0e1ce6	after merge fix p1	2024-10-15 00:43:52 +03:00
MX	4b9b1769f7	Merge remote-tracking branch 'OFW/dev' into dev	2024-10-15 00:08:47 +03:00
あく	02f7c6b421	Merge branch 'dev' into nestednonces	2024-10-14 21:06:56 +01:00
hedger	57c438d91a	heap: increased size (#3924) ... * reduced reserved memory size for system stack; added temporary markup to monitor usage * fbt: relink elf file on linker script change; removed debug memory fill * Make PVS Happy * Make doxygen happy Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>	2024-10-14 19:26:17 +01:00
RebornedBrain	0902fd49e1	NFC: iso14443_4a improvements. Canvas: extended icon draw. (#3918) ... * Now 4a listener invokes upper level callback on Halt and FieldOff * Added new method for drawing mirrored XBM bitmaps * iso14443_4a poller logic enhanced * Function renamed accroding to review suggestions * Rename #2 * Api adjustements * Correct API bump Co-authored-by: あく <alleteam@gmail.com>	2024-10-14 18:22:47 +01:00
Willy-JL	806fd93b38	Merge branch 'nestednonces' into mntm-dev	2024-10-13 01:01:01 +01:00
MX	38889a434c	Merge remote-tracking branch 'noproto/nestednonces' into dev	2024-10-11 21:13:50 +03:00
noproto	a7c0819034	Refactor enums to avoid redefinition	2024-10-11 10:01:30 -04:00
Willy-JL	3aca32c497	Merge remote-tracking branch 'ul/dev' into mntm-dev	2024-10-10 01:34:28 +01:00
MX	1030574187	Merge remote-tracking branch 'noproto/nestednonces' into dev	2024-10-09 23:13:22 +03:00
noproto	b843856976	Fix memory leak, use COUNT_OF macro	2024-10-09 15:51:21 -04:00
Willy-JL	2c247bcb50	Fix compiling unit tests (missing NFC mock for #225)	2024-10-07 04:43:08 +01:00
Willy-JL	89c7875a96	Merge branch 'nestednonces' into mntm-dev	2024-10-07 04:01:39 +01:00
Willy-JL	ba605e1c03	Merge remote-tracking branch 'ul/dev' into mntm-dev ... Only partially merged 1ceb1eb256 and 09d6e4ee30 Changes to login in cc1101_ext.c and adding setting are ignored	2024-10-07 04:00:01 +01:00
MX	7eac8fbbb4	Merge remote-tracking branch 'noproto/nestednonces' into dev	2024-10-07 04:48:23 +03:00
noproto	a905c1492d	Handle invalid key candidates	2024-10-06 16:19:26 -04:00
MX	0d8d71ff1c	Merge remote-tracking branch 'RebornedBrain/reborned/some_api_adjustments' into dev [ci skip]	2024-10-05 10:19:32 +03:00
MX	9bb3853c80	Merge remote-tracking branch 'noproto/nestednonces' into dev	2024-10-05 05:02:08 +03:00
Willy-JL	05de1e2b2f	Merge branch 'nestednonces' into mntm-dev	2024-10-05 01:06:38 +01:00
noproto	00f356469e	Fix log levels	2024-10-03 19:27:20 -04:00
RebornedBrain	180d1f0471	iso14443_4a poller logic enhanced	2024-09-28 22:19:18 +03:00
Willy-JL	448be96e0f	Merge branch 'nestednonces' into ofw-3822-nestednonces	2024-09-27 02:38:59 +01:00
noproto	ba672e775f	Support CUID dictionary	2024-09-25 10:27:32 -04:00
noproto	099bb4071a	Fix include paths cont	2024-09-24 22:21:15 -04:00
Willy-JL	ae3b2d40e4	Merge branch 'nestednonces' into ofw-3822-nestednonces	2024-09-24 05:56:21 +01:00
noproto	61e24fcb13	Fix include paths	2024-09-23 21:55:39 -04:00
noproto	0ba8ac4ed0	Uniformly use crypto1_ prefix for symbols in Crypto1 API	2024-09-23 19:44:08 -04:00
noproto	4eb0f2a21b	Log static	2024-09-23 18:03:15 -04:00
noproto	901bdf9692	Fix calibration (ensure values are within 3 standard deviations)	2024-09-23 15:54:50 -04:00
noproto	6a77ab77b0	Dismiss duplicate nonces	2024-09-23 14:26:19 -04:00
RebornedBrain	b0c4600115	Now 4a listener invokes upper level callback on Halt and FieldOff	2024-09-23 11:13:24 +03:00
MX	16e4b9219a	merge ofw pr 3885 - Add API to enforce ISO15693 mode [ci skip] ... by aaronjamt https://github.com/flipperdevices/flipperzero-firmware/pull/3885/files	2024-09-21 03:50:03 +03:00
noproto	c21b35951a	Note TODO (malloc)	2024-09-20 13:09:04 -04:00
noproto	c1cdd491a6	Implement progress bar for upgraded attacks in NFC app	2024-09-18 12:51:48 -04:00
Willy-JL	bb9a2eb8ea	Merge branch 'nestednonces' into ofw-3822-nestednonces	2024-09-18 02:12:43 +01:00