arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2025-02-02 02:41:35 +00:00
Code Issues Releases Wiki Activity

Allow loading of bcrypt hashes with signature $2b$ (February 2014)

Browse Source
This commit is contained in:
Jens Steube 2016-09-02 10:03:22 +02:00
parent 54249835f4
commit a289c37ecf
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/changes.txt
View File

@ -1,5 +1,11 @@
* changes v3.00 -> v3.xx:
##
## Improvements
##
- Allow loading of bcrypt hashes with signature $2b$ (February 2014)
##
## Algorithms
##

5
include/shared.h
View File

@ -1027,8 +1027,9 @@ extern hc_thread_mutex_t mux_display;
#define SIGNATURE_PHPASS2 "$H$"
#define SIGNATURE_MD5CRYPT "$1$"
#define SIGNATURE_BCRYPT1 "$2a$"
#define SIGNATURE_BCRYPT2 "$2x$"
#define SIGNATURE_BCRYPT3 "$2y$"
#define SIGNATURE_BCRYPT2 "$2b$"
#define SIGNATURE_BCRYPT3 "$2x$"
#define SIGNATURE_BCRYPT4 "$2y$"
#define SIGNATURE_SHA512CRYPT "$6$"
#define SIGNATURE_MD5APR1 "$apr1$"
#define SIGNATURE_MSSQL "0x0100"

2
src/shared.c
View File

@ -10106,7 +10106,7 @@ int bcrypt_parse_hash (char *input_buf, uint input_len, hash_t *hash_buf)
{
if ((input_len < DISPLAY_LEN_MIN_3200) || (input_len > DISPLAY_LEN_MAX_3200)) return (PARSER_GLOBAL_LENGTH);
if ((memcmp (SIGNATURE_BCRYPT1, input_buf, 4)) && (memcmp (SIGNATURE_BCRYPT2, input_buf, 4)) && (memcmp (SIGNATURE_BCRYPT3, input_buf, 4))) return (PARSER_SIGNATURE_UNMATCHED);
if ((memcmp (SIGNATURE_BCRYPT1, input_buf, 4)) && (memcmp (SIGNATURE_BCRYPT2, input_buf, 4)) && (memcmp (SIGNATURE_BCRYPT3, input_buf, 4)) && (memcmp (SIGNATURE_BCRYPT4, input_buf, 4))) return (PARSER_SIGNATURE_UNMATCHED);
u32 *digest = (u32 *) hash_buf->digest;