arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-22 16:18:09 +00:00
Code Issues Releases Wiki Activity

File handling: Do not abort on seeing a BOM in input files, just warn and ignore the BOM

Browse Source
This commit is contained in:
Jens Steube 2021-06-29 20:42:22 +02:00
parent 2af45cd03f
commit 254e33c473
7 changed files with 114 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/changes.txt
View File

@ -11,7 +11,6 @@
- Added hash-mode: AES-192-ECB NOKDF (PT = $salt, key = $pass) - Added hash-mode: AES-192-ECB NOKDF (PT = $salt, key = $pass)
- Added hash-mode: AES-256-ECB NOKDF (PT = $salt, key = $pass) - Added hash-mode: AES-256-ECB NOKDF (PT = $salt, key = $pass)
## ##
## Bugs ## Bugs
## ##
@ -42,6 +41,7 @@
## Technical ## Technical
## ##
- File handling: Do not abort on seeing a BOM in input files, just warn and ignore the BOM
- Brain: Add brain_ctx_t to hashcat_ctx_t to enable runtime check if hashcat was compiled with brain support - Brain: Add brain_ctx_t to hashcat_ctx_t to enable runtime check if hashcat was compiled with brain support
- Autodetect: Limit the number of errors per hash-mode try to 100 to avoid long startup time - Autodetect: Limit the number of errors per hash-mode try to 100 to avoid long startup time
- Folders: Do not escape the variable cpath_real to prevent certain OpenCL runtimes from running into an error which do not support escape characters - Folders: Do not escape the variable cpath_real to prevent certain OpenCL runtimes from running into an error which do not support escape characters

1
include/shared.h
View File

@ -63,6 +63,7 @@ bool hc_path_create (const char *path);
bool hc_path_has_bom (const char *path); bool hc_path_has_bom (const char *path);
bool hc_string_is_digit (const char *s); bool hc_string_is_digit (const char *s);
int hc_string_bom_size (const u8 *s);
void hc_string_trim_trailing (char *s); void hc_string_trim_trailing (char *s);
void hc_string_trim_leading (char *s); void hc_string_trim_leading (char *s);

2
include/types.h
View File

@ -1067,9 +1067,11 @@ typedef struct hc_fp
bool is_gzip; bool is_gzip;
bool is_zip; bool is_zip;
int bom_size;
char *mode; char *mode;
const char *path; const char *path;
} HCFILE; } HCFILE;
#include "ext_nvrtc.h" #include "ext_nvrtc.h"

38
src/filehandling.c
View File

