From a5336ceb72b5b084a2cebce4f991098c14d1d8c7 Mon Sep 17 00:00:00 2001
From: jsteube <jens.steube@gmail.com>
Date: Sat, 16 Feb 2019 14:07:53 +0100
Subject: [PATCH] Allocate always MAX_SALT * 2 bytes for temporary buffers
 going into generic_salt_encode()

---
 src/modules/module_00022.c | 2 +-
 src/modules/module_00023.c | 2 +-
 src/modules/module_00122.c | 2 +-
 src/modules/module_00124.c | 2 +-
 src/modules/module_00125.c | 2 +-
 src/modules/module_00131.c | 2 +-
 src/modules/module_00132.c | 2 +-
 src/modules/module_00141.c | 2 +-
 src/modules/module_00500.c | 2 +-
 src/modules/module_01421.c | 2 +-
 src/modules/module_01441.c | 2 +-
 src/modules/module_01600.c | 2 +-
 src/modules/module_01722.c | 2 +-
 src/modules/module_01731.c | 2 +-
 src/modules/module_01800.c | 2 +-
 src/modules/module_03711.c | 2 +-
 src/modules/module_06300.c | 2 +-
 src/modules/module_06400.c | 2 +-
 src/modules/module_06500.c | 2 +-
 src/modules/module_06700.c | 2 +-
 src/modules/module_06800.c | 2 +-
 src/modules/module_07400.c | 2 +-
 src/modules/module_07700.c | 2 +-
 src/modules/module_07701.c | 2 +-
 src/modules/module_07800.c | 2 +-
 src/modules/module_07801.c | 2 +-
 src/modules/module_08000.c | 2 +-
 src/modules/module_08300.c | 2 +-
 src/modules/module_08500.c | 2 +-
 src/modules/module_11200.c | 2 +-
 src/modules/module_11300.c | 2 +-
 src/modules/module_11500.c | 2 +-
 src/modules/module_14700.c | 2 +-
 src/modules/module_14800.c | 2 +-
 src/modules/module_15100.c | 2 +-
 src/modules/module_15700.c | 2 +-
 src/modules/module_16300.c | 2 +-
 37 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/src/modules/module_00022.c b/src/modules/module_00022.c
index 3d908320d..a16301af7 100644
--- a/src/modules/module_00022.c
+++ b/src/modules/module_00022.c
@@ -239,7 +239,7 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
   tmp_buf[29] = sig[5];
   tmp_buf[30] = 0;
 
-  char tmp_salt[SALT_MAX];
+  char tmp_salt[SALT_MAX * 2];
 
   const int salt_len = generic_salt_encode (hashconfig, (const u8 *) salt->salt_buf, (const int) salt->salt_len - strlen (adm), (u8 *) tmp_salt);
 
diff --git a/src/modules/module_00023.c b/src/modules/module_00023.c
index 986f807ea..84579ecc1 100644
--- a/src/modules/module_00023.c
+++ b/src/modules/module_00023.c
@@ -133,7 +133,7 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
     tmp[3] += MD5M_D;
   }
 
-  char tmp_salt[SALT_MAX];
+  char tmp_salt[SALT_MAX * 2];
 
   const int salt_len = generic_salt_encode (hashconfig, (const u8 *) salt->salt_buf, (const int) salt->salt_len - strlen (skyper), (u8 *) tmp_salt);
 
diff --git a/src/modules/module_00122.c b/src/modules/module_00122.c
index fd72af2af..855fb1ca6 100644
--- a/src/modules/module_00122.c
+++ b/src/modules/module_00122.c
@@ -123,7 +123,7 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
     tmp[4] += SHA1M_E;
   }
 
-  char tmp_salt[48];
+  char tmp_salt[SALT_MAX * 2];
 
   const int salt_len = generic_salt_encode (hashconfig, (const u8 *) salt->salt_buf, (const int) salt->salt_len, (u8 *) tmp_salt);
 
