New format -m 13200 AxCrypt

This commit is contained in:
Fist0urs
2016-03-01 19:11:13 +01:00
parent eaaeac4aca
commit ad17fba9b6
9 changed files with 1497 additions and 5 deletions
+7
View File
@@ -363,6 +363,7 @@ extern hc_thread_mutex_t mux_display;
#define HT_12900 "Android FDE (Samsung DEK)"
#define HT_13000 "RAR5"
#define HT_13100 "Kerberos 5 TGS-REP etype 23"
#define HT_13200 "AxCrypt"
#define HT_00011 "Joomla < 2.5.18"
#define HT_00012 "PostgreSQL"
@@ -698,6 +699,8 @@ extern hc_thread_mutex_t mux_display;
#define DISPLAY_LEN_MAX_13000 1 + 4 + 1 + 2 + 1 + 32 + 1 + 2 + 1 + 32 + 1 + 1 + 1 + 16
#define DISPLAY_LEN_MIN_13100 1 + 7 + 1 + 2 + 1 + 0 + 0 + 32 + 1 + 64
#define DISPLAY_LEN_MAX_13100 1 + 7 + 1 + 2 + 1 + 2 + 512 + 1 + 32 + 1 + 20480
#define DISPLAY_LEN_MIN_13200 1 + 7 + 1 + 1 + 1 + 1 + 1 + 1 + 32 + 1 + 48
#define DISPLAY_LEN_MAX_13200 1 + 7 + 1 + 1 + 1 + 1 + 50 + 1 + 32 + 1 + 48 + 1 + 20480
#define DISPLAY_LEN_MIN_11 32 + 1 + 16
#define DISPLAY_LEN_MAX_11 32 + 1 + 32
@@ -958,6 +961,7 @@ extern hc_thread_mutex_t mux_display;
#define KERN_TYPE_ANDROIDFDE_SAMSUNG 12900
#define KERN_TYPE_RAR5 13000
#define KERN_TYPE_KRB5TGS 13100
#define KERN_TYPE_AXCRYPT 13200
/**
* signatures
@@ -1028,6 +1032,7 @@ extern hc_thread_mutex_t mux_display;
#define SIGNATURE_MS_DRSR "v1;PPH1_MD4"
#define SIGNATURE_RAR5 "$rar5$"
#define SIGNATURE_KRB5TGS "$krb5tgs$23"
#define SIGNATURE_AXCRYPT "$axcrypt$*1"
/**
* Default iteration numbers
@@ -1079,6 +1084,7 @@ extern hc_thread_mutex_t mux_display;
#define ROUNDS_MS_DRSR 100
#define ROUNDS_ANDROIDFDE_SAMSUNG 4096
#define ROUNDS_RAR5 (1 << 15)
#define ROUNDS_AXCRYPT 10000
/**
* salt types
@@ -1588,6 +1594,7 @@ int cf10_parse_hash (char *input_buf, uint input_len, hash_t *hash
int mywallet_parse_hash (char *input_buf, uint input_len, hash_t *hash_buf);
int ms_drsr_parse_hash (char *input_buf, uint input_len, hash_t *hash_buf);
int androidfde_samsung_parse_hash (char *input_buf, uint input_len, hash_t *hash_buf);
int axcrypt_parse_hash (char *input_buf, uint input_len, hash_t *hash_buf);
void load_kernel (const char *kernel_file, int num_devices, size_t *kernel_lengths, const u8 **kernel_sources);
void writeProgramBin (char *dst, u8 *binary, size_t binary_size);
+9
View File
@@ -587,6 +587,15 @@ typedef struct
} seven_zip_t;
typedef struct
{
u32 KEK[5];
u32 lsb[4];
u32 cipher[4];
} axcrypt_tmp_t;
typedef struct
{
u32 random[2];