@ -60,11 +60,12 @@ bool hc_fopen (HCFILE *fp, const char *path, char *mode)
return false; return false;
} }
fp->pfp = NULL; fp->pfp = NULL;
fp->is_gzip = false; fp->is_gzip = false;
fp->is_zip = false; fp->is_zip = false;
fp->bom_size = 0;
unsigned char check[4] = { 0 }; unsigned char check[8] = { 0 };
int fd_tmp = open (path, O_RDONLY); int fd_tmp = open (path, O_RDONLY);
@ -74,8 +75,15 @@ bool hc_fopen (HCFILE *fp, const char *path, char *mode)
if (read (fd_tmp, check, sizeof (check)) > 0) if (read (fd_tmp, check, sizeof (check)) > 0)
{ {
if (check[0] == 0x1f && check[1] == 0x8b && check[2] == 0x08) fp->is_gzip = true; if (check[0] == 0x1f && check[1] == 0x8b && check[2] == 0x08) fp->is_gzip = true;
if (check[0] == 0x50 && check[1] == 0x4b && check[2] == 0x03 && check[3] == 0x04) fp->is_zip = true; if (check[0] == 0x50 && check[1] == 0x4b && check[2] == 0x03 && check[3] == 0x04) fp->is_zip = true;
// compressed files with BOM will be undetected!
if ((fp->is_gzip == false) && (fp->is_zip == false))
{
fp->bom_size = hc_string_bom_size (check);
}
} }
close (fd_tmp); close (fd_tmp);
@ -104,7 +112,16 @@ bool hc_fopen (HCFILE *fp, const char *path, char *mode)
} }
else else
{ {
if ((fp->pfp = fdopen (fp->fd, mode)) == NULL) return false; if ((fp->pfp = fdopen (fp->fd, mode)) == NULL) return false;
if (fp->bom_size)
{
// atm just skip bom
const int nread = fread (check, sizeof (char), fp->bom_size, fp->pfp);
if (nread != fp->bom_size) return false;
}
} }
fp->path = path; fp->path = path;
@ -152,9 +169,10 @@ bool hc_fopen_raw (HCFILE *fp, const char *path, char *mode)
return false; return false;
} }
fp->pfp = NULL; fp->pfp = NULL;
fp->is_gzip = false; fp->is_gzip = false;
fp->is_zip = false; fp->is_zip = false;
fp->bom_size = 0;
if (fmode == -1) if (fmode == -1)
{ {

119
src/shared.c
View File

@ -388,7 +388,7 @@ bool hc_path_has_bom (const char *path)
HCFILE fp; HCFILE fp;
if (hc_fopen (&fp, path, "rb") == false) return false; if (hc_fopen_raw (&fp, path, "rb") == false) return false;
const size_t nread = hc_fread (buf, 1, sizeof (buf), &fp); const size_t nread = hc_fread (buf, 1, sizeof (buf), &fp);
@ -396,95 +396,104 @@ bool hc_path_has_bom (const char *path)
if (nread < 1) return false; if (nread < 1) return false;
const int bom_size = hc_string_bom_size (buf);
const bool has_bom = bom_size > 0;
return has_bom;
}
int hc_string_bom_size (const u8 *s)
{
/* signatures from https://en.wikipedia.org/wiki/Byte_order_mark#Byte_order_marks_by_encoding */ /* signatures from https://en.wikipedia.org/wiki/Byte_order_mark#Byte_order_marks_by_encoding */
// utf-8 // utf-8
if ((buf[0] == 0xef) if ((s[0] == 0xef)
&& (buf[1] == 0xbb) && (s[1] == 0xbb)
&& (buf[2] == 0xbf)) return true; && (s[2] == 0xbf)) return 3;
// utf-16 // utf-16
if ((buf[0] == 0xfe) if ((s[0] == 0xfe)
&& (buf[1] == 0xff)) return true; && (s[1] == 0xff)) return 2;
if ((buf[0] == 0xff) if ((s[0] == 0xff)
&& (buf[1] == 0xfe)) return true; && (s[1] == 0xfe)) return 2;
// utf-32 // utf-32
if ((buf[0] == 0x00) if ((s[0] == 0x00)
&& (buf[1] == 0x00) && (s[1] == 0x00)
&& (buf[2] == 0xfe) && (s[2] == 0xfe)
&& (buf[3] == 0xff)) return true; && (s[3] == 0xff)) return 4;
if ((buf[0] == 0xff) if ((s[0] == 0xff)
&& (buf[1] == 0xfe) && (s[1] == 0xfe)
&& (buf[2] == 0x00) && (s[2] == 0x00)
&& (buf[3] == 0x00)) return true; && (s[3] == 0x00)) return 4;
// utf-7 // utf-7
if ((buf[0] == 0x2b) if ((s[0] == 0x2b)
&& (buf[1] == 0x2f) && (s[1] == 0x2f)
&& (buf[2] == 0x76) && (s[2] == 0x76)
&& (buf[3] == 0x38)) return true; && (s[3] == 0x38)) return 4;
if ((buf[0] == 0x2b) if ((s[0] == 0x2b)
&& (buf[1] == 0x2f) && (s[1] == 0x2f)
&& (buf[2] == 0x76) && (s[2] == 0x76)
&& (buf[3] == 0x39)) return true; && (s[3] == 0x39)) return 4;
if ((buf[0] == 0x2b) if ((s[0] == 0x2b)
&& (buf[1] == 0x2f) && (s[1] == 0x2f)
&& (buf[2] == 0x76) && (s[2] == 0x76)
&& (buf[3] == 0x2b)) return true; && (s[3] == 0x2b)) return 4;
if ((buf[0] == 0x2b) if ((s[0] == 0x2b)
&& (buf[1] == 0x2f) && (s[1] == 0x2f)
&& (buf[2] == 0x76) && (s[2] == 0x76)
&& (buf[3] == 0x2f)) return true; && (s[3] == 0x2f)) return 4;
if ((buf[0] == 0x2b) if ((s[0] == 0x2b)
&& (buf[1] == 0x2f) && (s[1] == 0x2f)
&& (buf[2] == 0x76) && (s[2] == 0x76)
&& (buf[3] == 0x38) && (s[3] == 0x38)
&& (buf[4] == 0x2d)) return true; && (s[4] == 0x2d)) return 5;
// utf-1 // utf-1
if ((buf[0] == 0xf7) if ((s[0] == 0xf7)
&& (buf[1] == 0x64) && (s[1] == 0x64)
&& (buf[2] == 0x4c)) return true; && (s[2] == 0x4c)) return 3;
// utf-ebcdic // utf-ebcdic
if ((buf[0] == 0xdd) if ((s[0] == 0xdd)
&& (buf[1] == 0x73) && (s[1] == 0x73)
&& (buf[2] == 0x66) && (s[2] == 0x66)
&& (buf[3] == 0x73)) return true; && (s[3] == 0x73)) return 4;
// scsu // scsu
if ((buf[0] == 0x0e) if ((s[0] == 0x0e)
&& (buf[1] == 0xfe) && (s[1] == 0xfe)
&& (buf[2] == 0xff)) return true; && (s[2] == 0xff)) return 3;
// bocu-1 // bocu-1
if ((buf[0] == 0xfb) if ((s[0] == 0xfb)
&& (buf[1] == 0xee) && (s[1] == 0xee)
&& (buf[2] == 0x28)) return true; && (s[2] == 0x28)) return 3;
// gb-18030 // gb-18030
if ((buf[0] == 0x84) if ((s[0] == 0x84)
&& (buf[1] == 0x31) && (s[1] == 0x31)
&& (buf[2] == 0x95) && (s[2] == 0x95)
&& (buf[3] == 0x33)) return true; && (s[3] == 0x33)) return 4;
return false; return 0;
} }
bool hc_string_is_digit (const char *s) bool hc_string_is_digit (const char *s)