diff --git a/src/modules/module_00124.c b/src/modules/module_00124.c
index 3eb6571b3..2fe160bdf 100644
--- a/src/modules/module_00124.c
+++ b/src/modules/module_00124.c
@@ -141,7 +141,7 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
   tmp[3] = byte_swap_32 (tmp[3]);
   tmp[4] = byte_swap_32 (tmp[4]);
 
-  char tmp_salt[SALT_MAX];
+  char tmp_salt[SALT_MAX * 2];
 
   const int salt_len = generic_salt_encode (hashconfig, (const u8 *) salt->salt_buf, (const int) salt->salt_len, (u8 *) tmp_salt);
 
diff --git a/src/modules/module_00125.c b/src/modules/module_00125.c
index 804167215..4414b97ee 100644
--- a/src/modules/module_00125.c
+++ b/src/modules/module_00125.c
@@ -125,7 +125,7 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
     tmp[4] += SHA1M_E;
   }
 
-  char tmp_salt[48];
+  char tmp_salt[SALT_MAX * 2];
 
   const int salt_len = generic_salt_encode (hashconfig, (const u8 *) salt->salt_buf, (const int) salt->salt_len, (u8 *) tmp_salt);
 
diff --git a/src/modules/module_00131.c b/src/modules/module_00131.c
index fd1ca5973..2be507ebd 100644
--- a/src/modules/module_00131.c
+++ b/src/modules/module_00131.c
@@ -138,7 +138,7 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
     tmp[4] += SHA1M_E;
   }
 
-  char tmp_salt[16];
+  char tmp_salt[SALT_MAX * 2];
 
   const int salt_len = generic_salt_encode (hashconfig, (const u8 *) salt->salt_buf, (const int) salt->salt_len, (u8 *) tmp_salt);
 
diff --git a/src/modules/module_00132.c b/src/modules/module_00132.c
index 18c49be16..bcf072122 100644
--- a/src/modules/module_00132.c
+++ b/src/modules/module_00132.c
@@ -133,7 +133,7 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
     tmp[4] += SHA1M_E;
   }
 
-  char tmp_salt[16];
+  char tmp_salt[SALT_MAX * 2];
 
   const int salt_len = generic_salt_encode (hashconfig, (const u8 *) salt->salt_buf, (const int) salt->salt_len, (u8 *) tmp_salt);
 
diff --git a/src/modules/module_00141.c b/src/modules/module_00141.c
index 766a54bbe..dc434b809 100644
--- a/src/modules/module_00141.c
+++ b/src/modules/module_00141.c
@@ -128,7 +128,7 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   const u32 *digest = (const u32 *) digest_buf;
 
-  char tmp_salt[128] = { 0 };
+  char tmp_salt[SALT_MAX * 2];
 
   const int salt_len = generic_salt_encode (hashconfig, (const u8 *) salt->salt_buf, (const int) salt->salt_len, (u8 *) tmp_salt);
 
diff --git a/src/modules/module_00500.c b/src/modules/module_00500.c
index cb92c84d5..347e34d00 100644
--- a/src/modules/module_00500.c
+++ b/src/modules/module_00500.c
@@ -222,7 +222,7 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   md5crypt_encode (digest_buf, tmp);
 
-  char tmp_salt[16];
+  char tmp_salt[SALT_MAX * 2];
 
   const int salt_len = generic_salt_encode (hashconfig, (const u8 *) salt->salt_buf, (const int) salt->salt_len, (u8 *) tmp_salt);
 
diff --git a/src/modules/module_01421.c b/src/modules/module_01421.c
index 80e2b07db..91cd54b04 100644
--- a/src/modules/module_01421.c
+++ b/src/modules/module_01421.c
@@ -137,7 +137,7 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
     tmp[7] += SHA256M_H;
   }
 
