From: Jens Steube Date: Thu, 14 Jan 2016 21:13:06 +0000 (+0100) Subject: Fix out of bounds access in -m 7500 X-Git-Tag: v3.00-beta~505 X-Git-Url: https://www.flypig.org.uk/git/?a=commitdiff_plain;h=ed91e69ae348540ff71d58a1d4d1097e0868b0a8;p=hashcat.git Fix out of bounds access in -m 7500 --- diff --git a/OpenCL/m07500_a0.cl b/OpenCL/m07500_a0.cl index 7ac4520..b972766 100644 --- a/OpenCL/m07500_a0.cl +++ b/OpenCL/m07500_a0.cl @@ -8,10 +8,10 @@ #include "include/constants.h" #include "include/kernel_vendor.h" -#define DGST_R0 3 -#define DGST_R1 7 +#define DGST_R0 0 +#define DGST_R1 1 #define DGST_R2 2 -#define DGST_R3 6 +#define DGST_R3 3 #include "include/kernel_functions.c" #include "OpenCL/types_ocl.c" diff --git a/OpenCL/m07500_a1.cl b/OpenCL/m07500_a1.cl index 271c09c..7bece5d 100644 --- a/OpenCL/m07500_a1.cl +++ b/OpenCL/m07500_a1.cl @@ -8,10 +8,10 @@ #include "include/constants.h" #include "include/kernel_vendor.h" -#define DGST_R0 3 -#define DGST_R1 7 +#define DGST_R0 0 +#define DGST_R1 1 #define DGST_R2 2 -#define DGST_R3 6 +#define DGST_R3 3 #include "include/kernel_functions.c" #include "OpenCL/types_ocl.c" diff --git a/OpenCL/m07500_a3.cl b/OpenCL/m07500_a3.cl index e093c08..3ee2ebc 100644 --- a/OpenCL/m07500_a3.cl +++ b/OpenCL/m07500_a3.cl @@ -8,10 +8,10 @@ #include "include/constants.h" #include "include/kernel_vendor.h" -#define DGST_R0 3 -#define DGST_R1 7 +#define DGST_R0 0 +#define DGST_R1 1 #define DGST_R2 2 -#define DGST_R3 6 +#define DGST_R3 3 #include "include/kernel_functions.c" #include "OpenCL/types_ocl.c" diff --git a/src/oclHashcat.c b/src/oclHashcat.c index 518e057..780b6f0 100644 --- a/src/oclHashcat.c +++ b/src/oclHashcat.c @@ -8813,10 +8813,10 @@ int main (int argc, char **argv) sort_by_digest = sort_by_digest_4_4; opti_type = OPTI_TYPE_ZERO_BYTE | OPTI_TYPE_NOT_ITERATED; - dgst_pos0 = 3; - dgst_pos1 = 7; + dgst_pos0 = 0; + dgst_pos1 = 1; dgst_pos2 = 2; - dgst_pos3 = 6; + dgst_pos3 = 3; break; case 7600: hash_type = HASH_TYPE_SHA1;