4
src/straight.c
View File

@ -18,9 +18,9 @@ static int straight_ctx_add_wl (hashcat_ctx_t *hashcat_ctx, const char *dict)
{ {
if (hc_path_has_bom (dict) == true) if (hc_path_has_bom (dict) == true)
{ {
event_log_error (hashcat_ctx, "%s: Byte Order Mark (BOM) was detected", dict); event_log_warning (hashcat_ctx, "%s: Byte Order Mark (BOM) was detected", dict);
return -1; //return -1;
} }
straight_ctx_t *straight_ctx = hashcat_ctx->straight_ctx; straight_ctx_t *straight_ctx = hashcat_ctx->straight_ctx;

32
src/user_options.c
View File

@ -2297,9 +2297,9 @@ int user_options_check_files (hashcat_ctx_t *hashcat_ctx)
if (hc_path_has_bom (user_options_extra->hc_hash) == true) if (hc_path_has_bom (user_options_extra->hc_hash) == true)
{ {
event_log_error (hashcat_ctx, "%s: Byte Order Mark (BOM) was detected", user_options_extra->hc_hash); event_log_warning (hashcat_ctx, "%s: Byte Order Mark (BOM) was detected", user_options_extra->hc_hash);
return -1; //return -1;
} }
} }
} }
@ -2347,9 +2347,9 @@ int user_options_check_files (hashcat_ctx_t *hashcat_ctx)
if (hc_path_has_bom (rp_file) == true) if (hc_path_has_bom (rp_file) == true)
{ {
event_log_error (hashcat_ctx, "%s: Byte Order Mark (BOM) was detected", rp_file); event_log_warning (hashcat_ctx, "%s: Byte Order Mark (BOM) was detected", rp_file);
return -1; //return -1;
} }
} }
} }
@ -2385,9 +2385,9 @@ int user_options_check_files (hashcat_ctx_t *hashcat_ctx)
if (hc_path_has_bom (dictfile1) == true) if (hc_path_has_bom (dictfile1) == true)
{ {
event_log_error (hashcat_ctx, "%s: Byte Order Mark (BOM) was detected", dictfile1); event_log_warning (hashcat_ctx, "%s: Byte Order Mark (BOM) was detected", dictfile1);
return -1; //return -1;
} }
if (hc_path_exist (dictfile2) == false) if (hc_path_exist (dictfile2) == false)
@ -2413,9 +2413,9 @@ int user_options_check_files (hashcat_ctx_t *hashcat_ctx)
if (hc_path_has_bom (dictfile2) == true) if (hc_path_has_bom (dictfile2) == true)
{ {
event_log_error (hashcat_ctx, "%s: Byte Order Mark (BOM) was detected", dictfile2); event_log_warning (hashcat_ctx, "%s: Byte Order Mark (BOM) was detected", dictfile2);
return -1; //return -1;
} }
} }
} }
@ -2445,9 +2445,9 @@ int user_options_check_files (hashcat_ctx_t *hashcat_ctx)
if (hc_path_has_bom (maskfile) == true) if (hc_path_has_bom (maskfile) == true)
{ {
event_log_error (hashcat_ctx, "%s: Byte Order Mark (BOM) was detected", maskfile); event_log_warning (hashcat_ctx, "%s: Byte Order Mark (BOM) was detected", maskfile);
return -1; //return -1;
} }
} }
} }
@ -2489,9 +2489,9 @@ int user_options_check_files (hashcat_ctx_t *hashcat_ctx)
if (hc_path_has_bom (maskfile) == true) if (hc_path_has_bom (maskfile) == true)
{ {
event_log_error (hashcat_ctx, "%s: Byte Order Mark (BOM) was detected", maskfile); event_log_warning (hashcat_ctx, "%s: Byte Order Mark (BOM) was detected", maskfile);
return -1; //return -1;
} }
} }
} }
@ -2533,9 +2533,9 @@ int user_options_check_files (hashcat_ctx_t *hashcat_ctx)
if (hc_path_has_bom (maskfile) == true) if (hc_path_has_bom (maskfile) == true)
{ {
event_log_error (hashcat_ctx, "%s: Byte Order Mark (BOM) was detected", maskfile); event_log_warning (hashcat_ctx, "%s: Byte Order Mark (BOM) was detected", maskfile);
return -1; //return -1;
} }
} }
} }
@ -2581,9 +2581,9 @@ int user_options_check_files (hashcat_ctx_t *hashcat_ctx)
if (hc_path_has_bom (rp_file) == true) if (hc_path_has_bom (rp_file) == true)
{ {
event_log_error (hashcat_ctx, "%s: Byte Order Mark (BOM) was detected", rp_file); event_log_warning (hashcat_ctx, "%s: Byte Order Mark (BOM) was detected", rp_file);
return -1; //return -1;
} }
} }
} }