-  char tmp_salt[16];
+  char tmp_salt[SALT_MAX * 2];
 
   const int salt_len = generic_salt_encode (hashconfig, (const u8 *) salt->salt_buf, (const int) salt->salt_len, (u8 *) tmp_salt);
 
diff --git a/src/modules/module_01441.c b/src/modules/module_01441.c
index 419c78223..fa47501b8 100644
--- a/src/modules/module_01441.c
+++ b/src/modules/module_01441.c
@@ -134,7 +134,7 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   const u32 *digest = (const u32 *) digest_buf;
 
-  char tmp_salt[128];
+  char tmp_salt[SALT_MAX * 2];
 
   const int salt_len = generic_salt_encode (hashconfig, (const u8 *) salt->salt_buf, (const int) salt->salt_len, (u8 *) tmp_salt);
 
diff --git a/src/modules/module_01600.c b/src/modules/module_01600.c
index 79c8b58f1..234e94dba 100644
--- a/src/modules/module_01600.c
+++ b/src/modules/module_01600.c
@@ -222,7 +222,7 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   md5crypt_encode (digest_buf, tmp);
 
-  char tmp_salt[16];
+  char tmp_salt[SALT_MAX * 2];
 
   const int salt_len = generic_salt_encode (hashconfig, (const u8 *) salt->salt_buf, (const int) salt->salt_len, (u8 *) tmp_salt);
 
diff --git a/src/modules/module_01722.c b/src/modules/module_01722.c
index 005e5d92b..0540fee7a 100644
--- a/src/modules/module_01722.c
+++ b/src/modules/module_01722.c
@@ -141,7 +141,7 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   u32 *ptr = (u32 *) tmp;
 
-  char tmp_salt[16];
+  char tmp_salt[SALT_MAX * 2];
 
   const int salt_len = generic_salt_encode (hashconfig, (const u8 *) salt->salt_buf, (const int) salt->salt_len, (u8 *) tmp_salt);
 
diff --git a/src/modules/module_01731.c b/src/modules/module_01731.c
index 38243b50f..c82dd187a 100644
--- a/src/modules/module_01731.c
+++ b/src/modules/module_01731.c
@@ -151,7 +151,7 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   const u32 *ptr = (const u32 *) tmp;
 
-  char tmp_salt[16];
+  char tmp_salt[SALT_MAX * 2];
 
   const int salt_len = generic_salt_encode (hashconfig, (const u8 *) salt->salt_buf, (const int) salt->salt_len, (u8 *) tmp_salt);
 
diff --git a/src/modules/module_01800.c b/src/modules/module_01800.c
index 710246e64..f6cd35ce7 100644
--- a/src/modules/module_01800.c
+++ b/src/modules/module_01800.c
@@ -487,7 +487,7 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   sha512crypt_encode (digest_buf, tmp);
 
-  char tmp_salt[64];
+  char tmp_salt[SALT_MAX * 2];
 
   const int salt_len = generic_salt_encode (hashconfig, (const u8 *) salt->salt_buf, (const int) salt->salt_len, (u8 *) tmp_salt);
 
diff --git a/src/modules/module_03711.c b/src/modules/module_03711.c
index 51a8d3ab5..46c658aa9 100644
--- a/src/modules/module_03711.c
+++ b/src/modules/module_03711.c
@@ -126,7 +126,7 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
     tmp[3] += MD5M_D;
   }
 
-  char tmp_salt[SALT_MAX];
+  char tmp_salt[SALT_MAX * 2];
 
   const int salt_len = generic_salt_encode (hashconfig, (const u8 *) salt->salt_buf, (const int) salt->salt_len - 1, (u8 *) tmp_salt);
 
diff --git a/src/modules/module_06300.c b/src/modules/module_06300.c
index fd88cefe5..c8aac786a 100644
--- a/src/modules/module_06300.c
+++ b/src/modules/module_06300.c
@@ -222,7 +222,7 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   md5crypt_encode (digest_buf, tmp);
 
