]> git.zerfleddert.de Git - proxmark3-svn/log
proxmark3-svn
8 years agoCHG: textual fixes in help text
iceman1001 [Tue, 9 Aug 2016 07:10:26 +0000 (09:10 +0200)]
CHG: textual fixes in help text
CHG: better exit message for 'lf awid bruteforce'

8 years agoFIX: delay was parsed incorrect into a uint8_t...
iceman1001 [Mon, 8 Aug 2016 20:17:15 +0000 (22:17 +0200)]
FIX: delay was parsed incorrect into a uint8_t...
CHG: help text fixed

8 years agoADD: Added a delay in ms to 'lf awid brute' Thanks to @crayon for the idea.
iceman1001 [Mon, 8 Aug 2016 20:09:51 +0000 (22:09 +0200)]
ADD:  Added a delay in ms to 'lf awid brute'  Thanks to @crayon for the idea.

8 years agoFIX: the cmdline parsing was a bit too hard. Thanks to @crayon for pointing out...
iceman1001 [Mon, 8 Aug 2016 19:27:53 +0000 (21:27 +0200)]
FIX:   the cmdline parsing was a bit too hard. Thanks to @crayon for pointing out there were a bug here.

8 years agolayouts.
iceman1001 [Mon, 8 Aug 2016 17:02:46 +0000 (19:02 +0200)]
layouts.

8 years agoeven more..
iceman1001 [Mon, 8 Aug 2016 17:00:53 +0000 (19:00 +0200)]
even more..

8 years agomore layout
iceman1001 [Mon, 8 Aug 2016 17:00:09 +0000 (19:00 +0200)]
more layout

8 years agocorrecting the layout...
iceman1001 [Mon, 8 Aug 2016 16:58:05 +0000 (18:58 +0200)]
correcting the layout...

8 years agotextual changes.
iceman1001 [Mon, 8 Aug 2016 16:51:34 +0000 (18:51 +0200)]
textual changes.

8 years agoCHG: added the libncurses5-dev instruction for COMPILING.txt
iceman1001 [Mon, 8 Aug 2016 16:07:36 +0000 (18:07 +0200)]
CHG: added the  libncurses5-dev instruction for COMPILING.txt
CHG: updated the readme with latest changes from changelog

8 years agotextual changes
iceman1001 [Mon, 8 Aug 2016 15:56:04 +0000 (17:56 +0200)]
textual changes

8 years agoADD: J-Run's 2nd phase tool mf_key_brute ref: https://github.com/J-Run/mf_key_brute...
iceman1001 [Mon, 8 Aug 2016 15:49:30 +0000 (17:49 +0200)]
ADD:  J-Run's 2nd phase tool mf_key_brute  ref: https://github.com/J-Run/mf_key_brute   Estimated time to search keyspace is ~18min.

J_Run's 2nd phase of multiple sector nested authentication key recovery
You have a known 4 last bytes of a key recovered with mf_nonce_brute tool.
First 2 bytes of key will be bruteforced

Usage:  hf mf keybrute [h] <block number> <A|B> <key>
options:
      h               this help
      <block number>  target block number
      <A|B>           target key type
      <key>           candidate key from mf_nonce_brute tool
samples:
           hf mf keybrute 1 A 000011223344

8 years agoMerge branch 'master' of https://github.com/iceman1001/proxmark3
iceman1001 [Mon, 8 Aug 2016 05:46:12 +0000 (07:46 +0200)]
Merge branch 'master' of https://github.com/iceman1001/proxmark3

8 years agoMerge pull request #21 from alexgrin/iceman_master
Iceman [Mon, 8 Aug 2016 05:43:26 +0000 (07:43 +0200)]
Merge pull request #21 from alexgrin/iceman_master

FIX: erroneous semicolon

8 years agoFIX: erroneous semicolon
Alexis Green [Mon, 8 Aug 2016 03:07:25 +0000 (20:07 -0700)]
FIX: erroneous semicolon

8 years agofix: forgot something small.. sloppy.
iceman1001 [Sun, 7 Aug 2016 20:15:35 +0000 (22:15 +0200)]
fix:  forgot something small.. sloppy.

8 years agoADD: added the 'max frame size' parameter set, valid sizes: 16|24|32|40|48|64...
iceman1001 [Sun, 7 Aug 2016 20:05:10 +0000 (22:05 +0200)]
ADD:  added the 'max frame size' parameter set,   valid sizes: 16|24|32|40|48|64|96|128|256
it can be verified by setting debuglevel to 3 or more.

