Fixed the indentation as requested and added case v

Author: Serax4

src/rules.c

@@ -1450,75 +1450,118 @@ char *rules_apply(char *word_in, char *rule, int split)
 			}
 			break;
 
-			case 'H': /*convert the entire password to uppercase hex*/
+		case 'H': /*convert the entire password to uppercase hex*/
+		{
+			char outbuf[RULE_WORD_SIZE * 2];
+			int i;
+			if (length * 2 >= RULE_WORD_SIZE)
+				break;
+			for (i = 0; i < length; i++)
+				sprintf(&outbuf[i * 2], "%02X", (unsigned char)in[i]);
+			strcpy(in, outbuf);
+			length *= 2;
+		}
+		break;
+
+		case 'B': /* add byte value of X at pos N, bytewise. Format: BNX */
+		{
+			unsigned int pos;
+			unsigned char val;
+			POSITION(pos)
+			VALUE(val)
+			if (pos < length)
 			{
-				char outbuf[RULE_WORD_SIZE * 2];
-				int i;
-				if (length * 2 >= RULE_WORD_SIZE)
-					break;
-				for (i = 0; i < length; i++)
-					sprintf(&outbuf[i * 2], "%02X", (unsigned char)in[i]);
-				strcpy(in, outbuf);
-				length *= 2;
+				in[pos] = (unsigned char)(in[pos] + val);
 			}
-			break;
-
-			case 'B': /* add byte value of X at pos N, bytewise. Format: BNX */
+		}
+		break;
+				
+		case 'v':
+			if (hc_logic)
 			{
-				unsigned int pos;
-				unsigned char val;
-				POSITION(pos)
-				VALUE(val)
-				if (pos < length)
+				/* HC rule: insert char X every N chars */
+				unsigned int n, i, out_len = 0;
+				char value;
+				char *out;
+				POSITION(n)
+				VALUE(value)
+				if (!n)
+					break;
+				GET_OUT
+				for (i = 0; i < length; i++) 
 				{
-					in[pos] = (unsigned char)(in[pos] + val);
+					if (out_len >= RULE_WORD_SIZE - 1)
+						break;
+					out[out_len++] = in[i];
+					if (((i + 1) % n) == 0) {
+						if (out_len >= RULE_WORD_SIZE - 1)
+							break;
+						out[out_len++] = value;
+					}
 				}
+				out[out_len] = 0;
+				in = out;
+				length = out_len;
+				break;
+			} 
+			else 
+			{
+				/* original JtR rule */
+				char var;
+				int a, s; /* may be negative */
+				VALUE(var)
+				if (var < 'a' || var > 'k')
+					goto out_ERROR_POSITION;
+				rules_vars['l'] = length;
+				POSITION(a)
+				POSITION(s)
+				rules_vars[ARCH_INDEX(var)] = a - s; /* may be negative */
 			}
 			break;
 
-				/* Additional "single crack" mode rules */
-			case '1':
-				if (split < 0)
-					goto out_ERROR_UNALLOWED;
-				if (!split)
-					REJECT
-				if (which)
-					memcpy(buffer[2][STAGE],
-						   in, length + 1);
-				else
-					strnzcpy(buffer[2][STAGE],
-							 &word[split],
-							 RULE_WORD_SIZE);
+			/* Additional "single crack" mode rules */
+		case '1':
+			if (split < 0)
+				goto out_ERROR_UNALLOWED;
+			if (!split)
+				REJECT
+			if (which)
+				memcpy(buffer[2][STAGE],
+					   in, length + 1);
+			else
+				strnzcpy(buffer[2][STAGE],
+						 &word[split],
+						 RULE_WORD_SIZE);
+			length = split;
+			if (length > RULE_WORD_SIZE - 1)
+				length = RULE_WORD_SIZE - 1;
+			memcpy(in, word, length);
+			in[length] = 0;
+			which = 1;
+			break;
+
+		case '2':
+			if (split < 0)
+				goto out_ERROR_UNALLOWED;
+			if (!split)
+				REJECT
+			if (which)
+			{
+				memcpy(buffer[2][STAGE],
+					   in, length + 1);
+			}
+			else
+			{
 				length = split;
 				if (length > RULE_WORD_SIZE - 1)
 					length = RULE_WORD_SIZE - 1;
-				memcpy(in, word, length);
-				in[length] = 0;
-				which = 1;
-				break;
-
-			case '2':
-				if (split < 0)
-					goto out_ERROR_UNALLOWED;
-				if (!split)
-					REJECT
-				if (which)
-				{
-					memcpy(buffer[2][STAGE],
-						   in, length + 1);
-				}
-				else
-				{
-					length = split;
-					if (length > RULE_WORD_SIZE - 1)
-						length = RULE_WORD_SIZE - 1;
-					strnzcpy(buffer[2][STAGE],
-							 word, length + 1);
-				}
-				strnzcpy(in, &word[split], RULE_WORD_SIZE);
-				length = strlen(in);
-				which = 2;
-				break;
+				strnzcpy(buffer[2][STAGE],
+						 word, length + 1);
+			}
+			strnzcpy(in, &word[split], RULE_WORD_SIZE);
+			length = strlen(in);
+			which = 2;
+			break;
 
 			case '+':
 				if (hc_logic || !which)