From 83b9a81704dd27f5f9a767fac1dd3c540aab5584 Mon Sep 17 00:00:00 2001 From: jsteube Date: Thu, 21 Feb 2019 09:17:30 +0100 Subject: [PATCH] Respect base64 padding lenghts in input tokenizer --- src/modules/module_00111.c | 4 ++-- src/modules/module_00141.c | 4 ++-- src/modules/module_01411.c | 4 ++-- src/modules/module_01441.c | 4 ++-- src/modules/module_01711.c | 4 ++-- src/modules/module_10200.c | 4 ++-- src/modules/module_10900.c | 4 ++-- src/modules/module_11900.c | 4 ++-- src/modules/module_12000.c | 4 ++-- src/modules/module_12100.c | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/modules/module_00111.c b/src/modules/module_00111.c index a794564da..08b6f3368 100644 --- a/src/modules/module_00111.c +++ b/src/modules/module_00111.c @@ -67,8 +67,8 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE token.attr[0] = TOKEN_ATTR_FIXED_LENGTH | TOKEN_ATTR_VERIFY_SIGNATURE; - token.len_min[1] = ((20 + SALT_MIN) * 8) / 6; - token.len_max[1] = ((20 + SALT_MAX) * 8) / 6; + token.len_min[1] = (((20 + SALT_MIN) * 8) / 6) + 0; + token.len_max[1] = (((20 + SALT_MAX) * 8) / 6) + 3; token.attr[1] = TOKEN_ATTR_VERIFY_LENGTH | TOKEN_ATTR_VERIFY_BASE64A; diff --git a/src/modules/module_00141.c b/src/modules/module_00141.c index dc434b809..e372f17b0 100644 --- a/src/modules/module_00141.c +++ b/src/modules/module_00141.c @@ -75,8 +75,8 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE token.attr[1] = TOKEN_ATTR_VERIFY_LENGTH | TOKEN_ATTR_VERIFY_DIGIT; - token.len_min[2] = (SALT_MIN * 8) / 6; - token.len_max[2] = (SALT_MAX * 8) / 6; + token.len_min[2] = ((SALT_MIN * 8) / 6) + 0; + token.len_max[2] = ((SALT_MAX * 8) / 6) + 3; token.sep[2] = '*'; token.attr[2] = TOKEN_ATTR_VERIFY_LENGTH | TOKEN_ATTR_VERIFY_BASE64A; diff --git a/src/modules/module_01411.c b/src/modules/module_01411.c index 70e001d4a..4b5eb5fad 100644 --- a/src/modules/module_01411.c +++ b/src/modules/module_01411.c @@ -65,8 +65,8 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE token.attr[0] = TOKEN_ATTR_FIXED_LENGTH | TOKEN_ATTR_VERIFY_SIGNATURE; - token.len_min[1] = ((32 + SALT_MIN) * 8) / 6; - token.len_max[1] = ((32 + SALT_MAX) * 8) / 6; + token.len_min[1] = (((32 + SALT_MIN) * 8) / 6) + 0; + token.len_max[1] = (((32 + SALT_MAX) * 8) / 6) + 3; token.attr[1] = TOKEN_ATTR_VERIFY_LENGTH | TOKEN_ATTR_VERIFY_BASE64A; diff --git a/src/modules/module_01441.c b/src/modules/module_01441.c index fa47501b8..52db783e5 100644 --- a/src/modules/module_01441.c +++ b/src/modules/module_01441.c @@ -75,8 +75,8 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE token.attr[1] = TOKEN_ATTR_VERIFY_LENGTH | TOKEN_ATTR_VERIFY_DIGIT; - token.len_min[2] = (SALT_MIN * 8) / 6; - token.len_max[2] = (SALT_MAX * 8) / 6; + token.len_min[2] = ((SALT_MIN * 8) / 6) + 0; + token.len_max[2] = ((SALT_MAX * 8) / 6) + 3; token.sep[2] = '*'; token.attr[2] = TOKEN_ATTR_VERIFY_LENGTH | TOKEN_ATTR_VERIFY_BASE64A; diff --git a/src/modules/module_01711.c b/src/modules/module_01711.c index ea94ea90b..d924a8c66 100644 --- a/src/modules/module_01711.c +++ b/src/modules/module_01711.c @@ -66,8 +66,8 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE token.attr[0] = TOKEN_ATTR_FIXED_LENGTH | TOKEN_ATTR_VERIFY_SIGNATURE; - token.len_min[1] = ((64 + SALT_MIN) * 8) / 6; - token.len_max[1] = ((64 + SALT_MAX) * 8) / 6; + token.len_min[1] = (((64 + SALT_MIN) * 8) / 6) + 0; + token.len_max[1] = (((64 + SALT_MAX) * 8) / 6) + 3; token.attr[1] = TOKEN_ATTR_VERIFY_LENGTH | TOKEN_ATTR_VERIFY_BASE64A; diff --git a/src/modules/module_10200.c b/src/modules/module_10200.c index 58b8cff2d..ca79cac32 100644 --- a/src/modules/module_10200.c +++ b/src/modules/module_10200.c @@ -77,8 +77,8 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE | TOKEN_ATTR_VERIFY_SIGNATURE; token.sep[1] = '$'; - token.len_min[1] = (SALT_MIN * 8) / 6; - token.len_max[1] = (SALT_MAX * 8) / 6; + token.len_min[1] = ((SALT_MIN * 8) / 6) + 0; + token.len_max[1] = ((SALT_MAX * 8) / 6) + 3; token.attr[1] = TOKEN_ATTR_VERIFY_LENGTH | TOKEN_ATTR_VERIFY_BASE64A; diff --git a/src/modules/module_10900.c b/src/modules/module_10900.c index e0bc4172e..5d8d2ce61 100644 --- a/src/modules/module_10900.c +++ b/src/modules/module_10900.c @@ -111,8 +111,8 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE | TOKEN_ATTR_VERIFY_DIGIT; token.sep[2] = ':'; - token.len_min[2] = (SALT_MIN * 8) / 6; - token.len_max[2] = (SALT_MAX * 8) / 6; + token.len_min[2] = ((SALT_MIN * 8) / 6) + 0; + token.len_max[2] = ((SALT_MAX * 8) / 6) + 3; token.attr[2] = TOKEN_ATTR_VERIFY_LENGTH | TOKEN_ATTR_VERIFY_BASE64A; diff --git a/src/modules/module_11900.c b/src/modules/module_11900.c index ef633b9e1..2ceaf38b9 100644 --- a/src/modules/module_11900.c +++ b/src/modules/module_11900.c @@ -111,8 +111,8 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE | TOKEN_ATTR_VERIFY_DIGIT; token.sep[2] = ':'; - token.len_min[2] = (SALT_MIN * 8) / 6; - token.len_max[2] = (SALT_MAX * 8) / 6; + token.len_min[2] = ((SALT_MIN * 8) / 6) + 0; + token.len_max[2] = ((SALT_MAX * 8) / 6) + 3; token.attr[2] = TOKEN_ATTR_VERIFY_LENGTH | TOKEN_ATTR_VERIFY_BASE64A; diff --git a/src/modules/module_12000.c b/src/modules/module_12000.c index 586966d8a..4a3a2cca8 100644 --- a/src/modules/module_12000.c +++ b/src/modules/module_12000.c @@ -111,8 +111,8 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE | TOKEN_ATTR_VERIFY_DIGIT; token.sep[2] = ':'; - token.len_min[2] = (SALT_MIN * 8) / 6; - token.len_max[2] = (SALT_MAX * 8) / 6; + token.len_min[2] = ((SALT_MIN * 8) / 6) + 0; + token.len_max[2] = ((SALT_MAX * 8) / 6) + 3; token.attr[2] = TOKEN_ATTR_VERIFY_LENGTH | TOKEN_ATTR_VERIFY_BASE64A; diff --git a/src/modules/module_12100.c b/src/modules/module_12100.c index f3bcb2ceb..3022b8d36 100644 --- a/src/modules/module_12100.c +++ b/src/modules/module_12100.c @@ -112,8 +112,8 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE | TOKEN_ATTR_VERIFY_DIGIT; token.sep[2] = ':'; - token.len_min[2] = (SALT_MIN * 8) / 6; - token.len_max[2] = (SALT_MAX * 8) / 6; + token.len_min[2] = ((SALT_MIN * 8) / 6) + 0; + token.len_max[2] = ((SALT_MAX * 8) / 6) + 3; token.attr[2] = TOKEN_ATTR_VERIFY_LENGTH | TOKEN_ATTR_VERIFY_BASE64A;