Skip to content

Commit

Permalink
Removed old AES128 support with AVR libs in place of openssl/EVP ; Bu…
Browse files Browse the repository at this point in the history
…g fix for ISODES auth in the firmware to keep session IV state with multiple auths
  • Loading branch information
maxieds committed Jul 17, 2022
1 parent 3078e7f commit ccdc36e
Show file tree
Hide file tree
Showing 19 changed files with 174 additions and 949 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1709,11 +1709,11 @@ uint16_t DesfireCmdAuthenticate3KTDEA1(uint8_t *Buffer, uint16_t ByteCount) {
* in the event of an error.
*/
KeyId = Buffer[1];
if (!AuthenticatedWithPICCMasterKey && KeyId != DESFIRE_MASTER_KEY_ID) {
if (!Authenticated || !AuthenticatedWithPICCMasterKey) {
InvalidateAuthState(SelectedApp.Slot == DESFIRE_PICC_APP_SLOT);
} else if (KeyId != DESFIRE_MASTER_KEY_ID) {
Buffer[0] = STATUS_PERMISSION_DENIED;
return DESFIRE_STATUS_RESPONSE_SIZE;
} else {
InvalidateAuthState(SelectedApp.Slot == DESFIRE_PICC_APP_SLOT);
}

/* Validate number of keys: less than max */
Expand Down
2 changes: 1 addition & 1 deletion Firmware/Chameleon-Mini/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ clean: local-clean

git-add-dev: LOCALFW_SOURCE_FILES:=Makefile ./*.{c,h} ./*/*.{c,h} ./*/*/*.{c,h}
git-add-dev: LOCALFW_BUILD_SCRIPT_FILES:=.gitignore custom_build_targets.mk lufa_build_extra.mk
git-add-dev: TESTING_SOURCE_FILES:=Makefile LocalInclude/*.h Source/*.c Libs/ArduinoCryptoLib/* Libs/ArduinoCryptoLib/*/*.{c,h} SampleOutputDumps/*.dump
git-add-dev: TESTING_SOURCE_FILES:=Makefile LocalInclude/*.h Source/*.c SampleOutputDumps/*.dump
git-add-dev:
@make style && git add $(LOCALFW_SOURCE_FILES)
@cd $(BUILD_SCR) && git add -f $(LOCALFW_BUILD_SCRIPT_FILES)
Expand Down

This file was deleted.

275 changes: 0 additions & 275 deletions Software/DESFireLibNFCTesting/Libs/ArduinoCryptoLib/aes/aes-common.c

This file was deleted.

Loading

0 comments on commit ccdc36e

Please sign in to comment.