-  char tmp_salt[16];
+  char tmp_salt[SALT_MAX * 2];
 
   const int salt_len = generic_salt_encode (hashconfig, (const u8 *) salt->salt_buf, (const int) salt->salt_len, (u8 *) tmp_salt);
 
diff --git a/src/modules/module_06400.c b/src/modules/module_06400.c
index f4820627d..4965ed6f3 100644
--- a/src/modules/module_06400.c
+++ b/src/modules/module_06400.c
@@ -345,7 +345,7 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   sha256aix_encode ((unsigned char *) tmp, (unsigned char *) ptr_plain);
 
-  char tmp_salt[64];
+  char tmp_salt[SALT_MAX * 2];
 
   const int salt_len = generic_salt_encode (hashconfig, (const u8 *) salt->salt_buf, (const int) salt->salt_len, (u8 *) tmp_salt);
 
diff --git a/src/modules/module_06500.c b/src/modules/module_06500.c
index 3219b4b3e..e0866958c 100644
--- a/src/modules/module_06500.c
+++ b/src/modules/module_06500.c
@@ -519,7 +519,7 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   sha512aix_encode ((unsigned char *) tmp, (unsigned char *) ptr_plain);
 
-  char tmp_salt[64];
+  char tmp_salt[SALT_MAX * 2];
 
   const int salt_len = generic_salt_encode (hashconfig, (const u8 *) salt->salt_buf, (const int) salt->salt_len, (u8 *) tmp_salt);
 
diff --git a/src/modules/module_06700.c b/src/modules/module_06700.c
index 7a4d6930c..c29774705 100644
--- a/src/modules/module_06700.c
+++ b/src/modules/module_06700.c
@@ -272,7 +272,7 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   sha1aix_encode ((unsigned char *) tmp, (unsigned char *) ptr_plain);
 
-  char tmp_salt[64];
+  char tmp_salt[SALT_MAX * 2];
 
   const int salt_len = generic_salt_encode (hashconfig, (const u8 *) salt->salt_buf, (const int) salt->salt_len, (u8 *) tmp_salt);
 
diff --git a/src/modules/module_06800.c b/src/modules/module_06800.c
index 81f012a58..e29cb29d4 100644
--- a/src/modules/module_06800.c
+++ b/src/modules/module_06800.c
@@ -126,7 +126,7 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   const u32 *digest = (const u32 *) digest_buf;
 
-  char tmp_salt[48];
+  char tmp_salt[SALT_MAX * 2];
 
   const int salt_len = generic_salt_encode (hashconfig, (const u8 *) salt->salt_buf, (const int) salt->salt_len, (u8 *) tmp_salt);
 
diff --git a/src/modules/module_07400.c b/src/modules/module_07400.c
index cec313eb8..1baea3236 100644
--- a/src/modules/module_07400.c
+++ b/src/modules/module_07400.c
@@ -311,7 +311,7 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   sha256crypt_encode ((unsigned char *) digest_buf, (unsigned char *) ptr_plain);
 
-  char tmp_salt[32];
+  char tmp_salt[SALT_MAX * 2];
 
   const int salt_len = generic_salt_encode (hashconfig, (const u8 *) salt->salt_buf, (const int) salt->salt_len, (u8 *) tmp_salt);
 
diff --git a/src/modules/module_07700.c b/src/modules/module_07700.c
index 147c29307..40a598887 100644
--- a/src/modules/module_07700.c
+++ b/src/modules/module_07700.c
@@ -117,7 +117,7 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   const u32 *digest = (const u32 *) digest_buf;
 
-  char tmp_salt[16];
+  char tmp_salt[SALT_MAX * 2];
 
   const int salt_len = generic_salt_encode (hashconfig, (const u8 *) salt->salt_buf, (const int) salt->salt_len, (u8 *) tmp_salt);
 
