RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-11-09 15:50:34 +08:00
Code Issues Projects Releases Packages Wiki Activity
15342 commits 3 branches 18 tags 91 MiB
Commit graph

15342 commits

This branch
This branch
All branches
Author SHA1 Message Date
Oleg Moiseenko
7813cdfbbe
Merge pull request #1576 from merlokk/cip_ref 
cipurse commands refactoring
 2022-02-01 17:26:38 +02:00
merlokk
0f7cfe6a17 delete command now doesnt work by default 2022-02-01 17:25:52 +02:00
merlokk
52a78712be select command fixes, auth command refactoring 2022-02-01 17:15:38 +02:00
merlokk
c102fe7aff select docs 2022-02-01 17:05:24 +02:00
merlokk
085db0c4e7 select command refactoring 2022-02-01 17:05:08 +02:00
Philippe Teuwen
c09e47594d mf restore: foolproof, else it may end with broken anticol 2022-02-01 15:49:54 +01:00
merlokk
cc1c29b2a6 move 2022-02-01 14:34:51 +02:00
merlokk
a5e4e15adc commands refactoring 2022-02-01 14:30:23 +02:00
Iceman
405c9d5d94
Merge pull request #1575 from linuxgemini/fix-macos-build 
fix macos builds by not defining _POSIX_C_SOURCE in mfd_aes_brute.c if macos
 2022-01-31 17:50:25 +01:00
İlteriş Yağıztegin Eroğlu
391cc3d331 add homebrew quirk fixes 
Signed-off-by: İlteriş Yağıztegin Eroğlu <ilteris@asenkron.com.tr>
 2022-01-31 16:35:59 +03:00
İlteriş Yağıztegin Eroğlu
87400b6156 don't define _POSIX_C_SOURCE in mfd_aes_brute.c if macos 
unistd.h in macos has this snippet:

 #if __DARWIN_C_LEVEL >= __DARWIN_C_FULL
 #define _SC_NPROCESSORS_CONF            57
 #define _SC_NPROCESSORS_ONLN            58
 #endif /* __DARWIN_C_LEVEL >= __DARWIN_C_FULL */

__DARWIN_C_FULL is 900000L.

If _POSIX_C_SOURCE gets defined without __DARWIN_C_SOURCE being defined,
__DARWIN_C_LEVEL will be assigned to __DARWIN_C_ANSI, which is 010000L.

Thus this definition will remove _SC_NPROCESSORS_CONF.

If we don't define _POSIX_C_SOURCE, __DARWIN_C_LEVEL will be equal to
__DARWIN_C_FULL, and _SC_NPROCESSORS_CONF will be available.

This commit also includes homebrew and macports prefix definitions for mfd_aes_brute.

Signed-off-by: İlteriş Yağıztegin Eroğlu <ilteris@asenkron.com.tr>
 2022-01-31 15:41:06 +03:00
Iceman
f6ddc56111
Merge pull request #1574 from mwalker33/mifare-debug-bug 
Update mifareutil.c
 2022-01-31 07:54:14 +01:00
mwalker33
3ca13ce293 Update mifareutil.c 
Mifare debug bug.  nr is a uint8_t size of 4 and did note output correctly.
 2022-01-31 17:19:44 +11:00
iceman1001
a79b23edc4 and the files... 2022-01-30 21:27:13 +01:00
iceman1001
54ddd8176f added iclass sniff 2022-01-30 21:25:02 +01:00
iceman1001
7dcaf59cdd added a sniffed desfire trace 2022-01-30 21:23:17 +01:00
iceman1001
99db2c44e1 move script to right folder 2022-01-30 21:20:30 +01:00
iceman1001
57d0397436 added trace extract, it extracts auth challengens in MFU-C/ICLASS/DESFIRE and prints it. 2022-01-30 21:18:59 +01:00
iceman1001
e6a14bf869 text 2022-01-30 21:16:57 +01:00
Iceman
145f0853c4
Merge pull request #1572 from bettse/fix_termux 
remove system define that messes up termux
 2022-01-30 21:11:18 +01:00
Iceman
e83dfcc2cb
Merge pull request #1571 from startrk1995/ultimate_magic_card 
Ultimate magic card (Gen4)
 2022-01-30 20:39:11 +01:00
Eric Betts
98db74f28c remove system define that messes up termux 2022-01-30 11:37:11 -08:00
Nate
8075c1ac5a
Requested changes to magic_card_notes 2022-01-30 14:35:44 -05:00
Nate
bd4cba7753
Added change for hf_mf_ultimatecard script 2022-01-30 13:06:20 -05:00
Nate
b4f3084be6
Added script notes 2022-01-30 12:56:43 -05:00
Nate Glaser
5d7ec4ffae Version 1.04 of lua script for GEN4 Ultimate Magic Card 2022-01-30 11:58:15 -05:00
Iceman
679a2f36d3
Merge pull request #1569 from gabe-sky/fix_typo 
Fix typo
 2022-01-29 20:07:28 +01:00
Gabriel M Schuyler
832abcfc3f Fix typo 2022-01-29 12:56:31 -06:00
iceman1001
22c1078b85 added pwd generator for NTAG tools. md5 of uid 2022-01-29 16:57:31 +01:00
Philippe Teuwen
4c1d9f023e Seems a cmd was forgotten in the UFUID locking procedure 
see http://www.proxmark.org/forum/viewtopic.php?pid=35775#p35775
 2022-01-29 15:35:18 +01:00
Philippe Teuwen
3ada10be72 Add linenoise-ng as alternative to readline 2022-01-29 15:20:32 +01:00
iceman1001
6eee32bb5b Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2022-01-29 15:13:11 +01:00
iceman1001
ce74a25d06 use macros instead 2022-01-29 15:12:42 +01:00
Oleg Moiseenko
59818224af
Merge pull request #1568 from merlokk/master 
text
 2022-01-29 14:15:11 +02:00
Oleg Moiseenko
8bb4c86e88
text 2022-01-29 13:38:59 +02:00
Iceman
1cdb0346d0
Merge pull request #1567 from bettse/extra_include 
remove redundant include
 2022-01-29 11:33:55 +01:00
iceman1001
1013320aa0 osx needs to link to openssl, since it uses libressl instead 2022-01-29 11:31:18 +01:00
iceman1001
82c3d2134d text 2022-01-29 11:13:53 +01:00
iceman1001
48a872bd52 string formatter 2022-01-29 11:03:30 +01:00
iceman1001
16a666331a textual 2022-01-29 11:02:39 +01:00
iceman1001
4fb83368f5 style 2022-01-29 10:40:29 +01:00
iceman1001
3df14034fe coverity #373452 - tainted value 2022-01-29 10:39:49 +01:00
iceman1001
4db1627e1d coverit #373451 2022-01-29 10:23:21 +01:00
iceman1001
fa10e7464e cppcheck unused 2022-01-29 10:18:16 +01:00
iceman1001
68d79527e5 cppcheck unused 2022-01-29 10:13:05 +01:00
iceman1001
fb9f7d6562 cppcheck bad logic 2022-01-29 10:11:15 +01:00
iceman1001
5b8b4b295c remove reduntant 2022-01-29 10:07:53 +01:00
iceman1001
c5e9201dd8 fix cppcheck shadowing 2022-01-29 10:05:26 +01:00
Oleg Moiseenko
b51081ff73
Merge pull request #1566 from merlokk/cip_doc 
cipurse overview
 2022-01-29 02:03:10 +02:00
merlokk
da2719c6f3 cipurse overview 2022-01-29 02:02:51 +02:00