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

Jump to bottom

DESFire emulation support: Bug, stability and reliability fixes and PM3 compatible ISO authentication #319

Merged
merged 71 commits into from
Jul 8, 2022
Merged

DESFire emulation support: Bug, stability and reliability fixes and PM3 compatible ISO authentication #319

merged 71 commits into from
Jul 8, 2022

Commits on Jan 30, 2022

  1. Debugging ISO authenticate command (0x1a)

    @maxieds
    maxieds committed Jan 30, 2022
    Configuration menu
    Copy the full SHA
    fba0ee3 View commit details
    Browse the repository at this point in the history

  2. Re-implementing the 3DES crypto with CBC

    @maxieds
    maxieds committed Jan 30, 2022
    Configuration menu
    Copy the full SHA
    1e542ec View commit details
    Browse the repository at this point in the history

  3. More testing (still doesn't make it through round2 on the Chameleon)

    @maxieds
    maxieds committed Jan 30, 2022
    Configuration menu
    Copy the full SHA
    d20cac4 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2022

  1. AuthISO(0x1A) works tentatively (a little slowly) with the LibNFC tes… 

    …t code
    @maxieds
    maxieds committed Jan 31, 2022
    Configuration menu
    Copy the full SHA
    6ee1958 View commit details
    Browse the repository at this point in the history

  2. AuthLegacy(0x0A) works using 3DES enc/dec modes

    @maxieds
    maxieds committed Jan 31, 2022
    Configuration menu
    Copy the full SHA
    195e600 View commit details
    Browse the repository at this point in the history

  3. AuthLegacy(0x0A) works using 3DES enc/dec modes -- Makefile no testin… 

    …g -- For emsec#313
    @maxieds
    maxieds committed Jan 31, 2022
    Configuration menu
    Copy the full SHA
    281d3c7 View commit details
    Browse the repository at this point in the history

  4. Adding support for non-wrapped native commands (I believe)

    @maxieds
    maxieds committed Jan 31, 2022
    Configuration menu
    Copy the full SHA
    ca0afad View commit details
    Browse the repository at this point in the history

  5. Stashing incremental testing release code

    @maxieds
    maxieds committed Jan 31, 2022
    Configuration menu
    Copy the full SHA
    7176259 View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2022

  1. Working AES128 auth ; Nearly working ISO auth (still debugging) -- St… 

    …ashing copy for reference
    @maxieds
    maxieds committed Feb 3, 2022
    Configuration menu
    Copy the full SHA
    b451e12 View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2022

  1. Working AES128 auth and ISO auth ; Still need to debug the legacy auth

    @maxieds
    maxieds committed Feb 5, 2022
    Configuration menu
    Copy the full SHA
    a02f214 View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2022

  1. Bug fixes to observations in emsec#313

    @maxieds
    maxieds committed Feb 11, 2022
    Configuration menu
    Copy the full SHA
    ba3c736 View commit details
    Browse the repository at this point in the history

  2. Removing default testing nonce B from auth commands ; Running make style

    @maxieds
    maxieds committed Feb 11, 2022
    Configuration menu
    Copy the full SHA
    e22b286 View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2022

  1. Fixing bug where we must first auth with the legacy command mentioned… 

    … in emsec#313
    @maxieds
    maxieds committed Feb 12, 2022
    Configuration menu
    Copy the full SHA
    e15f8c7 View commit details
    Browse the repository at this point in the history

  2. Last minute modifications to DES/3DES enc/dec routines for data that … 

    …is not a multiple of the resp. block size
    @maxieds
    maxieds committed Feb 12, 2022
    Configuration menu
    Copy the full SHA
    bcf68d0 View commit details
    Browse the repository at this point in the history

  3. Making sure the auth AES and auth ISO handlers keep the chain of prio… 

    …r legacy auths intact
    @maxieds
    maxieds committed Feb 12, 2022
    Configuration menu
    Copy the full SHA
    1644a9e View commit details
    Browse the repository at this point in the history

  4. Fixing legacy auth algorithm from 3K3DES -> 2K3DES (cf. emsec#313)

    @maxieds
    maxieds committed Feb 12, 2022
    Configuration menu
    Copy the full SHA
    20a6960 View commit details
    Browse the repository at this point in the history

  5. Space saving defines to remove currently unused crypto exchange funct… 

    …ionality (will revisit when get to this subproject)
    @maxieds
    maxieds committed Feb 12, 2022
    Configuration menu
    Copy the full SHA
    b6be1b8 View commit details
    Browse the repository at this point in the history

  6. Addressing the ACK/NAK keep-alive exchanges from some NXP readers not… 

    …ed by \@lvandenb in emsec#313
    @maxieds
    maxieds committed Feb 12, 2022
    Configuration menu
    Copy the full SHA
    9ee3236 View commit details
    Browse the repository at this point in the history

  7. Finding other places to squeeze space for the DESFire config (Log and… 

    … terminal buffers stored on the stack)
    @maxieds
    maxieds committed Feb 12, 2022
    Configuration menu
    Copy the full SHA
    a4672ff View commit details
    Browse the repository at this point in the history

  8. Finding other places to squeeze space for the DESFire config (Log and… 

    … terminal buffers stored on the stack -- adding buffer full messages for INFO)
    @maxieds
    maxieds committed Feb 12, 2022
    Configuration menu
    Copy the full SHA
    3974786 View commit details
    Browse the repository at this point in the history

  9. Adding in preliminary AES transfer functions -- Trying to save space … 

    …for more where it can be pruned
    @maxieds
    maxieds committed Feb 12, 2022
    Configuration menu
    Copy the full SHA
    583bb93 View commit details
    Browse the repository at this point in the history

  10. Adding in preliminary AES transfer functions -- Trying to save space … 

    …for more where it can be pruned -- II
    @maxieds
    maxieds committed Feb 12, 2022
    Configuration menu
    Copy the full SHA
    a0cb74c View commit details
    Browse the repository at this point in the history

  11. Adding in preliminary AES transfer functions -- Trying to save space … 

    …for more where it can be pruned -- III -- cf. emsec#313
    @maxieds
    maxieds committed Feb 12, 2022
    Configuration menu
    Copy the full SHA
    de798fb View commit details
    Browse the repository at this point in the history

  12. Untested CMAC implementation for CommMode=FULL exchanges (Enciphered+… 

    …CMAC'ed data)
    @maxieds
    maxieds committed Feb 12, 2022
    Configuration menu
    Copy the full SHA
    e9ce4ac View commit details
    Browse the repository at this point in the history

  13. Preliminary (partial) support for more CommModes -- This is going to … 

    …need substantial testing
    @maxieds
    maxieds committed Feb 12, 2022
    Configuration menu
    Copy the full SHA
    e9437a6 View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2022

  1. Preliminary (partial) support for more CommModes -- This is going to … 

    …need substantial testing -- II
    @maxieds
    maxieds committed Feb 13, 2022
    Configuration menu
    Copy the full SHA
    74f216f View commit details
    Browse the repository at this point in the history

  2. Preliminary (partial) support for more CommModes -- This is going to … 

    …need substantial testing -- III
    @maxieds
    maxieds committed Feb 13, 2022
    Configuration menu
    Copy the full SHA
    a24fbe8 View commit details
    Browse the repository at this point in the history

  3. Making a sane backup point while prfusely debugging

    @maxieds
    maxieds committed Feb 13, 2022
    Configuration menu
    Copy the full SHA
    bf1eadc View commit details
    Browse the repository at this point in the history

  4. Incremental backup -- Auth schemes should be working -- New CommMode … 

    …checksum functions DO NOT fit into text/data (yet)
    @maxieds
    maxieds committed Feb 13, 2022
    Configuration menu
    Copy the full SHA
    65766e1 View commit details
    Browse the repository at this point in the history

  5. Out of hell ... Everything seems to be working again with the MEMORY_… 

    …LIMITED_TESTING define set in the Makefile :)
    @maxieds
    maxieds committed Feb 13, 2022
    Configuration menu
    Copy the full SHA
    ac265b4 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2022

  1. Swapping out previous __flash settings for commands lookup table into… 

    … last half of LOG_FRAM (code and Makefile defines -- may still need to extract this new section using avr-objcopy -- pending testing)
    @maxieds
    maxieds committed Feb 14, 2022
    Configuration menu
    Copy the full SHA
    138a174 View commit details
    Browse the repository at this point in the history

  2. Separate section to store in flash not working -- Beginning new appro… 

    …ach to put reduced size massive structure into plain old data mem
    @maxieds
    maxieds committed Feb 14, 2022
    Configuration menu
    Copy the full SHA
    2d54740 View commit details
    Browse the repository at this point in the history

  3. *Should* finally be working now -- Problem was that the SETTINGS memo… 

    …ry remapped the FLASH memory space used by avr-gcc\'s __flash to a custom .flashdata section after the LUFA build by a second call to avr-objcopy -- Clever way to maximize slot space, but the previous code was not aware of that causing apparently quasi-non-deterministic behavior with some readers -- Cf. emsec#313 and emsec#315
    @maxieds
    maxieds committed Feb 14, 2022
    Configuration menu
    Copy the full SHA
    8f5053f View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2022

  1. Stashing incremental changes from Arch for compilation on Mac

    @maxieds
    maxieds committed Mar 15, 2022
    Configuration menu
    Copy the full SHA
    64d1fff View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2022

  1. Stashing more incremental updates to the code to get/verify PM3 compa… 

    …tibility
    @maxieds
    maxieds committed Mar 16, 2022
    Configuration menu
    Copy the full SHA
    aafc5ab View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2022

  1. Adding more complete support for PM3 ISO auth (stashing incremental c… 

    …hanges as reference point)
    @maxieds
    maxieds committed Mar 21, 2022
    Configuration menu
    Copy the full SHA
    bb7d46f View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2022

  1. Adding more complete support for PM3 ISO auth (stashing incremental c… 

    …hanges as reference point -- II)
    @maxieds
    maxieds committed Mar 22, 2022
    Configuration menu
    Copy the full SHA
    1be7688 View commit details
    Browse the repository at this point in the history

  2. Proposed PM3 ISO auth compliant fwmod -- pending testing

    @maxieds
    maxieds committed Mar 22, 2022
    Configuration menu
    Copy the full SHA
    bccf579 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2022

  1. More progress towards PM3 compatible auth

    @maxieds
    maxieds committed Mar 26, 2022
    Configuration menu
    Copy the full SHA
    b873261 View commit details
    Browse the repository at this point in the history

  2. More progress towards PM3 compatible auth II

    @maxieds
    maxieds committed Mar 26, 2022
    Configuration menu
    Copy the full SHA
    fecf5cb View commit details
    Browse the repository at this point in the history

  3. Stuck on debugging issue with PM3 -- Posted to discord -- awaiting fi… 

    …x before this can get fixed
    @maxieds
    maxieds committed Mar 26, 2022
    Configuration menu
    Copy the full SHA
    7ecf3cb View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2022

  1. Stashing more working code to test PM3 compatibility (ISO/EV1 auth)

    @maxieds
    maxieds committed Mar 30, 2022
    Configuration menu
    Copy the full SHA
    45a6c3f View commit details
    Browse the repository at this point in the history

  2. Working ISO authentication on the PM3 : cf. emsec#313

    @maxieds
    maxieds committed Mar 30, 2022
    Configuration menu
    Copy the full SHA
    f4faaa7 View commit details
    Browse the repository at this point in the history

  3. Stashing LibNFC external USB reader test code online to test on Linux… 

    … (builds on MacOS)
    @maxieds
    maxieds committed Mar 30, 2022
    Configuration menu
    Copy the full SHA
    19e0d1c View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2022

  1. Incorporating bug fixes by @colinoflynn at https://github.com/colinof… 

    …lynn/ChameleonMini/commits/desfire-fixes (see message in emsec#313)
    @maxieds
    maxieds committed Apr 22, 2022
    Configuration menu
    Copy the full SHA
    4536789 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2022

  1. Fix Makefile bugs noticed in emsec#313

    @maxieds
    maxieds committed May 11, 2022
    Configuration menu
    Copy the full SHA
    83ce182 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2022

  1. Attempt to fix bug with pm3 --> hf mfdes info reported in emsec#313

    @maxieds
    maxieds committed May 13, 2022
    Configuration menu
    Copy the full SHA
    8e25538 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2022

  1. A few improvements to Makefile and build scripts (cf. previous issue e… 

    …msec#283)
    @maxieds
    maxieds committed Jun 1, 2022
    Configuration menu
    Copy the full SHA
    8a823c8 View commit details
    Browse the repository at this point in the history

  2. More refinements and efforts to make build output cleaner to read

    @maxieds
    maxieds committed Jun 1, 2022
    Configuration menu
    Copy the full SHA
    8e77d78 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2022

  1. Updates to make/build scripts ; Partial fixes to @colinoflynn\'s note… 

    …s in emsec#313 (success with \'hf mfdes info -- Still debugging auth exchanges)
    @maxieds
    maxieds committed Jun 2, 2022
    Configuration menu
    Copy the full SHA
    f9c1dab View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2022

  1. Finalizing the fixes to emsec#313 to verify PM3 support

    @maxieds
    maxieds committed Jun 4, 2022
    Configuration menu
    Copy the full SHA
    024c699 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2022

  1. Fixing some make build script bugs

    @maxieds
    maxieds committed Jun 8, 2022
    Configuration menu
    Copy the full SHA
    7b4cdd8 View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2022

  1. Fixing Linux build errors noticed by @colinoflynn in \emsec#313

    @maxieds
    maxieds committed Jun 15, 2022
    Configuration menu
    Copy the full SHA
    68a12e6 View commit details
    Browse the repository at this point in the history

  2. Fixing the terminal (echo) printing on MacOS following the last commi… 

    …t for Linux users
    @maxieds
    maxieds committed Jun 15, 2022
    Configuration menu
    Copy the full SHA
    1ce7b55 View commit details
    Browse the repository at this point in the history

  3. ACR122U USB/PCSC reader stopped being responsive after all of the PM3… 

    … compat changes: Attempt to fix this problem (PM3 command support verified as still working) -- Cf. emsec#313
    @maxieds
    maxieds committed Jun 15, 2022
    Configuration menu
    Copy the full SHA
    39de8cc View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2022

  1. Typo corrected

    @maxieds
    maxieds authored Jun 16, 2022
    Configuration menu
    Copy the full SHA
    bbc489e View commit details
    Browse the repository at this point in the history

  2. Cleaning up some old commented out macro definitions

    @maxieds
    maxieds authored Jun 16, 2022
    Configuration menu
    Copy the full SHA
    149599e View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2022

  1. Merge branch 'master' into DESFire-AuthISO-Patch

    @maxieds
    maxieds authored Jun 17, 2022
    Configuration menu
    Copy the full SHA
    d29f087 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2022

  1. Delete DESFire_example.dmp 

    This image is out of date -- Created using much older firmware sources. It eventually would be nice to replace it with a better dump using PR emsec#319 sources (or more recent).
    @maxieds
    maxieds authored Jun 23, 2022
    Configuration menu
    Copy the full SHA
    3806bcf View commit details
    Browse the repository at this point in the history

  2. Delete DESFire_example.contents 

    This image is out of date -- Created using much older firmware sources. It eventually would be nice to replace it with a better dump using PR emsec#319 sources (or more recent).
    @maxieds
    maxieds authored Jun 23, 2022
    Configuration menu
    Copy the full SHA
    b378b4e View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2022

  1. Updating source after the feedback from @fptrs in PR emsec#319

    @maxieds
    maxieds committed Jun 28, 2022
    Configuration menu
    Copy the full SHA
    7f37bfb View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2022

  1. More typ corrections and build script bug fixes annotated in emsec#319

    @maxieds
    maxieds committed Jun 29, 2022
    Configuration menu
    Copy the full SHA
    688b494 View commit details
    Browse the repository at this point in the history

  2. fix typos

    @fptrs
    fptrs authored Jun 29, 2022
    Configuration menu
    Copy the full SHA
    40da00a View commit details
    Browse the repository at this point in the history

  3. add missing sources for ISO15693_SNIFF

    @fptrs
    fptrs authored Jun 29, 2022
    Configuration menu
    Copy the full SHA
    b6f4094 View commit details
    Browse the repository at this point in the history

  4. Updating the FLASH_DATA_ADDR value to the correct value for 6 slots (… 

    …versus standard 8)
    @maxieds
    maxieds committed Jun 29, 2022
    Configuration menu
    Copy the full SHA
    c3e1dab View commit details
    Browse the repository at this point in the history

  5. Merge branch 'DESFire-AuthISO-Patch' of https://github.com/maxieds/Ch… 

    …ameleonMini into DESFire-AuthISO-Patch
    @maxieds
    maxieds committed Jun 29, 2022
    Configuration menu
    Copy the full SHA
    cda26ee View commit details
    Browse the repository at this point in the history

  6. Update Log.py 

    change DESFire Generic Error decoder
    @fptrs
    fptrs authored Jun 29, 2022
    Configuration menu
    Copy the full SHA
    05eeda6 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2022

  1. Stashing DESFire updates before tinkering with saving space with PSTR… 

    … wrappers around the terminal command names
    @maxieds
    maxieds committed Jul 1, 2022
    Configuration menu
    Copy the full SHA
    807d4ac View commit details
    Browse the repository at this point in the history

  2. Stashing changes to DESFire code -- No PSTR wrappers on command names… 

    … as this doesn't change the ELF application size
    @maxieds
    maxieds committed Jul 1, 2022
    Configuration menu
    Copy the full SHA
    93e77a2 View commit details
    Browse the repository at this point in the history

  3. Several fixes to responsiveness and frozen behavior noted in PR emsec… 

    …#319
    @maxieds
    maxieds committed Jul 1, 2022
    Configuration menu
    Copy the full SHA
    bc8057b View commit details
    Browse the repository at this point in the history

  4. Merge branch 'DESFire-AuthISO-Patch' of https://github.com/maxieds/Ch… 

    …ameleonMini into DESFire-AuthISO-Patch
    @maxieds
    maxieds committed Jul 1, 2022
    Configuration menu
    Copy the full SHA
    37be68d View commit details
    Browse the repository at this point in the history