Prepare fix for datatypes, not final

[hashcat.git] / tools / rules_test / cpu_rules.h

diff --git a/tools/rules_test/cpu_rules.h b/tools/rules_test/cpu_rules.h
index 593e60e..44bbc1e 100644 (file)
--- a/tools/rules_test/cpu_rules.h
+++ b/tools/rules_test/cpu_rules.h
@@ -6,10 +6,7 @@
 #ifndef CPU_RULES_H
 #define CPU_RULES_H
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <inttypes.h>
-#include <string.h>
+#include <common.h>
 #include "rp_cpu.h"
 
 #define BLOCK_SIZE               64
@@ -17,13 +14,11 @@
 #define RP_RULE_BUFSIZ        0x100
 #define RULE_RC_SYNTAX_ERROR     -1
 
-typedef unsigned int uint;
-
 typedef struct
 {
   uint cmds[256];
 
-} gpu_rule_t;
+} kernel_rule_t;
 
 int mangle_lrest (char arr[BLOCK_SIZE], int arr_len);
 int mangle_urest (char arr[BLOCK_SIZE], int arr_len);
@@ -51,26 +46,25 @@ int mangle_dupechar_at (char arr[BLOCK_SIZE], int arr_len, int upos, int ulen);
 int mangle_dupechar (char arr[BLOCK_SIZE], int arr_len);
 int mangle_switch_at_check (char arr[BLOCK_SIZE], int arr_len, int upos, int upos2);
 int mangle_switch_at (char arr[BLOCK_SIZE], int arr_len, int upos, int upos2);
-int mangle_chr_shiftl (uint8_t arr[BLOCK_SIZE], int arr_len, int upos);
-int mangle_chr_shiftr (uint8_t arr[BLOCK_SIZE], int arr_len, int upos);
-int mangle_chr_incr (uint8_t arr[BLOCK_SIZE], int arr_len, int upos);
-int mangle_chr_decr (uint8_t arr[BLOCK_SIZE], int arr_len, int upos);
+int mangle_chr_shiftl (u8 arr[BLOCK_SIZE], int arr_len, int upos);
+int mangle_chr_shiftr (u8 arr[BLOCK_SIZE], int arr_len, int upos);
+int mangle_chr_incr (u8 arr[BLOCK_SIZE], int arr_len, int upos);
+int mangle_chr_decr (u8 arr[BLOCK_SIZE], int arr_len, int upos);
 int mangle_title (char arr[BLOCK_SIZE], int arr_len);
-int generate_random_rule (char rule_buf[RP_RULE_BUFSIZ], uint32_t rp_gen_func_min, uint32_t rp_gen_func_max);
+int generate_random_rule (char rule_buf[RP_RULE_BUFSIZ], u32 rp_gen_func_min, u32 rp_gen_func_max);
 int apply_rule_cpu (char *rule, int rule_len, char in[BLOCK_SIZE], int in_len, char out[BLOCK_SIZE]);
-int cpu_rule_to_gpu_rule (char rule_buf[BUFSIZ], uint rule_len, gpu_rule_t *rule);
-
-typedef int bool;
+int cpu_rule_to_kernel_rule (char rule_buf[BUFSIZ], uint rule_len, kernel_rule_t *rule);
 
 bool class_num (char c);
 bool class_lower (char c);
 bool class_upper (char c);
 bool class_alpha (char c);
+
 char conv_ctoi (char c);
 char conv_itoc (char c);
 
 uint get_random_num (uint min, uint max);
 
-void gen_cmask (const uint8_t *word, uint8_t *cmask, const uint len);
+void gen_cmask (const u8 *word, u8 *cmask, const uint len);
 
 #endif