1
0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-22 08:08:10 +00:00

Fix a bug in the implementation of GOST R 34.11-94, zero length passwords were not cracked

This commit is contained in:
Jens Steube 2015-12-26 17:10:03 +01:00
parent bf5218c4dd
commit 0f906dcfeb
4 changed files with 64 additions and 42 deletions

View File

@ -850,14 +850,17 @@ __kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m06900_m04 (__glo
u32 tmp[8];
PASS0 (state, tmp, state_m, data_m, s_tables);
PASS2 (state, tmp, state_m, data_m, s_tables);
PASS4 (state, tmp, state_m, data_m, s_tables);
PASS6 (state, tmp, state_m, data_m, s_tables);
if (pw_len > 0)
{
PASS0 (state, tmp, state_m, data_m, s_tables);
PASS2 (state, tmp, state_m, data_m, s_tables);
PASS4 (state, tmp, state_m, data_m, s_tables);
PASS6 (state, tmp, state_m, data_m, s_tables);
SHIFT12 (state_m, data, tmp);
SHIFT16 (state, data_m, state_m);
SHIFT61 (state, data_m);
SHIFT12 (state_m, data, tmp);
SHIFT16 (state, data_m, state_m);
SHIFT61 (state, data_m);
}
data[0] = w14;
data[1] = 0;
@ -1121,14 +1124,17 @@ __kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m06900_s04 (__glo
u32 tmp[8];
PASS0 (state, tmp, state_m, data_m, s_tables);
PASS2 (state, tmp, state_m, data_m, s_tables);
PASS4 (state, tmp, state_m, data_m, s_tables);
PASS6 (state, tmp, state_m, data_m, s_tables);
if (pw_len > 0)
{
PASS0 (state, tmp, state_m, data_m, s_tables);
PASS2 (state, tmp, state_m, data_m, s_tables);
PASS4 (state, tmp, state_m, data_m, s_tables);
PASS6 (state, tmp, state_m, data_m, s_tables);
SHIFT12 (state_m, data, tmp);
SHIFT16 (state, data_m, state_m);
SHIFT61 (state, data_m);
SHIFT12 (state_m, data, tmp);
SHIFT16 (state, data_m, state_m);
SHIFT61 (state, data_m);
}
data[0] = w14;
data[1] = 0;

View File

@ -902,14 +902,17 @@ __kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m06900_m04 (__glo
u32 tmp[8];
PASS0 (state, tmp, state_m, data_m, s_tables);
PASS2 (state, tmp, state_m, data_m, s_tables);
PASS4 (state, tmp, state_m, data_m, s_tables);
PASS6 (state, tmp, state_m, data_m, s_tables);
if (pw_len > 0)
{
PASS0 (state, tmp, state_m, data_m, s_tables);
PASS2 (state, tmp, state_m, data_m, s_tables);
PASS4 (state, tmp, state_m, data_m, s_tables);
PASS6 (state, tmp, state_m, data_m, s_tables);
SHIFT12 (state_m, data, tmp);
SHIFT16 (state, data_m, state_m);
SHIFT61 (state, data_m);
SHIFT12 (state_m, data, tmp);
SHIFT16 (state, data_m, state_m);
SHIFT61 (state, data_m);
}
data[0] = w14;
data[1] = 0;
@ -1227,14 +1230,17 @@ __kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m06900_s04 (__glo
u32 tmp[8];
PASS0 (state, tmp, state_m, data_m, s_tables);
PASS2 (state, tmp, state_m, data_m, s_tables);
PASS4 (state, tmp, state_m, data_m, s_tables);
PASS6 (state, tmp, state_m, data_m, s_tables);
if (pw_len > 0)
{
PASS0 (state, tmp, state_m, data_m, s_tables);
PASS2 (state, tmp, state_m, data_m, s_tables);
PASS4 (state, tmp, state_m, data_m, s_tables);
PASS6 (state, tmp, state_m, data_m, s_tables);
SHIFT12 (state_m, data, tmp);
SHIFT16 (state, data_m, state_m);
SHIFT61 (state, data_m);
SHIFT12 (state_m, data, tmp);
SHIFT16 (state, data_m, state_m);
SHIFT61 (state, data_m);
}
data[0] = w14;
data[1] = 0;

View File

@ -775,14 +775,17 @@ static void m06900m (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_le
u32 tmp[8];
PASS0 (state, tmp, state_m, data_m, s_tables);
PASS2 (state, tmp, state_m, data_m, s_tables);
PASS4 (state, tmp, state_m, data_m, s_tables);
PASS6 (state, tmp, state_m, data_m, s_tables);
if (pw_len > 0)
{
PASS0 (state, tmp, state_m, data_m, s_tables);
PASS2 (state, tmp, state_m, data_m, s_tables);
PASS4 (state, tmp, state_m, data_m, s_tables);
PASS6 (state, tmp, state_m, data_m, s_tables);
SHIFT12 (state_m, data, tmp);
SHIFT16 (state, data_m, state_m);
SHIFT61 (state, data_m);
SHIFT12 (state_m, data, tmp);
SHIFT16 (state, data_m, state_m);
SHIFT61 (state, data_m);
}
data[0] = w14;
data[1] = 0;
@ -964,14 +967,17 @@ static void m06900s (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_le
u32 tmp[8];
PASS0 (state, tmp, state_m, data_m, s_tables);
PASS2 (state, tmp, state_m, data_m, s_tables);
PASS4 (state, tmp, state_m, data_m, s_tables);
PASS6 (state, tmp, state_m, data_m, s_tables);
if (pw_len > 0)
{
PASS0 (state, tmp, state_m, data_m, s_tables);
PASS2 (state, tmp, state_m, data_m, s_tables);
PASS4 (state, tmp, state_m, data_m, s_tables);
PASS6 (state, tmp, state_m, data_m, s_tables);
SHIFT12 (state_m, data, tmp);
SHIFT16 (state, data_m, state_m);
SHIFT61 (state, data_m);
SHIFT12 (state_m, data, tmp);
SHIFT16 (state, data_m, state_m);
SHIFT61 (state, data_m);
}
data[0] = w14;
data[1] = 0;

View File

@ -19,6 +19,10 @@ File.: Host
Desc.: Fixed a bug in combination of --restore and a user immediately aborting the session after restart
Trac.: 684
Type.: Bug
File.: Kernel
Desc.: Fix a bug in the implementation of GOST R 34.11-94, zero length passwords were not cracked
* changes v2.00 -> v2.01:
Type.: Bug