X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/bde10a5057cb280e5f08365502ec4a3f79301863..0b0b182fe26cf7b94eb8480ef1d4a674981491b8:/include/hitag2.h diff --git a/include/hitag2.h b/include/hitag2.h index 713c2cb8..7bd71bf8 100644 --- a/include/hitag2.h +++ b/include/hitag2.h @@ -7,15 +7,21 @@ //----------------------------------------------------------------------------- // Hitag2 type prototyping //----------------------------------------------------------------------------- +// HitagS added +//----------------------------------------------------------------------------- #ifndef _HITAG2_H_ #define _HITAG2_H_ typedef enum { + RHTSF_CHALLENGE = 01, + RHTSF_KEY = 02, + WHTSF_CHALLENGE = 03, + WHTSF_KEY = 04, RHT2F_PASSWORD = 21, RHT2F_AUTHENTICATE = 22, - RHT2F_CRYPTO = 23, - RHT2F_TEST_AUTH_ATTEMPTS = 25, + RHT2F_CRYPTO = 23, + RHT2F_TEST_AUTH_ATTEMPTS = 25, } hitag_function; typedef struct { @@ -24,16 +30,18 @@ typedef struct { typedef struct { byte_t NrAr[8]; + byte_t data[4]; } PACKED rht2d_authenticate; typedef struct { - byte_t key[4]; + byte_t key[6]; + byte_t data[4]; } PACKED rht2d_crypto; typedef union { rht2d_password pwd; rht2d_authenticate auth; - rht2d_crypto crypto; + rht2d_crypto crypto; } hitag_data; #endif