Rules: Move RULE_WORD_SIZE from params.h to rules.c

Author: solardiz

src/params.h

@@ -427,12 +427,6 @@ extern unsigned int password_hash_thresholds[PASSWORD_HASH_SIZES];
  */
 #define RULE_RANGES_MAX			30
 
-/*
- * Buffer size for words while applying rules, should be at least as large
- * as PLAINTEXT_BUFFER_SIZE.
- */
-#define RULE_WORD_SIZE			320
-
 /*
  * By default we mute some rules logging in pipe mode, if number of rules
  * (after PP and dupe rule suppression) is larger than this threshold.

src/rules.c

@@ -24,6 +24,13 @@
 #include "mask.h"
 #include "encoding_data.h"
 
+/*
+ * Buffer size for words while applying rules, should be at least as large
+ * as PLAINTEXT_BUFFER_SIZE, but not large enough that fitting strings could
+ * reach or exceed INFINITE_LENGTH or INVALID_LENGTH defined further below.
+ */
+#define RULE_WORD_SIZE			PLAINTEXT_BUFFER_SIZE
+
 /*
  * Error codes.
  */

src/single.c

@@ -654,7 +654,7 @@ static int single_process_pw(struct db_salt *salt, struct db_password *pw,
 	struct list_entry *global_head = single_seed->head;
 	int first_global, second_global;
 	int first_number, second_number;
-	char pair[RULE_WORD_SIZE];
+	char pair[PLAINTEXT_BUFFER_SIZE];
 	int split;
 	char *key;
 
@@ -689,8 +689,8 @@ static int single_process_pw(struct db_salt *salt, struct db_password *pw,
 			if (first == second || (first_global && second_global))
 				continue;
 			if ((split = strlen(first->data)) < length) {
-				strnzcpy(pair, first->data, RULE_WORD_SIZE);
-				strnzcat(pair, second->data, RULE_WORD_SIZE);
+				strnzcpy(pair, first->data, PLAINTEXT_BUFFER_SIZE);
+				strnzcat(pair, second->data, PLAINTEXT_BUFFER_SIZE);
 
 				if ((key = rules_apply(pair, rule, split)))
 				if (ext_filter(key))
@@ -705,7 +705,7 @@ static int single_process_pw(struct db_salt *salt, struct db_password *pw,
 			if (!first_global && first->data[1]) {
 				pair[0] = first->data[0];
 				pair[1] = 0;
-				strnzcat(pair, second->data, RULE_WORD_SIZE);
+				strnzcat(pair, second->data, PLAINTEXT_BUFFER_SIZE);
 
 				if ((key = rules_apply(pair, rule, 1)))
 				if (ext_filter(key))