mirror of
https://github.com/hashcat/hashcat.git
synced 2024-11-29 11:28:15 +00:00
m26610 second block of AES-GCM also decrypting
This commit is contained in:
parent
6bc86d06b1
commit
b035c6e408
@ -348,7 +348,7 @@ 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);
|
||||||
|
|
||||||
//ct
|
//first block of ciphertext
|
||||||
u32 ct[4] = {
|
u32 ct[4] = {
|
||||||
esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[0],
|
esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[0],
|
||||||
esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[1],
|
esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[1],
|
||||||
@ -356,14 +356,29 @@ KERNEL_FQ void m26610_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh
|
|||||||
esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[3]
|
esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[3]
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// second block of ciphertext
|
||||||
|
u32 ct2[4] = {
|
||||||
|
esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[4],
|
||||||
|
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[4] = { 0 };
|
u32 pt[4] = { 0 };
|
||||||
|
u32 pt2[4] = { 0 };
|
||||||
|
|
||||||
// we try to decrypt the ciphertext
|
// we try to decrypt the ciphertext
|
||||||
// TODO this can be moved to a separate decryption function in inc_cipher_aes-gcm.cl
|
// 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_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
|
AES_GCM_GCTR (key, J0, ct, 16, pt, s_te0, s_te1, s_te2, s_te3, s_te4); // decrypt the first block of ciphertext
|
||||||
|
|
||||||
// if ((gid == 0) && (lid == 0)) printf ("pt[0]=%08x\n", pt[0]); // should be 5b7b2274 or [{"type"
|
AES_GCM_inc32(J0);
|
||||||
|
AES_GCM_GCTR (key, J0, ct2, 16, pt2, s_te0, s_te1, s_te2, s_te3, s_te4); // decrypt the second block of ciphertext
|
||||||
|
|
||||||
|
//if ((gid == 0) && (lid == 0)) printf ("pt[0]=%08x\n", pt[0]); // should be 5b7b2274 or [{"type"
|
||||||
|
if ((gid == 0) && (lid == 0)) printf ("pt2[0]=%08x%08x\n", pt2[0], pt2[1]); // should be 2054726565222c22 or Tree","
|
||||||
|
|
||||||
// cast plaintext buffer to byte such that we can do a byte per byte comparison
|
// cast plaintext buffer to byte such that we can do a byte per byte comparison
|
||||||
PRIVATE_AS const u32 *u32OutBufPtr = (PRIVATE_AS u32 *) pt;
|
PRIVATE_AS const u32 *u32OutBufPtr = (PRIVATE_AS u32 *) pt;
|
||||||
|
Loading…
Reference in New Issue
Block a user