Merge pull request #311 from fgaudreault/master
Adding parser and basic kernels for -m 13500
This commit is contained in:
@@ -355,6 +355,7 @@ extern hc_thread_mutex_t mux_display;
|
||||
#define HT_13200 "AxCrypt"
|
||||
#define HT_13300 "AxCrypt in memory SHA1"
|
||||
#define HT_13400 "Keepass 1 (AES/Twofish) and Keepass 2 (AES)"
|
||||
#define HT_13500 "PeopleSoft PS_TOKEN"
|
||||
|
||||
#define HT_00011 "Joomla < 2.5.18"
|
||||
#define HT_00012 "PostgreSQL"
|
||||
@@ -697,6 +698,8 @@ extern hc_thread_mutex_t mux_display;
|
||||
#define DISPLAY_LEN_MAX_13300 1 + 12 + 1 + 40
|
||||
#define DISPLAY_LEN_MIN_13400 1 + 7 + 1 + 1 + 1 + 1 + 1 + 1 + 32 + 1 + 64 + 1 + 32 + 1 + 64 + 1 + 1 + 1 + 1
|
||||
#define DISPLAY_LEN_MAX_13400 1 + 7 + 1 + 1 + 10 + 1 + 3 + 1 + 64 + 1 + 64 + 1 + 32 + 1 + 64 + 1 + 4 + 1 + 600000 + 1 + 2 + 1 + 64
|
||||
#define DISPLAY_LEN_MIN_13500 40 + 1 + 32
|
||||
#define DISPLAY_LEN_MAX_13500 40 + 1 + 1024
|
||||
|
||||
#define DISPLAY_LEN_MIN_11 32 + 1 + 16
|
||||
#define DISPLAY_LEN_MAX_11 32 + 1 + 32
|
||||
@@ -1601,6 +1604,7 @@ int androidfde_samsung_parse_hash (char *input_buf, uint input_len, hash_t *hash
|
||||
int axcrypt_parse_hash (char *input_buf, uint input_len, hash_t *hash_buf);
|
||||
int sha1axcrypt_parse_hash (char *input_buf, uint input_len, hash_t *hash_buf);
|
||||
int keepass_parse_hash (char *input_buf, uint input_len, hash_t *hash_buf);
|
||||
int pstoken_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);
|
||||
|
||||
@@ -702,6 +702,13 @@ typedef struct
|
||||
|
||||
} psafe3_t;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
u32 salt_buf[128];
|
||||
u32 salt_len;
|
||||
|
||||
} pstoken_t;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
char plain_buf[256];
|
||||
|
||||
Reference in New Issue
Block a user