arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-15 20:39:17 +00:00
Code Issues Releases Wiki Activity

resolve merge conflicts with master

Browse Source
This commit is contained in:
Your Name 2023-03-08 21:06:11 +01:00
parent 6c653fa89d
commit db9debdd19
1 changed files with 31 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
OpenCL/m26610-pure.cl
View File

@ -335,12 +335,13 @@ KERNEL_FQ void m26610_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh
AES_GCM_Init (ukey, key_len, key, subKey, s_te0, s_te1, s_te2, s_te3, s_te4); AES_GCM_Init (ukey, key_len, key, subKey, s_te0, s_te1, s_te2, s_te3, s_te4);
// iv // iv
const u32 iv[4] = {
esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[0], u32 iv[4];
esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[1],
esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[2], iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[0];
esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[3] iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[1];
}; iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[2];
iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[3];
const u32 iv_len = esalt_bufs[DIGESTS_OFFSET_HOST].iv_len; const u32 iv_len = esalt_bufs[DIGESTS_OFFSET_HOST].iv_len;
@ -348,66 +349,42 @@ KERNEL_FQ void m26610_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh
AES_GCM_Prepare_J0 (iv, iv_len, subKey, J0); AES_GCM_Prepare_J0 (iv, iv_len, subKey, J0);
u32 ct[8] = { //ct
esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[0], //first block of ciphertext
esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[1],
esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[2],
esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[3],
esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[4], // second block of ciphertext
esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[5],
esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[6],
esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[7]
};
//if ((gid == 0) && (lid == 0)) printf("esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[3]=0x%08x\n", esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[3]);
//if ((gid == 0) && (lid == 0)) printf("esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[4]=0x%08x\n", esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[4]);
u32 pt[8] = { 0 }; u32 ct[4];
AES_GCM_decrypt (key, J0, ct, 32, pt, s_te0, s_te1, s_te2, s_te3, s_te4);
ct[0] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[0];
ct[1] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[1];
ct[2] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[2];
ct[3] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[3];
// TODO check entropy, but not sure what MAX_ENTROPY should be.. u32 pt[4] = { 0 };
//const float entropy = hc_get_entropy (pt, 8);
//printf("entropy=%f\n", entropy);
// we try to decrypt the ciphertext
// TODO this can be moved to a separate decryption function in inc_cipher_aes-gcm.cl
AES_GCM_inc32(J0); // the first ctr is used to compute the tag, only the second is used for decryption: https://en.wikipedia.org/wiki/Galois/Counter_Mode#/media/File:GCM-Galois_Counter_Mode_with_IV.svg
AES_GCM_GCTR (key, J0, ct, 16, pt, s_te0, s_te1, s_te2, s_te3, s_te4); // decrypt the ciphertext
// if ((gid == 0) && (lid == 0)) printf ("pt[0]=%08x\n", pt[0]); // should be 5b7b2274 or [{"type" // if ((gid == 0) && (lid == 0)) printf ("pt[0]=%08x\n", pt[0]); // should be 5b7b2274 or [{"type"
//if ((gid == 0) && (lid == 0)) printf ("pt[0]=%08x%08x\n", pt[4], pt[5]); // should be 2054726565222c22 or Tree","
// cast plaintext buffer to byte such that we can do a byte per byte comparison u32 digest[4];
PRIVATE_AS const u32 *u32OutBufPtr = (PRIVATE_AS u32 *) pt;
PRIVATE_AS const u8 *u8OutBufPtr = (PRIVATE_AS u8 *) u32OutBufPtr;
// the best comparison I can think of is checking each byte digest[0] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[0];
// whether it's ASCII, if so we're good, digest[1] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[1];
// if not, decryption was not successful digest[2] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[2];
bool correct = true; digest[3] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[3];
for(int i=0;i<32;i++)
{
if(u8OutBufPtr[i] >=0x20 && u8OutBufPtr[i] <= 0x7e) {
//if ((gid == 0) && (lid == 0)) printf("correct ASCII byte[%d]=0x%02x\n", i, u8OutBufPtr[i]);
}
else {
//if ((gid == 0) && (lid == 0)) printf("NOT correct! byte[%d]=0x%02x\n", i, u8OutBufPtr[i]);
correct = false;
break;
}
}
const u32 digest[4] =
{
esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[0],
esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[1],
esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[2],
esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[3],
};
//if ((gid == 0) && (lid == 0)) printf ("ct[0]=%08x\n", ct[0]); //if ((gid == 0) && (lid == 0)) printf ("ct[0]=%08x\n", ct[0]);
//if ((gid == 0) && (lid == 0)) printf ("ct[1]=%08x\n", ct[1]); //if ((gid == 0) && (lid == 0)) printf ("ct[1]=%08x\n", ct[1]);
//if ((gid == 0) && (lid == 0)) printf ("ct[2]=%08x\n", ct[2]); //if ((gid == 0) && (lid == 0)) printf ("ct[2]=%08x\n", ct[2]);
//if ((gid == 0) && (lid == 0)) printf ("ct[3]=%08x\n", ct[3]); //if ((gid == 0) && (lid == 0)) printf ("ct[3]=%08x\n", ct[3]);
if (correct) const int correct = is_valid_printable_32 (pt[0])
+ is_valid_printable_32 (pt[1])
+ is_valid_printable_32 (pt[2])
+ is_valid_printable_32 (pt[3]);
if (correct == 4)
{ {
int digest_pos = find_hash (digest, DIGESTS_CNT, &digests_buf[DIGESTS_OFFSET_HOST]); int digest_pos = find_hash (digest, DIGESTS_CNT, &digests_buf[DIGESTS_OFFSET_HOST]);