8 years agoCHG: fixes to match the new arguments to the darkside attack (keytype A|B and blockn...
iceman1001 [Sun, 7 Aug 2016 19:19:11 +0000 (21:19 +0200)]
CHG:  fixes to match the new arguments to the darkside attack (keytype A|B and blocknumber) in mifare_autopwn.lua script.

8 years agoCHG: moved some TEA crypto stuff from 14b into analyse.
iceman1001 [Sun, 7 Aug 2016 19:08:17 +0000 (21:08 +0200)]
CHG:  moved some TEA crypto stuff from 14b into analyse.

8 years agoCHG: increased the script-filename column width from 16 to 21.
iceman1001 [Sun, 7 Aug 2016 19:05:09 +0000 (21:05 +0200)]
CHG: increased the script-filename column width from 16 to 21.

8 years agotextual changes.
iceman1001 [Sun, 7 Aug 2016 16:50:25 +0000 (18:50 +0200)]
textual changes.

8 years agoCHG: applied some of the changes unto "hf 14b snoop" *untested* Hard to test without...
iceman1001 [Sun, 7 Aug 2016 16:49:36 +0000 (18:49 +0200)]
CHG:  applied some of the changes unto "hf 14b snoop" *untested* Hard to test without a proper reader/tag to snoop

8 years agoCHG: iso14443b.c got some more love. using the "hf 14b raw" command gives now...
iceman1001 [Sun, 7 Aug 2016 15:49:33 +0000 (17:49 +0200)]
CHG:  iso14443b.c  got some more love.  using the "hf 14b raw" command gives now a much stabil read from more distances than before.

8 years agoMerge pull request #20 from alexgrin/iceman_master
Iceman [Sat, 6 Aug 2016 20:42:39 +0000 (22:42 +0200)]
Merge pull request #20 from alexgrin/iceman_master

FIX: Coverity badge link now works.

8 years agoFIX: Coverity badge link now works.
Alexis Green [Thu, 4 Aug 2016 22:52:54 +0000 (15:52 -0700)]
FIX: Coverity badge link now works.

8 years agoCHG: some calyspo stuff
iceman1001 [Thu, 4 Aug 2016 19:57:40 +0000 (21:57 +0200)]
CHG:  some calyspo stuff

8 years agoCHG: marshmellow42 's improved "hf mf sim x"
iceman1001 [Thu, 4 Aug 2016 19:57:18 +0000 (21:57 +0200)]
CHG:  marshmellow42 's improved "hf mf sim x"

8 years agoCHG: moved a defince arraylen into util.h and changed to uppercase.
iceman1001 [Thu, 4 Aug 2016 19:54:11 +0000 (21:54 +0200)]
CHG: moved a defince arraylen into util.h  and changed to uppercase.

8 years agoCHG: trying to unify the crc algos in one place.
iceman1001 [Thu, 4 Aug 2016 19:52:32 +0000 (21:52 +0200)]
CHG: trying to unify the crc algos in one place.

8 years agoADD: @donwan581 select keytype for the darkside attack.
iceman1001 [Thu, 4 Aug 2016 19:51:26 +0000 (21:51 +0200)]
ADD:  @donwan581 select keytype for the darkside attack.

8 years agoCHG: cleaning up.
iceman1001 [Thu, 4 Aug 2016 19:37:43 +0000 (21:37 +0200)]
CHG:  cleaning up.

8 years agoFIX: coverity scan 133850, again. Why on earth did the 7 come from. I removed it.
iceman1001 [Wed, 3 Aug 2016 10:09:16 +0000 (12:09 +0200)]
FIX: coverity scan 133850,  again.  Why on earth did the 7 come from. I removed it.

8 years agofix: COVERITYSCAN 133871, fix one part, breaking another. shouldnt have changed...
iceman1001 [Wed, 3 Aug 2016 09:57:40 +0000 (11:57 +0200)]
fix: COVERITYSCAN 133871,  fix one part,  breaking another.  shouldnt have changed to uint8_t since it can never be negative.

8 years agoFIX: coverity scan 133859 structually dead code, looks like this is a rest from...
iceman1001 [Wed, 3 Aug 2016 08:53:26 +0000 (10:53 +0200)]
FIX:  coverity scan 133859 structually dead code,  looks like this is a rest from and old loop. I just removed it.

8 years agoFIX; coverity scan 133850, & operation should keep only topbit of lower nibble.
iceman1001 [Wed, 3 Aug 2016 08:01:37 +0000 (10:01 +0200)]
FIX; coverity scan 133850,  & operation should keep only topbit of lower nibble.
CHG: tabs fixed

8 years agoCoverity Scan 133850, need to ask @jason about this one.
iceman1001 [Wed, 3 Aug 2016 07:32:07 +0000 (09:32 +0200)]
Coverity Scan 133850,   need to ask @jason about this one.

8 years agoMerge branch 'master' of https://github.com/iceman1001/proxmark3
iceman1001 [Wed, 3 Aug 2016 07:30:01 +0000 (09:30 +0200)]
Merge branch 'master' of https://github.com/iceman1001/proxmark3

8 years agoFIX: 133853, If you have 3items in a array, don't start with index 4 or 3, mental...
iceman1001 [Wed, 3 Aug 2016 07:28:54 +0000 (09:28 +0200)]
FIX: 133853,  If you have 3items in a array,  don't start with index 4 or 3,   mental note to self, stop coding when you are tired.

8 years agoMerge pull request #19 from alexgrin/iceman_master
Iceman [Wed, 3 Aug 2016 06:00:22 +0000 (08:00 +0200)]
Merge pull request #19 from alexgrin/iceman_master

Another Coverity fix

8 years agoFIX: CoverityScan 123358 and 133864 - Unchecked return value
Alexis Green [Wed, 3 Aug 2016 05:44:36 +0000 (22:44 -0700)]
FIX: CoverityScan 123358 and 133864 - Unchecked return value

8 years agoFIX: CoverityScan 121362 - Pointer to local outside scope
Alexis Green [Tue, 2 Aug 2016 23:12:44 +0000 (16:12 -0700)]
FIX: CoverityScan 121362 - Pointer to local outside scope

8 years agoFIX: mental note to self, don't code when tried. "size" should have been "sizeof...
iceman1001 [Tue, 2 Aug 2016 22:51:26 +0000 (00:51 +0200)]
FIX: mental note to self, don't code when tried. "size" should have been "sizeof".   I need to fix my build for armsrc again.

8 years agoFIX: forgot a semicolon
iceman1001 [Tue, 2 Aug 2016 22:42:23 +0000 (00:42 +0200)]
FIX:  forgot a semicolon

8 years agoFIX: Coverity scan 1333852, Make sure (card) is not null before accessing it.
iceman1001 [Tue, 2 Aug 2016 22:39:02 +0000 (00:39 +0200)]
FIX: Coverity scan 1333852, Make sure (card) is not null before accessing it.

8 years agoCHG: Some testing of timings on 14443b,
iceman1001 [Tue, 2 Aug 2016 22:35:14 +0000 (00:35 +0200)]
CHG: Some testing of timings on 14443b,
FIX: CoverityScan 133854 , out-of-bounds read,  when calculating crc.

8 years agoFIX: COverityScan 133865, out-of-bounds access, Forgot that bits is not used in...
iceman1001 [Tue, 2 Aug 2016 22:25:53 +0000 (00:25 +0200)]
FIX: COverityScan 133865, out-of-bounds access,   Forgot that bits is not used in Logtrace but bytes.

8 years agoFIX: CoverityScan 133857, cast to uint32_t will stop eventual problems. However...
iceman1001 [Tue, 2 Aug 2016 22:15:26 +0000 (00:15 +0200)]
FIX: CoverityScan 133857, cast to uint32_t will stop eventual problems.  However its a uint_16 so it shouldnt be a problem to start with.

8 years agoFIX. COVERITYscan 133860, initialize to zero. This function is still not working...
iceman1001 [Tue, 2 Aug 2016 22:13:33 +0000 (00:13 +0200)]
FIX. COVERITYscan 133860,  initialize to zero.  This function is still not working but at least now it doesnt crash the client.

8 years agoFIX: CoverityScan, 1333853, out-of-bounds, well, if I have 3 items in a array...
iceman1001 [Tue, 2 Aug 2016 22:10:21 +0000 (00:10 +0200)]
FIX: CoverityScan,  1333853,  out-of-bounds,  well, if I have 3 items in a array, don't start reading 4...

8 years agoMerge pull request #18 from alexgrin/iceman_master
Iceman [Tue, 2 Aug 2016 21:22:51 +0000 (23:22 +0200)]
Merge pull request #18 from alexgrin/iceman_master

A few fixes

8 years agoFIX: LEGIC - potential stack corruption calculating CRC from user input
Alexis Green [Tue, 2 Aug 2016 21:10:33 +0000 (14:10 -0700)]
FIX: LEGIC - potential stack corruption calculating CRC from user input

8 years agoFIX: CoverityScan 123465 - Resource leak
Alexis Green [Tue, 2 Aug 2016 20:57:44 +0000 (13:57 -0700)]
FIX: CoverityScan 123465 - Resource leak

8 years agoCHG: LEGIC - allow offline mode due to existing offline command
Alexis Green [Tue, 2 Aug 2016 20:37:05 +0000 (13:37 -0700)]
CHG: LEGIC - allow offline mode due to existing offline command

8 years agoMerge branch 'master' of https://github.com/iceman1001/proxmark3
iceman1001 [Tue, 2 Aug 2016 14:06:40 +0000 (16:06 +0200)]
Merge branch 'master' of https://github.com/iceman1001/proxmark3

8 years agoFIX: CoverityScan 133858 -uninitialized data
iceman1001 [Tue, 2 Aug 2016 14:05:50 +0000 (16:05 +0200)]
FIX: CoverityScan 133858 -uninitialized data

8 years agochg: another way of checking a array for NULL
iceman1001 [Tue, 2 Aug 2016 14:04:57 +0000 (16:04 +0200)]
chg:  another way of checking a array for NULL

8 years agofix: CoverityScan 133855 -out-of-bounds bits was used as index to cmd array.
iceman1001 [Tue, 2 Aug 2016 14:04:03 +0000 (16:04 +0200)]
fix: CoverityScan  133855 -out-of-bounds  bits was used as index to cmd array.

8 years agoMerge pull request #17 from alexgrin/iceman_master
Iceman [Tue, 2 Aug 2016 08:14:01 +0000 (10:14 +0200)]
Merge pull request #17 from alexgrin/iceman_master

Fixing warning:

8 years agoFixing warning:
Alexis Green [Mon, 1 Aug 2016 20:03:46 +0000 (13:03 -0700)]
Fixing warning:
warning: ignoring return va 'scanf', declared with attribute warn_unused_result [-Wunused-result]

8 years agoMerge pull request #16 from alexgrin/iceman_master
Iceman [Mon, 1 Aug 2016 07:02:49 +0000 (09:02 +0200)]
Merge pull request #16 from alexgrin/iceman_master

Fixing clang compilation warning

8 years agoFixing clang compilation warning
Alexis Green [Mon, 1 Aug 2016 05:35:16 +0000 (22:35 -0700)]
Fixing clang compilation warning
  warning: shifting a negative signed value is undefined [-Wshift-negative-value]

8 years agoFIX: removed a compiler warning, the stringlen is not used anymore.
iceman1001 [Sun, 31 Jul 2016 20:03:46 +0000 (22:03 +0200)]
FIX:  removed a compiler warning,  the stringlen is not used anymore.

8 years agominor textual fix
iceman1001 [Sun, 31 Jul 2016 20:01:40 +0000 (22:01 +0200)]
minor textual fix

8 years agoCHG: Moved some includes, defines, structs from .c into header file.
iceman1001 [Sun, 31 Jul 2016 20:00:49 +0000 (22:00 +0200)]
CHG:  Moved some includes, defines, structs from .c into header file.

8 years agoFIX: getting rid of a compiler warning message.
iceman1001 [Sun, 31 Jul 2016 19:59:29 +0000 (21:59 +0200)]
FIX:  getting rid of a compiler warning message.

8 years agoADD: started to rework the wiegand converting. Extracted it from the 'lf hid' file...
iceman1001 [Sun, 31 Jul 2016 19:58:15 +0000 (21:58 +0200)]
ADD:  started to rework the wiegand converting.  Extracted it from the 'lf hid' file.  Looks decent but still needs work.

8 years agoMerge pull request #15 from alexgrin/iceman_master
Iceman [Sun, 31 Jul 2016 19:53:14 +0000 (21:53 +0200)]
Merge pull request #15 from alexgrin/iceman_master

Adding a 'recoverpw' command for T55xx to try to recover corrupt pass…

8 years agoAdding a 'recoverpw' command for T55xx to try to recover corrupt password written...
Alexis Green [Thu, 28 Jul 2016 20:52:59 +0000 (13:52 -0700)]
Adding a 'recoverpw' command for T55xx to try to recover corrupt password written by a handheld cloner by fiddling with bits in the expected password.

8 years agoCHG: moved out some help-texts into its own usage-functions.
iceman1001 [Sun, 31 Jul 2016 09:37:19 +0000 (11:37 +0200)]
CHG:  moved out some help-texts into its own usage-functions.

8 years agoCHG: Moved a 'include' statement to header file
iceman1001 [Sat, 30 Jul 2016 17:37:15 +0000 (19:37 +0200)]
CHG:  Moved a 'include' statement to header file

8 years agoREM: cleaning up some commented code.
iceman1001 [Sat, 30 Jul 2016 17:36:48 +0000 (19:36 +0200)]
REM:  cleaning up some commented code.

8 years agoFIX: Found a minor bug in 'LF CMDREAD' where it on device side didn't compare...
iceman1001 [Sat, 30 Jul 2016 17:30:53 +0000 (19:30 +0200)]
FIX:   Found a minor bug in 'LF CMDREAD'  where it on device side didn't compare with the right char 'h' instead of 'H'.   Re-wrote that whole part anyway,  I changed periods to be max 0xFFFF in length,  doubtful that a zero or one delay will be bigger than 65535...

8 years agoCHG: The jablotron demod now deals with the strangeness of hex symbols A-F in cardid...
iceman1001 [Fri, 29 Jul 2016 21:30:40 +0000 (23:30 +0200)]
CHG:  The jablotron demod now deals with the strangeness of hex symbols A-F in cardid the same way a reader prints it.

8 years agoADD: Binary Encoded Digit -> Decimal
iceman1001 [Fri, 29 Jul 2016 21:29:37 +0000 (23:29 +0200)]
ADD: Binary Encoded Digit -> Decimal
ADD: Decimal -> Binary Encoded Digit

Ie
  decimal 2345 becomes 0x2345
  and
  hex 0x2345 becomes decimal 2345

8 years agoCHG: help text changes in cmdlfjablotron.c
iceman1001 [Fri, 29 Jul 2016 18:58:52 +0000 (20:58 +0200)]
CHG: help text changes in cmdlfjablotron.c
CHG: increase byte size to uint16_t in crc.c CRC16Legic

8 years agochg: textual change.
iceman1001 [Fri, 29 Jul 2016 18:53:56 +0000 (20:53 +0200)]
chg: textual change.

8 years agoCHG: redundant 'return' statement removed
iceman1001 [Fri, 29 Jul 2016 12:32:13 +0000 (14:32 +0200)]
CHG:  redundant 'return' statement removed

8 years agoCHG: better printing output of card ID
iceman1001 [Fri, 29 Jul 2016 12:31:39 +0000 (14:31 +0200)]
CHG: better printing output of card ID
CHG: better detecting in preambl. 16bits with 1, and a zero bit.  Also cleared this topbit when cloneing and simulating.

8 years agoCHG: textual changes to help text.
iceman1001 [Fri, 29 Jul 2016 11:46:05 +0000 (13:46 +0200)]
CHG: textual changes to help text.
CHG: removed the 'd' as input,  the clone/sim commands is simpler.
CHG: printing of card ID is now zero padded.

8 years agoADD: LF JABLOTRON functionality. with clone/sim and detection in LF SEARCH.
iceman1001 [Fri, 29 Jul 2016 09:04:12 +0000 (11:04 +0200)]
ADD: LF JABLOTRON functionality.  with clone/sim and detection in LF SEARCH.
CHG: removed no-existing crc8ja code
FIX: a check in ASKbiphaseDemod to make sure graphbuff is not empty.

8 years agoFIX: that OEM variable that is unused.
iceman1001 [Thu, 28 Jul 2016 20:22:34 +0000 (22:22 +0200)]
FIX:  that OEM variable that is unused.

8 years agoFIX: Fixed some warnings I didn't take notice off.
iceman1001 [Thu, 28 Jul 2016 20:17:44 +0000 (22:17 +0200)]
FIX:  Fixed some warnings I didn't take notice off.
- memcpy should have been "memset"
- forgot to add function declaration into header file.

8 years agoCHG: removed the wiegand converting, since I'm not happy with how its implemented...
iceman1001 [Thu, 28 Jul 2016 19:50:54 +0000 (21:50 +0200)]
CHG:  removed the wiegand converting,  since I'm not happy with how its implemented.  This is rework in progress.

8 years agoCHG: trying to figure out why I can't get the seconds out..
iceman1001 [Thu, 28 Jul 2016 19:48:53 +0000 (21:48 +0200)]
CHG:  trying to figure out why I can't get the seconds out..

8 years agoADD: Added some new analyse functions like CHKSUM ADD/SUBTRACKT with one's complement
iceman1001 [Thu, 28 Jul 2016 19:47:52 +0000 (21:47 +0200)]
ADD:  Added some new analyse functions like CHKSUM ADD/SUBTRACKT with one's complement

8 years agospacing..
iceman1001 [Thu, 28 Jul 2016 19:46:27 +0000 (21:46 +0200)]
spacing..

8 years agoCHG: forgot to add the reflect function
iceman1001 [Thu, 28 Jul 2016 19:45:00 +0000 (21:45 +0200)]
CHG:  forgot to add the reflect function

8 years agoCHG: merged the forum user @jason 's fixes to LEGIC. *UNTESTED*
iceman1001 [Thu, 28 Jul 2016 19:41:44 +0000 (21:41 +0200)]
CHG: merged the forum user @jason 's fixes to LEGIC.  *UNTESTED*
CHG: changed the CRC implementations.

8 years agoADD: some new usb commmands from EMV, and for LEGIC.
iceman1001 [Thu, 28 Jul 2016 19:16:02 +0000 (21:16 +0200)]
ADD:  some new usb commmands from EMV,  and for LEGIC.

8 years agoCHG: removed the linking to radixsort.c
iceman1001 [Thu, 28 Jul 2016 18:42:46 +0000 (20:42 +0200)]
CHG:  removed the linking to radixsort.c

8 years agoMerge branch 'master' of https://github.com/iceman1001/proxmark3
iceman1001 [Thu, 28 Jul 2016 18:41:54 +0000 (20:41 +0200)]
Merge branch 'master' of https://github.com/iceman1001/proxmark3

8 years agoUpdate README.md
Iceman [Thu, 28 Jul 2016 16:38:20 +0000 (18:38 +0200)]
Update README.md

8 years agoCHG: added a comment
iceman1001 [Sat, 23 Jul 2016 16:33:30 +0000 (18:33 +0200)]
CHG: added a comment

8 years agoCHG: some clearing of memory
iceman1001 [Sat, 23 Jul 2016 16:31:20 +0000 (18:31 +0200)]
CHG: some clearing of memory

8 years agoMerge pull request #14 from k02a/patch-2
Iceman [Fri, 22 Jul 2016 20:57:28 +0000 (22:57 +0200)]
Merge pull request #14 from k02a/patch-2

Addition of depending library flags...

8 years agoMerge pull request #13 from k02a/patch-1
Iceman [Fri, 22 Jul 2016 20:55:00 +0000 (22:55 +0200)]
Merge pull request #13 from k02a/patch-1

Improved compilation compability on Linux

8 years agoAddition of depending library flags...
k02a [Fri, 22 Jul 2016 11:52:12 +0000 (13:52 +0200)]
Addition of depending library flags...

Inclusion of termcap library or ncurses library solves the compilation errors on some Linux distributions, for example a currently updated Slackware Linux 14.2 x86_64 vanilla distribution (which I run).

Output:
bash-4.3# make -C proxmark3
[...]
g++ -DQT_SHARED -I/usr/lib64/qt/include/QtGui -I/usr/lib64/qt/include/QtCore -Wall -O3 obj/proxmark3.o obj/uart.o obj/util.o obj/sleep.o obj/nonce2key/crapto1.o obj/nonce2key/crypto1.o obj/nonce2key/nonce2key.o obj/nonce2key/crypto1_bs.o obj/loclass/cipher.o obj/loclass/cipherutils.o obj/loclass/des.o obj/loclass/ikeys.o obj/loclass/elite_crack.o obj/loclass/fileutils.o obj/mifarehost.o obj/parity.o obj/crc.o obj/crc16.o obj/crc64.o obj/iso14443crc.o obj/iso15693tools.o obj/data.o obj/graph.o obj/ui.o obj/cmddata.o obj/lfdemod.o obj/cmdanalyse.o obj/cmdhf.o obj/cmdhf14a.o obj/cmdhf14b.o obj/cmdhf15.o obj/cmdhfepa.o obj/cmdhflegic.o obj/cmdhficlass.o obj/cmdhfmf.o obj/cmdhfmfu.o obj/cmdhfmfhard.o obj/cmdhfmfdes.o obj/cmdhftopaz.o obj/cmdhw.o obj/cmdlf.o obj/cmdlfio.o obj/cmdlfhid.o obj/cmdlfawid.o obj/cmdlfem4x.o obj/cmdlfhitag.o obj/cmdlfti.o obj/cmdparser.o obj/cmdmain.o obj/cmdlft55xx.o obj/cmdlfpcf7931.o obj/cmdlfviking.o obj/cmdlfpresco.o obj/cmdlfpyramid.o obj/cmdlfguard.o obj/cmdlfnedap.o obj/pm3_binlib.o obj/scripting.o obj/cmdscript.o obj/pm3_bitlib.o obj/aes.o obj/protocols.o obj/sha1.o obj/sha256.o obj/cmdcrc.o obj/reveng/preset.o obj/reveng/reveng.o obj/reveng/cli.o obj/reveng/bmpbit.o obj/reveng/model.o obj/reveng/poly.o obj/reveng/getopt.o obj/tea.o obj/prng.o obj/radixsort.o obj/bucketsort.o obj/proxgui.o obj/proxguiqt.o obj/proxguiqt.moc.o -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm ../liblua/liblua.a -ldl -L/usr/lib64/qt/lib -lQtGui -lQtCore -o proxmark3
/usr/lib64/gcc/x86_64-slackware-linux/5.3.0/../../../../lib64/libreadline.so: undefined reference to `tgetstr'
/usr/lib64/gcc/x86_64-slackware-linux/5.3.0/../../../../lib64/libreadline.so: undefined reference to `tputs'
/usr/lib64/gcc/x86_64-slackware-linux/5.3.0/../../../../lib64/libreadline.so: undefined reference to `BC'
/usr/lib64/gcc/x86_64-slackware-linux/5.3.0/../../../../lib64/libreadline.so: undefined reference to `tgetent'
/usr/lib64/gcc/x86_64-slackware-linux/5.3.0/../../../../lib64/libreadline.so: undefined reference to `tgetflag'
/usr/lib64/gcc/x86_64-slackware-linux/5.3.0/../../../../lib64/libreadline.so: undefined reference to `tgoto'
/usr/lib64/gcc/x86_64-slackware-linux/5.3.0/../../../../lib64/libreadline.so: undefined reference to `UP'
/usr/lib64/gcc/x86_64-slackware-linux/5.3.0/../../../../lib64/libreadline.so: undefined reference to `tgetnum'
/usr/lib64/gcc/x86_64-slackware-linux/5.3.0/../../../../lib64/libreadline.so: undefined reference to `PC'
collect2: fel: ld returnerade avslutningsstatus 1
Makefile:172: receptet för målet "proxmark3" misslyckades
make[1]: *** [proxmark3] Fel 1
make[1]: Lämnar katalogen "/home/github/iceman1001/proxmark3/client"
Makefile:12: receptet för målet "client/all" misslyckades
make: *** [client/all] Fel 2
make: Lämnar katalogen "/home/github/iceman1001/proxmark3"

8 years agoImproved compilation compability on Linux
k02a [Fri, 22 Jul 2016 11:40:05 +0000 (13:40 +0200)]
Improved compilation compability on Linux

Compilation of Lua on a currently updated Slackware Linux 14.2 x86_64 vanilla distribution will cause some errors, due to a missing flags in the Makefile. I noticed that adding the termcap library solves the problem.

I also found a thread (http://lua.2524044.n2.nabble.com/readline-termcap-ncurses-td5726148.html
) where other Linux distributions might have similar problems with Lua. Included version of liblua, derived from Lua 5.2.2, also seems to depend on the Termcap library and/or ncurses library.

Output:
bash-4.3$ make -C proxmark3
make: Går till katalogen "/home/github/iceman1001/proxmark3"
make -C client all
make[1]: Går till katalogen "/home/github/iceman1001/proxmark3/client"
Compiling liblua, using platform linux
cd ../liblua && make linux
make[2]: Går till katalogen "/home/github/iceman1001/proxmark3/liblua"
make all SYSCFLAGS="-DLUA_USE_LINUX" SYSLIBS="-Wl,-E -ldl -lreadline"
make[3]: Går till katalogen "/home/github/iceman1001/proxmark3/liblua"
gcc -O3 -Wall -DLUA_COMPAT_ALL -DLUA_USE_LINUX    -c -o lapi.o lapi.c
[...]
gcc -O3 -Wall -DLUA_COMPAT_ALL -DLUA_USE_LINUX    -c -o linit.o linit.c
ar rcu liblua.a lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o lundump.o lvm.o lzio.o lauxlib.o lbaselib.o lbitlib.o lcorolib.o ldblib.o liolib.o lmathlib.o loslib.o lstrlib.o ltablib.o loadlib.o linit.o
ranlib liblua.a
gcc -O3 -Wall -DLUA_COMPAT_ALL -DLUA_USE_LINUX    -c -o lua.o lua.c
gcc -o lua   lua.o liblua.a -lm -Wl,-E -ldl -lreadline
/usr/lib64/gcc/x86_64-slackware-linux/5.3.0/../../../../lib64/libreadline.so: undefined reference to `tputs'
/usr/lib64/gcc/x86_64-slackware-linux/5.3.0/../../../../lib64/libreadline.so: undefined reference to `tgoto'
/usr/lib64/gcc/x86_64-slackware-linux/5.3.0/../../../../lib64/libreadline.so: undefined reference to `tgetflag'
/usr/lib64/gcc/x86_64-slackware-linux/5.3.0/../../../../lib64/libreadline.so: undefined reference to `UP'
/usr/lib64/gcc/x86_64-slackware-linux/5.3.0/../../../../lib64/libreadline.so: undefined reference to `tgetent'
/usr/lib64/gcc/x86_64-slackware-linux/5.3.0/../../../../lib64/libreadline.so: undefined reference to `tgetnum'
/usr/lib64/gcc/x86_64-slackware-linux/5.3.0/../../../../lib64/libreadline.so: undefined reference to `PC'
/usr/lib64/gcc/x86_64-slackware-linux/5.3.0/../../../../lib64/libreadline.so: undefined reference to `tgetstr'
/usr/lib64/gcc/x86_64-slackware-linux/5.3.0/../../../../lib64/libreadline.so: undefined reference to `BC'
collect2: fel: ld returnerade avslutningsstatus 1
Makefile:63: receptet för målet "lua" misslyckades
make[3]: *** [lua] Fel 1
make[3]: Lämnar katalogen "/home/github/iceman1001/proxmark3/liblua"
Makefile:106: receptet för målet "linux" misslyckades
make[2]: *** [linux] Fel 2
make[2]: Lämnar katalogen "/home/github/iceman1001/proxmark3/liblua"
Makefile:203: receptet för målet "lua_build" misslyckades
make[1]: *** [lua_build] Fel 2
make[1]: Lämnar katalogen "/home/github/iceman1001/proxmark3/client"
Makefile:12: receptet för målet "client/all" misslyckades
make: *** [client/all] Fel 2
make: Lämnar katalogen "/home/github/iceman1001/proxmark3"

8 years agoMerge pull request #12 from k02a/patch-1
Iceman [Fri, 22 Jul 2016 08:13:11 +0000 (10:13 +0200)]
Merge pull request #12 from k02a/patch-1

Inclusion of unused oem variable

8 years agoInclusion of unused oem variable
k02a [Fri, 22 Jul 2016 07:49:02 +0000 (09:49 +0200)]
Inclusion of unused oem variable

When compilation of the current source code, I am getting the warning of setting the unused variable "oem". I have included this, along with minor spelling corrections/language updates in the menu system.

gcc -std=c99 -O3 -mpopcnt -march=native -g -I. -I../include -I../common -I../zlib -I/opt/local/include -I../liblua -Wall -DHAVE_GUI -DZ_SOLO -DZ_PREFIX -DNO_GZIP -DZLIB_PM3_TUNED  -c -o obj/cmdlfhid.o cmdlfhid.c
cmdlfhid.c: I funktion "CmdHIDWiegand":
cmdlfhid.c:292:11: varning: variabeln "oem" sätts men används inte [-Wunused-but-set-variable]
  uint32_t oem;
           ^

Before:
pm3 --> lf hid wiegand 0 101 2001
HID 26 bit | FC: 101 CN: 2001 | Wiegand Code: 0000002004CA0FA2
[...]
HID 40 bit | FC: 101 CN: 2001 | Wiegand Code: 0000000000000FA2

After:
pm3 --> lf hid wiegand 0 101 2001
HID 26 bit | OEM: 0 FC: 101 CN: 2001 | Wiegand code: 0000002004CA0FA2
[...]
HID 40 bit | OEM: 0 FC: 101 CN: 2001 | Wiegand code: 0000000000000FA2

Impressum, Datenschutz