crewID/libfreefare
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #66 from janschiefer/master

Browse source 
Convenience function for PICC master key settings, apply 'free_create_delete_files' in MDAPP_SETTINGS()
This commit is contained in:
Romain Tartière 2017-06-29 09:22:58 +02:00 committed by GitHub
commit 5bd27a9d68
1 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
libfreefare/freefare.h
View file

@ -287,6 +287,21 @@ enum mifare_desfire_file_types {
#define MDCM_MACED 0x01 #define MDCM_MACED 0x01
#define MDCM_ENCIPHERED 0x03 #define MDCM_ENCIPHERED 0x03
/* Mifare DESFire master key settings
bit 7 - 4: Always 0.
bit 3: PICC master key settings frozen = 0 (WARNING - this is irreversible); PICC master key settings changeable when authenticated with PICC master key = 1
bit 2: PICC master key authentication required for creating or deleting applications = 0; Authentication not required = 1
bit 1: PICC master key authentication required for listing of applications or reading key settings = 0; Free listing of applications and reading key settings = 1
bit 0: PICC master key frozen (reversible with configuration change or when formatting card) = 0; PICC master key changeable = 1
*/
#define MDMK_SETTINGS(picc_master_key_settings_changeable,free_create_delete_application,free_listing_apps_and_key_settings,picc_master_key_changeable) ( \
(picc_master_key_settings_changeable << 3) | \
(free_create_delete_application << 2) | \
(free_listing_apps_and_key_settings << 1) | \
(picc_master_key_changeable) \
)
/* Mifare DESFire EV1 Application crypto operations */ /* Mifare DESFire EV1 Application crypto operations */
#define APPLICATION_CRYPTO_DES 0x00 #define APPLICATION_CRYPTO_DES 0x00
@ -304,11 +319,11 @@ enum mifare_desfire_file_types {
#define MDAPP_SETTINGS(key_no_for_key_changing,config_changeable,free_create_delete_files,free_listing_contents,app_master_key_changeable) ( \ #define MDAPP_SETTINGS(key_no_for_key_changing,config_changeable,free_create_delete_files,free_listing_contents,app_master_key_changeable) ( \
(key_no_for_key_changing << 4) | \ (key_no_for_key_changing << 4) | \
(config_changeable << 3) | \ (config_changeable << 3) | \
(free_create_delete_files << 2) | \
(free_listing_contents << 1) | \ (free_listing_contents << 1) | \
(app_master_key_changeable) \ (app_master_key_changeable) \
) )
/* Access right */ /* Access right */
#define MDAR(read,write,read_write,change_access_rights) ( \ #define MDAR(read,write,read_write,change_access_rights) ( \