diff --git a/src/modules/module_07701.c b/src/modules/module_07701.c
index 1e5ab2018..89094d2fa 100644
--- a/src/modules/module_07701.c
+++ b/src/modules/module_07701.c
@@ -110,7 +110,7 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   const u32 *digest = (const u32 *) digest_buf;
 
-  char tmp_salt[16];
+  char tmp_salt[SALT_MAX * 2];
 
   const int salt_len = generic_salt_encode (hashconfig, (const u8 *) salt->salt_buf, (const int) salt->salt_len, (u8 *) tmp_salt);
 
diff --git a/src/modules/module_07800.c b/src/modules/module_07800.c
index f227e6e3e..fc35c0bbb 100644
--- a/src/modules/module_07800.c
+++ b/src/modules/module_07800.c
@@ -124,7 +124,7 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   const u32 *digest = (const u32 *) digest_buf;
 
-  char tmp_salt[16];
+  char tmp_salt[SALT_MAX * 2];
 
   const int salt_len = generic_salt_encode (hashconfig, (const u8 *) salt->salt_buf, (const int) salt->salt_len, (u8 *) tmp_salt);
 
diff --git a/src/modules/module_07801.c b/src/modules/module_07801.c
index 71c1170c1..a63015b0e 100644
--- a/src/modules/module_07801.c
+++ b/src/modules/module_07801.c
@@ -117,7 +117,7 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   const u32 *digest = (const u32 *) digest_buf;
 
-  char tmp_salt[16];
+  char tmp_salt[SALT_MAX * 2];
 
   const int salt_len = generic_salt_encode (hashconfig, (const u8 *) salt->salt_buf, (const int) salt->salt_len, (u8 *) tmp_salt);
 
diff --git a/src/modules/module_08000.c b/src/modules/module_08000.c
index 7bc70a6c0..4f8bf9f16 100644
--- a/src/modules/module_08000.c
+++ b/src/modules/module_08000.c
@@ -121,7 +121,7 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   const u32 *digest = (const u32 *) digest_buf;
 
-  char tmp_salt[16];
+  char tmp_salt[SALT_MAX * 2];
 
   const int salt_len = generic_salt_encode (hashconfig, (const u8 *) salt->salt_buf, (const int) salt->salt_len, (u8 *) tmp_salt);
 
diff --git a/src/modules/module_08300.c b/src/modules/module_08300.c
index 5109ec178..d79233334 100644
--- a/src/modules/module_08300.c
+++ b/src/modules/module_08300.c
@@ -185,7 +185,7 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   // final
 
-  char tmp_salt[128];
+  char tmp_salt[SALT_MAX * 2];
 
   const int salt_len = generic_salt_encode (hashconfig, (const u8 *) salt->salt_buf, (const int) salt->salt_len, (u8 *) tmp_salt);
 
diff --git a/src/modules/module_08500.c b/src/modules/module_08500.c
index 7f054c2e8..6923ab0cf 100644
--- a/src/modules/module_08500.c
+++ b/src/modules/module_08500.c
@@ -164,7 +164,7 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   FP (tmp[1], tmp[0], tt);
 
-  char tmp_salt[32];
+  char tmp_salt[SALT_MAX * 2];
 
   const int salt_len = generic_salt_encode (hashconfig, (const u8 *) salt->salt_buf, (const int) salt->salt_len, (u8 *) tmp_salt);
 
diff --git a/src/modules/module_11200.c b/src/modules/module_11200.c
index 439dff42b..f2a606f4c 100644
--- a/src/modules/module_11200.c
+++ b/src/modules/module_11200.c
@@ -110,7 +110,7 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   const u32 *digest = (const u32 *) digest_buf;
 
-  char tmp_salt[64];
+  char tmp_salt[SALT_MAX * 2];
 
   const int salt_len = generic_salt_encode (hashconfig, (const u8 *) salt->salt_buf, (const int) salt->salt_len, (u8 *) tmp_salt);
 
