projects
/
proxmark3-svn
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CHG: adjusted two arrays in scripting.c to mirror the added models in reveng 1.4.0
[proxmark3-svn]
/
common
/
desfire.h
diff --git
a/common/desfire.h
b/common/desfire.h
index 912ca9ffe04c4c4d240a1b8d14b98900928de898..423436383535c601610e72489aea0524a921c91d 100644
(file)
--- a/
common/desfire.h
+++ b/
common/desfire.h
@@
-1,9
+1,9
@@
#ifndef __DESFIRE_H
#define __DESFIRE_H
#ifndef __DESFIRE_H
#define __DESFIRE_H
+#include <string.h>
+#include <stdarg.h>
#include "aes.h"
#include "aes.h"
-#define DESFIRE(tag) ((struct desfire_tag *) tag)
-#define DESFIRE_KEY(key) ((struct desfire_key *) key)
#define MAX_CRYPTO_BLOCK_SIZE 16
/* Mifare DESFire EV1 Application crypto operations */
#define MAX_CRYPTO_BLOCK_SIZE 16
/* Mifare DESFire EV1 Application crypto operations */
@@
-65,8
+65,9
@@
enum DESFIRE_CRYPTOALGO {
T_AES = 0x03
};
T_AES = 0x03
};
-struct desfire_key {
+#define DESFIRE_KEY(key) ((struct desfire_key *) key)
+struct desfire_key {
enum DESFIRE_CRYPTOALGO type;
uint8_t data[24];
// DES_key_schedule ks1;
enum DESFIRE_CRYPTOALGO type;
uint8_t data[24];
// DES_key_schedule ks1;
@@
-77,9
+78,9
@@
struct desfire_key {
uint8_t cmac_sk2[24];
uint8_t aes_version;
};
uint8_t cmac_sk2[24];
uint8_t aes_version;
};
-
typedef struct desfire_key *desfirekey_t;
typedef struct desfire_key *desfirekey_t;
+#define DESFIRE(tag) ((struct desfire_tag *) tag)
struct desfire_tag {
iso14a_card_select_t info;
int active;
struct desfire_tag {
iso14a_card_select_t info;
int active;
@@
-108,8
+109,6
@@
enum DESFIRE_FILE_TYPES {
MDFT_CYCLIC_RECORD_FILE_WITH_BACKUP = 0x04
};
MDFT_CYCLIC_RECORD_FILE_WITH_BACKUP = 0x04
};
-
-
enum DESFIRE_STATUS {
OPERATION_OK = 0x00,
NO_CHANGES = 0x0c,
enum DESFIRE_STATUS {
OPERATION_OK = 0x00,
NO_CHANGES = 0x0c,
Impressum
,
Datenschutz