Added rounds_count_length() function to detect optional rounds=

substring in *crypt hashes
The following parser functions have been rewritten to make use of
input_tokenizer():
phpass_parse_hash()
md5crypt_parse_hash()
md5apr1_parse_hash()
episerver_parse_hash()
This commit is contained in:
jsteube
2018-06-27 11:12:35 +02:00
parent f574cbc88a
commit 9196f1ba55
5 changed files with 219 additions and 133 deletions
-8
View File
@@ -1046,11 +1046,7 @@ typedef enum display_len
DISPLAY_LEN_MAX_200 = 16,
DISPLAY_LEN_MIN_300 = 40,
DISPLAY_LEN_MAX_300 = 40,
DISPLAY_LEN_MIN_400 = 34,
DISPLAY_LEN_MAX_400 = 34,
DISPLAY_LEN_MIN_500 = 3 + 1 + 0 + 22,
DISPLAY_LEN_MIN_501 = 104,
DISPLAY_LEN_MAX_500 = 3 + 1 + 8 + 22,
DISPLAY_LEN_MAX_501 = 104,
DISPLAY_LEN_MIN_600 = 8 + 128,
DISPLAY_LEN_MAX_600 = 8 + 128,
@@ -1078,8 +1074,6 @@ typedef enum display_len
DISPLAY_LEN_MAX_1450H = 64 + 1 + (SALT_MAX * 2),
DISPLAY_LEN_MIN_1500 = 13,
DISPLAY_LEN_MAX_1500 = 13,
DISPLAY_LEN_MIN_1600 = 29 + 0,
DISPLAY_LEN_MAX_1600 = 29 + 8,
DISPLAY_LEN_MIN_1700 = 128,
DISPLAY_LEN_MAX_1700 = 128,
DISPLAY_LEN_MIN_1710 = 128 + 1 + 0,
@@ -1361,8 +1355,6 @@ typedef enum display_len
DISPLAY_LEN_MAX_132 = 6 + 8 + 40,
DISPLAY_LEN_MIN_133 = 28,
DISPLAY_LEN_MAX_133 = 28,
DISPLAY_LEN_MIN_141 = 14 + 0 + 1 + 28,
DISPLAY_LEN_MAX_141 = 14 + 44 + 1 + 28,
DISPLAY_LEN_MIN_1411 = 9 + 44 + 0,
DISPLAY_LEN_MAX_1411 = 9 + 44 + 68,
DISPLAY_LEN_MIN_1441 = 14 + 0 + 1 + 43,