diff --git a/src/modules/module_11300.c b/src/modules/module_11300.c
index f6e283496..151b99aa1 100644
--- a/src/modules/module_11300.c
+++ b/src/modules/module_11300.c
@@ -269,7 +269,7 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
     sprintf (public_key_buf + j, "%02x", ptr[i]);
   }
 
-  char tmp_salt[48];
+  char tmp_salt[SALT_MAX * 2];
 
   const int salt_len = generic_salt_encode (hashconfig, (const u8 *) salt->salt_buf, (const int) salt->salt_len, (u8 *) tmp_salt);
 
diff --git a/src/modules/module_11500.c b/src/modules/module_11500.c
index a51c87249..c1abe16b8 100644
--- a/src/modules/module_11500.c
+++ b/src/modules/module_11500.c
@@ -91,7 +91,7 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   const u32 *digest = (const u32 *) digest_buf;
 
-  char tmp_salt[16];
+  char tmp_salt[SALT_MAX * 2];
 
   const int salt_len = generic_salt_encode (hashconfig, (const u8 *) salt->salt_buf, (const int) salt->salt_len, (u8 *) tmp_salt);
 
diff --git a/src/modules/module_14700.c b/src/modules/module_14700.c
index 4dad63657..c8449c7e2 100644
--- a/src/modules/module_14700.c
+++ b/src/modules/module_14700.c
@@ -315,7 +315,7 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
   salt_in[4] = byte_swap_32 (salt->salt_buf[4]);
   salt_in[5] = 0;
 
-  char tmp_salt[48];
+  char tmp_salt[SALT_MAX * 2];
 
   const int salt_len = generic_salt_encode (hashconfig, (const u8 *) salt_in, (const int) salt->salt_len, (u8 *) tmp_salt);
 
diff --git a/src/modules/module_14800.c b/src/modules/module_14800.c
index 0c140cffa..7699c5ed0 100644
--- a/src/modules/module_14800.c
+++ b/src/modules/module_14800.c
@@ -317,7 +317,7 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
   salt_in[4] = byte_swap_32 (salt->salt_buf[4]);
   salt_in[5] = 0;
 
-  char tmp_salt[48];
+  char tmp_salt[SALT_MAX * 2];
 
   const int salt_len = generic_salt_encode (hashconfig, (const u8 *) salt_in, (const int) salt->salt_len, (u8 *) tmp_salt);
 
diff --git a/src/modules/module_15100.c b/src/modules/module_15100.c
index 679eef4f8..86dfa5ac7 100644
--- a/src/modules/module_15100.c
+++ b/src/modules/module_15100.c
@@ -293,7 +293,7 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   // salt
 
-  char tmp_salt[128];
+  char tmp_salt[SALT_MAX * 2];
 
   memcpy (tmp_salt, salt->salt_buf, salt->salt_len);
 
diff --git a/src/modules/module_15700.c b/src/modules/module_15700.c
index 3682e6517..c5c4ee220 100644
--- a/src/modules/module_15700.c
+++ b/src/modules/module_15700.c
@@ -410,7 +410,7 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   char *salt_ptr = (char *) salt->salt_buf;
 
-  char tmp_salt[128];
+  char tmp_salt[SALT_MAX * 2];
 
   const int salt_len = generic_salt_encode (hashconfig, (const u8 *) salt->salt_buf, (const int) salt->salt_len, (u8 *) tmp_salt);
 
diff --git a/src/modules/module_16300.c b/src/modules/module_16300.c
index 3d5f74a42..bfb989b88 100644
--- a/src/modules/module_16300.c
+++ b/src/modules/module_16300.c
@@ -210,7 +210,7 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   // salt:
 
-  char tmp_salt[48];
+  char tmp_salt[SALT_MAX * 2];
 
   const int salt_len = generic_salt_encode (hashconfig, (const u8 *) salt->salt_buf, (const int) salt->salt_len, (u8 *) tmp_salt);