mirror of
https://github.com/hashcat/hashcat.git
synced 2025-01-25 15:10:58 +00:00
Fix some formating in -m 600
This commit is contained in:
parent
583849cd23
commit
b4c3df876c
@ -82,7 +82,7 @@ void blake2b_transform(u64x h[8], u64x t[2], u64x f[2], u64x m[16], u64x v[16],
|
||||
v[14] = BLAKE2B_IV_06 ^ f[0];
|
||||
v[15] = BLAKE2B_IV_07 ^ f[1];
|
||||
|
||||
const u8a blake2b_sigma[12][16] =
|
||||
const int blake2b_sigma[12][16] =
|
||||
{
|
||||
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 } ,
|
||||
{ 14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3 } ,
|
||||
@ -111,14 +111,14 @@ void blake2b_transform(u64x h[8], u64x t[2], u64x f[2], u64x m[16], u64x v[16],
|
||||
BLAKE2B_ROUND (10);
|
||||
BLAKE2B_ROUND (11);
|
||||
|
||||
h[0] = h[0] ^ v[0] ^ v[ 8];
|
||||
h[1] = h[1] ^ v[1] ^ v[ 9];
|
||||
h[2] = h[2] ^ v[2] ^ v[10];
|
||||
h[3] = h[3] ^ v[3] ^ v[11];
|
||||
h[4] = h[4] ^ v[4] ^ v[12];
|
||||
h[5] = h[5] ^ v[5] ^ v[13];
|
||||
h[6] = h[6] ^ v[6] ^ v[14];
|
||||
h[7] = h[7] ^ v[7] ^ v[15];
|
||||
h[0] = h[0] ^ v[0] ^ v[ 8];
|
||||
h[1] = h[1] ^ v[1] ^ v[ 9];
|
||||
h[2] = h[2] ^ v[2] ^ v[10];
|
||||
h[3] = h[3] ^ v[3] ^ v[11];
|
||||
h[4] = h[4] ^ v[4] ^ v[12];
|
||||
h[5] = h[5] ^ v[5] ^ v[13];
|
||||
h[6] = h[6] ^ v[6] ^ v[14];
|
||||
h[7] = h[7] ^ v[7] ^ v[15];
|
||||
}
|
||||
|
||||
__kernel void m00600_m04 (__global pw_t *pws, __constant const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global const blake2_t *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u64 gid_max)
|
||||
|
@ -82,7 +82,7 @@ void blake2b_transform(u64x h[8], u64x t[2], u64x f[2], u64x m[16], u64x v[16],
|
||||
v[14] = BLAKE2B_IV_06 ^ f[0];
|
||||
v[15] = BLAKE2B_IV_07 ^ f[1];
|
||||
|
||||
const u8 blake2b_sigma[12][16] =
|
||||
const int blake2b_sigma[12][16] =
|
||||
{
|
||||
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 } ,
|
||||
{ 14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3 } ,
|
||||
@ -111,14 +111,14 @@ void blake2b_transform(u64x h[8], u64x t[2], u64x f[2], u64x m[16], u64x v[16],
|
||||
BLAKE2B_ROUND (10);
|
||||
BLAKE2B_ROUND (11);
|
||||
|
||||
h[0] = h[0] ^ v[0] ^ v[ 8];
|
||||
h[1] = h[1] ^ v[1] ^ v[ 9];
|
||||
h[2] = h[2] ^ v[2] ^ v[10];
|
||||
h[3] = h[3] ^ v[3] ^ v[11];
|
||||
h[4] = h[4] ^ v[4] ^ v[12];
|
||||
h[5] = h[5] ^ v[5] ^ v[13];
|
||||
h[6] = h[6] ^ v[6] ^ v[14];
|
||||
h[7] = h[7] ^ v[7] ^ v[15];
|
||||
h[0] = h[0] ^ v[0] ^ v[ 8];
|
||||
h[1] = h[1] ^ v[1] ^ v[ 9];
|
||||
h[2] = h[2] ^ v[2] ^ v[10];
|
||||
h[3] = h[3] ^ v[3] ^ v[11];
|
||||
h[4] = h[4] ^ v[4] ^ v[12];
|
||||
h[5] = h[5] ^ v[5] ^ v[13];
|
||||
h[6] = h[6] ^ v[6] ^ v[14];
|
||||
h[7] = h[7] ^ v[7] ^ v[15];
|
||||
}
|
||||
|
||||
__kernel void m00600_m04 (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global const blake2_t *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u64 gid_max)
|
||||
|
@ -10,7 +10,7 @@
|
||||
#include "inc_hash_functions.cl"
|
||||
#include "inc_types.cl"
|
||||
#include "inc_common.cl"
|
||||
#include "inc_simd.cl"
|
||||
#include "inc_simd.cl",
|
||||
|
||||
#define BLAKE2B_FINAL 1
|
||||
#define BLAKE2B_UPDATE 0
|
||||
@ -80,7 +80,7 @@ void blake2b_transform(u64x h[8], u64x t[2], u64x f[2], u64x m[16], u64x v[16],
|
||||
v[14] = BLAKE2B_IV_06 ^ f[0];
|
||||
v[15] = BLAKE2B_IV_07 ^ f[1];
|
||||
|
||||
const u8 blake2b_sigma[12][16] =
|
||||
const int blake2b_sigma[12][16] =
|
||||
{
|
||||
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 } ,
|
||||
{ 14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3 } ,
|
||||
@ -109,14 +109,14 @@ void blake2b_transform(u64x h[8], u64x t[2], u64x f[2], u64x m[16], u64x v[16],
|
||||
BLAKE2B_ROUND (10);
|
||||
BLAKE2B_ROUND (11);
|
||||
|
||||
h[0] = h[0] ^ v[0] ^ v[ 8];
|
||||
h[1] = h[1] ^ v[1] ^ v[ 9];
|
||||
h[2] = h[2] ^ v[2] ^ v[10];
|
||||
h[3] = h[3] ^ v[3] ^ v[11];
|
||||
h[4] = h[4] ^ v[4] ^ v[12];
|
||||
h[5] = h[5] ^ v[5] ^ v[13];
|
||||
h[6] = h[6] ^ v[6] ^ v[14];
|
||||
h[7] = h[7] ^ v[7] ^ v[15];
|
||||
h[0] = h[0] ^ v[0] ^ v[ 8];
|
||||
h[1] = h[1] ^ v[1] ^ v[ 9];
|
||||
h[2] = h[2] ^ v[2] ^ v[10];
|
||||
h[3] = h[3] ^ v[3] ^ v[11];
|
||||
h[4] = h[4] ^ v[4] ^ v[12];
|
||||
h[5] = h[5] ^ v[5] ^ v[13];
|
||||
h[6] = h[6] ^ v[6] ^ v[14];
|
||||
h[7] = h[7] ^ v[7] ^ v[15];
|
||||
}
|
||||
|
||||
__kernel void m00600_m04 (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __constant const u32x *words_buf_r, __global void *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global const blake2_t *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u64 gid_max)
|
||||
|
Loading…
Reference in New Issue
Block a user