mirror of
https://github.com/hashcat/hashcat
synced 2024-11-20 23:27:31 +01:00
updated m17200 to be cuda compatible
This commit is contained in:
Sein Coray
parent
ff718cf53f
commit
b29019ae75
@ -87,6 +87,7 @@ Related publication: https://scitepress.org/PublicationsDetail.aspx?ID=KLPzPqStp
|
||||
|
||||
#include "inc_vendor.h"
|
||||
#include "inc_types.h"
|
||||
#include "inc_platform.cl"
|
||||
#include "inc_common.cl"
|
||||
#include "inc_simd.cl"
|
||||
#include "inc_rp.h"
|
||||
@ -131,7 +132,7 @@ struct pkzip_hash
|
||||
u32 data_length;
|
||||
u16 checksum_from_crc;
|
||||
u16 checksum_from_timestamp;
|
||||
u8 data[MAX_DATA];
|
||||
u32 data[MAX_DATA];
|
||||
|
||||
} __attribute__((packed));
|
||||
|
||||
@ -231,7 +232,7 @@ typedef struct
|
||||
|
||||
} code;
|
||||
|
||||
CONSTANT_AS code lenfix[512] = {
|
||||
CONSTANT_VK code lenfix[512] = {
|
||||
{96,7,0},{0,8,80},{0,8,16},{20,8,115},{18,7,31},{0,8,112},{0,8,48},
|
||||
{0,9,192},{16,7,10},{0,8,96},{0,8,32},{0,9,160},{0,8,0},{0,8,128},
|
||||
{0,8,64},{0,9,224},{16,7,6},{0,8,88},{0,8,24},{0,9,144},{19,7,59},
|
||||
@ -308,7 +309,7 @@ CONSTANT_AS code lenfix[512] = {
|
||||
{0,9,255}
|
||||
};
|
||||
|
||||
CONSTANT_AS code distfix[32] = {
|
||||
CONSTANT_VK code distfix[32] = {
|
||||
{16,5,1},{23,5,257},{19,5,17},{27,5,4097},{17,5,5},{25,5,1025},
|
||||
{21,5,65},{29,5,16385},{16,5,3},{24,5,513},{20,5,33},{28,5,8193},
|
||||
{18,5,9},{26,5,2049},{22,5,129},{64,5,0},{16,5,2},{23,5,385},
|
||||
@ -528,7 +529,7 @@ DECLSPEC int check_inflate_code1 (u8 *next, int left)
|
||||
}
|
||||
}
|
||||
|
||||
__kernel void m17200_sxx (KERN_ATTR_RULES_ESALT (pkzip_t))
|
||||
KERNEL_FQ void m17200_sxx (KERN_ATTR_RULES_ESALT (pkzip_t))
|
||||
{
|
||||
/**
|
||||
* modifier
|
||||
@ -542,25 +543,23 @@ __kernel void m17200_sxx (KERN_ATTR_RULES_ESALT (pkzip_t))
|
||||
* sbox, kbox
|
||||
*/
|
||||
|
||||
LOCAL_AS u32 l_crc32tab[256];
|
||||
LOCAL_VK u32 l_crc32tab[256];
|
||||
|
||||
for (u64 i = lid; i < 256; i += lsz)
|
||||
{
|
||||
l_crc32tab[i] = crc32tab[i];
|
||||
}
|
||||
|
||||
barrier (CLK_LOCAL_MEM_FENCE);
|
||||
SYNC_THREADS();
|
||||
|
||||
__global u32 *data_ptr = (__global u32 *) esalt_bufs[digests_offset].hash.data;
|
||||
|
||||
LOCAL_AS u32 l_data[MAX_LOCAL];
|
||||
LOCAL_VK u32 l_data[MAX_LOCAL];
|
||||
|
||||
for (u64 i = lid; i < MAX_LOCAL; i += lsz)
|
||||
{
|
||||
l_data[i] = data_ptr[i];
|
||||
l_data[i] = esalt_bufs[digests_offset].hash.data[i];
|
||||
}
|
||||
|
||||
barrier (CLK_LOCAL_MEM_FENCE);
|
||||
SYNC_THREADS();
|
||||
|
||||
if (gid >= gid_max) return;
|
||||
|
||||
@ -734,8 +733,8 @@ __kernel void m17200_sxx (KERN_ATTR_RULES_ESALT (pkzip_t))
|
||||
inflate_state pStream;
|
||||
|
||||
infstream.opaque = Z_NULL;
|
||||
infstream.avail_in = esalt_bufs[digests_offset].hash.data_length - 12; // size of input
|
||||
infstream.next_in = esalt_bufs[digests_offset].hash.data + 12; // input char array
|
||||
infstream.avail_in = esalt_bufs[digests_offset].hash.data_length - 12; // size of input
|
||||
infstream.next_in = (GLOBAL_AS u8 *) esalt_bufs[digests_offset].hash.data + 12; // input char array
|
||||
infstream.avail_out = TMPSIZ; // size of output
|
||||
infstream.next_out = tmp; // output char array
|
||||
|
||||
@ -768,7 +767,7 @@ __kernel void m17200_sxx (KERN_ATTR_RULES_ESALT (pkzip_t))
|
||||
}
|
||||
}
|
||||
|
||||
__kernel void m17200_mxx (KERN_ATTR_RULES_ESALT (pkzip_t))
|
||||
KERNEL_FQ void m17200_mxx (KERN_ATTR_RULES_ESALT (pkzip_t))
|
||||
{
|
||||
/**
|
||||
* modifier
|
||||
@ -782,25 +781,23 @@ __kernel void m17200_mxx (KERN_ATTR_RULES_ESALT (pkzip_t))
|
||||
* sbox, kbox
|
||||
*/
|
||||
|
||||
LOCAL_AS u32 l_crc32tab[256];
|
||||
LOCAL_VK u32 l_crc32tab[256];
|
||||
|
||||
for (u64 i = lid; i < 256; i += lsz)
|
||||
{
|
||||
l_crc32tab[i] = crc32tab[i];
|
||||
}
|
||||
|
||||
barrier (CLK_LOCAL_MEM_FENCE);
|
||||
SYNC_THREADS();
|
||||
|
||||
__global u32 *data_ptr = (__global u32 *) esalt_bufs[digests_offset].hash.data;
|
||||
|
||||
LOCAL_AS u32 l_data[MAX_LOCAL];
|
||||
LOCAL_VK u32 l_data[MAX_LOCAL];
|
||||
|
||||
for (u64 i = lid; i < MAX_LOCAL; i += lsz)
|
||||
{
|
||||
l_data[i] = data_ptr[i];
|
||||
l_data[i] = esalt_bufs[digests_offset].hash.data[i];
|
||||
}
|
||||
|
||||
barrier (CLK_LOCAL_MEM_FENCE);
|
||||
SYNC_THREADS();
|
||||
|
||||
if (gid >= gid_max) return;
|
||||
|
||||
@ -962,8 +959,8 @@ __kernel void m17200_mxx (KERN_ATTR_RULES_ESALT (pkzip_t))
|
||||
inflate_state pStream;
|
||||
|
||||
infstream.opaque = Z_NULL;
|
||||
infstream.avail_in = esalt_bufs[digests_offset].hash.data_length - 12; // size of input
|
||||
infstream.next_in = esalt_bufs[digests_offset].hash.data + 12; // input char array
|
||||
infstream.avail_in = esalt_bufs[digests_offset].hash.data_length - 12; // size of input
|
||||
infstream.next_in = (GLOBAL_AS u8 *) esalt_bufs[digests_offset].hash.data + 12; // input char array
|
||||
infstream.avail_out = TMPSIZ; // size of output
|
||||
infstream.next_out = tmp; // output char array
|
||||
|
||||
|
||||
@ -87,6 +87,7 @@ Related publication: https://scitepress.org/PublicationsDetail.aspx?ID=KLPzPqStp
|
||||
|
||||
#include "inc_vendor.h"
|
||||
#include "inc_types.h"
|
||||
#include "inc_platform.cl"
|
||||
#include "inc_common.cl"
|
||||
#include "inc_simd.cl"
|
||||
|
||||
@ -129,7 +130,7 @@ struct pkzip_hash
|
||||
u32 data_length;
|
||||
u16 checksum_from_crc;
|
||||
u16 checksum_from_timestamp;
|
||||
u8 data[MAX_DATA];
|
||||
u32 data[MAX_DATA];
|
||||
|
||||
} __attribute__((packed));
|
||||
|
||||
@ -229,7 +230,7 @@ typedef struct
|
||||
|
||||
} code;
|
||||
|
||||
CONSTANT_AS code lenfix[512] = {
|
||||
CONSTANT_VK code lenfix[512] = {
|
||||
{96,7,0},{0,8,80},{0,8,16},{20,8,115},{18,7,31},{0,8,112},{0,8,48},
|
||||
{0,9,192},{16,7,10},{0,8,96},{0,8,32},{0,9,160},{0,8,0},{0,8,128},
|
||||
{0,8,64},{0,9,224},{16,7,6},{0,8,88},{0,8,24},{0,9,144},{19,7,59},
|
||||
@ -306,7 +307,7 @@ CONSTANT_AS code lenfix[512] = {
|
||||
{0,9,255}
|
||||
};
|
||||
|
||||
CONSTANT_AS code distfix[32] = {
|
||||
CONSTANT_VK code distfix[32] = {
|
||||
{16,5,1},{23,5,257},{19,5,17},{27,5,4097},{17,5,5},{25,5,1025},
|
||||
{21,5,65},{29,5,16385},{16,5,3},{24,5,513},{20,5,33},{28,5,8193},
|
||||
{18,5,9},{26,5,2049},{22,5,129},{64,5,0},{16,5,2},{23,5,385},
|
||||
@ -526,7 +527,7 @@ DECLSPEC int check_inflate_code1 (u8 *next, int left)
|
||||
}
|
||||
}
|
||||
|
||||
__kernel void m17200_sxx (KERN_ATTR_ESALT (pkzip_t))
|
||||
KERNEL_FQ void m17200_sxx (KERN_ATTR_ESALT (pkzip_t))
|
||||
{
|
||||
/**
|
||||
* modifier
|
||||
@ -540,25 +541,23 @@ __kernel void m17200_sxx (KERN_ATTR_ESALT (pkzip_t))
|
||||
* sbox, kbox
|
||||
*/
|
||||
|
||||
LOCAL_AS u32 l_crc32tab[256];
|
||||
LOCAL_VK u32 l_crc32tab[256];
|
||||
|
||||
for (u64 i = lid; i < 256; i += lsz)
|
||||
{
|
||||
l_crc32tab[i] = crc32tab[i];
|
||||
}
|
||||
|
||||
barrier (CLK_LOCAL_MEM_FENCE);
|
||||
SYNC_THREADS();
|
||||
|
||||
__global u32 *data_ptr = (__global u32 *) esalt_bufs[digests_offset].hash.data;
|
||||
|
||||
LOCAL_AS u32 l_data[MAX_LOCAL];
|
||||
LOCAL_VK u32 l_data[MAX_LOCAL];
|
||||
|
||||
for (u64 i = lid; i < MAX_LOCAL; i += lsz)
|
||||
{
|
||||
l_data[i] = data_ptr[i];
|
||||
l_data[i] = esalt_bufs[digests_offset].hash.data[i];
|
||||
}
|
||||
|
||||
barrier (CLK_LOCAL_MEM_FENCE);
|
||||
SYNC_THREADS();
|
||||
|
||||
if (gid >= gid_max) return;
|
||||
|
||||
@ -736,8 +735,8 @@ __kernel void m17200_sxx (KERN_ATTR_ESALT (pkzip_t))
|
||||
inflate_state pStream;
|
||||
|
||||
infstream.opaque = Z_NULL;
|
||||
infstream.avail_in = esalt_bufs[digests_offset].hash.data_length - 12; // size of input
|
||||
infstream.next_in = esalt_bufs[digests_offset].hash.data + 12; // input char array
|
||||
infstream.avail_in = esalt_bufs[digests_offset].hash.data_length - 12; // size of input
|
||||
infstream.next_in = (GLOBAL_AS u8 *) esalt_bufs[digests_offset].hash.data + 12; // input char array
|
||||
infstream.avail_out = TMPSIZ; // size of output
|
||||
infstream.next_out = tmp; // output char array
|
||||
|
||||
@ -770,7 +769,7 @@ __kernel void m17200_sxx (KERN_ATTR_ESALT (pkzip_t))
|
||||
}
|
||||
}
|
||||
|
||||
__kernel void m17200_mxx (KERN_ATTR_ESALT (pkzip_t))
|
||||
KERNEL_FQ void m17200_mxx (KERN_ATTR_ESALT (pkzip_t))
|
||||
{
|
||||
/**
|
||||
* modifier
|
||||
@ -784,25 +783,23 @@ __kernel void m17200_mxx (KERN_ATTR_ESALT (pkzip_t))
|
||||
* sbox, kbox
|
||||
*/
|
||||
|
||||
LOCAL_AS u32 l_crc32tab[256];
|
||||
LOCAL_VK u32 l_crc32tab[256];
|
||||
|
||||
for (u64 i = lid; i < 256; i += lsz)
|
||||
{
|
||||
l_crc32tab[i] = crc32tab[i];
|
||||
}
|
||||
|
||||
barrier (CLK_LOCAL_MEM_FENCE);
|
||||
SYNC_THREADS();
|
||||
|
||||
__global u32 *data_ptr = (__global u32 *) esalt_bufs[digests_offset].hash.data;
|
||||
|
||||
LOCAL_AS u32 l_data[MAX_LOCAL];
|
||||
LOCAL_VK u32 l_data[MAX_LOCAL];
|
||||
|
||||
for (u64 i = lid; i < MAX_LOCAL; i += lsz)
|
||||
{
|
||||
l_data[i] = data_ptr[i];
|
||||
l_data[i] = esalt_bufs[digests_offset].hash.data[i];
|
||||
}
|
||||
|
||||
barrier (CLK_LOCAL_MEM_FENCE);
|
||||
SYNC_THREADS();
|
||||
|
||||
if (gid >= gid_max) return;
|
||||
|
||||
@ -968,8 +965,8 @@ __kernel void m17200_mxx (KERN_ATTR_ESALT (pkzip_t))
|
||||
inflate_state pStream;
|
||||
|
||||
infstream.opaque = Z_NULL;
|
||||
infstream.avail_in = esalt_bufs[digests_offset].hash.data_length - 12; // size of input
|
||||
infstream.next_in = esalt_bufs[digests_offset].hash.data + 12; // input char array
|
||||
infstream.avail_in = esalt_bufs[digests_offset].hash.data_length - 12; // size of input
|
||||
infstream.next_in = (GLOBAL_AS u8 *) esalt_bufs[digests_offset].hash.data + 12; // input char array
|
||||
infstream.avail_out = TMPSIZ; // size of output
|
||||
infstream.next_out = tmp; // output char array
|
||||
|
||||
|
||||
@ -87,6 +87,7 @@ Related publication: https://scitepress.org/PublicationsDetail.aspx?ID=KLPzPqStp
|
||||
|
||||
#include "inc_vendor.h"
|
||||
#include "inc_types.h"
|
||||
#include "inc_platform.cl"
|
||||
#include "inc_common.cl"
|
||||
#include "inc_simd.cl"
|
||||
|
||||
@ -129,7 +130,7 @@ struct pkzip_hash
|
||||
u32 data_length;
|
||||
u16 checksum_from_crc;
|
||||
u16 checksum_from_timestamp;
|
||||
u8 data[MAX_DATA];
|
||||
u32 data[MAX_DATA];
|
||||
|
||||
} __attribute__((packed));
|
||||
|
||||
@ -229,7 +230,7 @@ typedef struct
|
||||
|
||||
} code;
|
||||
|
||||
CONSTANT_AS code lenfix[512] =
|
||||
CONSTANT_VK code lenfix[512] =
|
||||
{
|
||||
{96,7,0},{0,8,80},{0,8,16},{20,8,115},{18,7,31},{0,8,112},{0,8,48},
|
||||
{0,9,192},{16,7,10},{0,8,96},{0,8,32},{0,9,160},{0,8,0},{0,8,128},
|
||||
@ -307,7 +308,7 @@ CONSTANT_AS code lenfix[512] =
|
||||
{0,9,255}
|
||||
};
|
||||
|
||||
CONSTANT_AS code distfix[32] =
|
||||
CONSTANT_VK code distfix[32] =
|
||||
{
|
||||
{16,5,1},{23,5,257},{19,5,17},{27,5,4097},{17,5,5},{25,5,1025},
|
||||
{21,5,65},{29,5,16385},{16,5,3},{24,5,513},{20,5,33},{28,5,8193},
|
||||
@ -527,7 +528,7 @@ DECLSPEC int check_inflate_code1 (u8 *next, int left)
|
||||
}
|
||||
}
|
||||
|
||||
__kernel void m17200_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t))
|
||||
KERNEL_FQ void m17200_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t))
|
||||
{
|
||||
/**
|
||||
* modifier
|
||||
@ -541,25 +542,23 @@ __kernel void m17200_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t))
|
||||
* sbox, kbox
|
||||
*/
|
||||
|
||||
LOCAL_AS u32 l_crc32tab[256];
|
||||
LOCAL_VK u32 l_crc32tab[256];
|
||||
|
||||
for (u64 i = lid; i < 256; i += lsz)
|
||||
{
|
||||
l_crc32tab[i] = crc32tab[i];
|
||||
}
|
||||
|
||||
barrier (CLK_LOCAL_MEM_FENCE);
|
||||
SYNC_THREADS();
|
||||
|
||||
__global u32 *data_ptr = (__global u32 *) esalt_bufs[digests_offset].hash.data;
|
||||
|
||||
LOCAL_AS u32 l_data[MAX_LOCAL];
|
||||
LOCAL_VK u32 l_data[MAX_LOCAL];
|
||||
|
||||
for (u64 i = lid; i < MAX_LOCAL; i += lsz)
|
||||
{
|
||||
l_data[i] = data_ptr[i];
|
||||
l_data[i] = esalt_bufs[digests_offset].hash.data[i];
|
||||
}
|
||||
|
||||
barrier (CLK_LOCAL_MEM_FENCE);
|
||||
SYNC_THREADS();
|
||||
|
||||
if (gid >= gid_max) return;
|
||||
|
||||
@ -749,8 +748,8 @@ __kernel void m17200_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t))
|
||||
inflate_state pStream;
|
||||
|
||||
infstream.opaque = Z_NULL;
|
||||
infstream.avail_in = esalt_bufs[digests_offset].hash.data_length - 12; // size of input
|
||||
infstream.next_in = esalt_bufs[digests_offset].hash.data + 12; // input char array
|
||||
infstream.avail_in = esalt_bufs[digests_offset].hash.data_length - 12; // size of input
|
||||
infstream.next_in = (GLOBAL_AS u8 *) esalt_bufs[digests_offset].hash.data + 12; // input char array
|
||||
infstream.avail_out = TMPSIZ; // size of output
|
||||
infstream.next_out = tmp; // output char array
|
||||
|
||||
@ -783,7 +782,7 @@ __kernel void m17200_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t))
|
||||
}
|
||||
}
|
||||
|
||||
__kernel void m17200_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t))
|
||||
KERNEL_FQ void m17200_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t))
|
||||
{
|
||||
/**
|
||||
* modifier
|
||||
@ -797,25 +796,23 @@ __kernel void m17200_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t))
|
||||
* sbox, kbox
|
||||
*/
|
||||
|
||||
LOCAL_AS u32 l_crc32tab[256];
|
||||
LOCAL_VK u32 l_crc32tab[256];
|
||||
|
||||
for (u64 i = lid; i < 256; i += lsz)
|
||||
{
|
||||
l_crc32tab[i] = crc32tab[i];
|
||||
}
|
||||
|
||||
barrier (CLK_LOCAL_MEM_FENCE);
|
||||
SYNC_THREADS();
|
||||
|
||||
__global u32 *data_ptr = (__global u32 *) esalt_bufs[digests_offset].hash.data;
|
||||
|
||||
LOCAL_AS u32 l_data[MAX_LOCAL];
|
||||
LOCAL_VK u32 l_data[MAX_LOCAL];
|
||||
|
||||
for (u64 i = lid; i < MAX_LOCAL; i += lsz)
|
||||
{
|
||||
l_data[i] = data_ptr[i];
|
||||
l_data[i] = esalt_bufs[digests_offset].hash.data[i];
|
||||
}
|
||||
|
||||
barrier (CLK_LOCAL_MEM_FENCE);
|
||||
SYNC_THREADS();
|
||||
|
||||
if (gid >= gid_max) return;
|
||||
|
||||
@ -993,8 +990,8 @@ __kernel void m17200_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t))
|
||||
inflate_state pStream;
|
||||
|
||||
infstream.opaque = Z_NULL;
|
||||
infstream.avail_in = esalt_bufs[digests_offset].hash.data_length - 12; // size of input
|
||||
infstream.next_in = esalt_bufs[digests_offset].hash.data + 12; // input char array
|
||||
infstream.avail_in = esalt_bufs[digests_offset].hash.data_length - 12; // size of input
|
||||
infstream.next_in = (GLOBAL_AS u8 *) esalt_bufs[digests_offset].hash.data + 12; // input char array
|
||||
infstream.avail_out = TMPSIZ; // size of output
|
||||
infstream.next_out = tmp; // output char array
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user