Merge pull request #13 from philsmd/master

cleanup-rules: fixes #12, allow @x (purge) rule for the rule-engine on GPU
hashcat · Feb 6, 2017 · c4b3fd2 · c4b3fd2
2 parents 0c8b5a0 + 352fe39
commit c4b3fd2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/cleanup-rules.c b/src/cleanup-rules.c
@@ -78,7 +78,7 @@
 #define ATTACK_EXEC_ON_CPU 1
 #define ATTACK_EXEC_ON_GPU 2
 
-#define MAX_CPU_RULES 255 // this is defined in include/types.h (oclHashcat)
+#define MAX_CPU_RULES 255 // this is defined in include/types.h (hashcat)
 #define MAX_GPU_RULES 255
 
 static int class_num (const char c)
@@ -243,7 +243,6 @@ int main (int argc, char *argv[])
 
         case RULE_OP_MANGLE_PURGECHAR:
           NEXT_RULEPOS;
-          DENY_GPU;
           break;
 
         case RULE_OP_MANGLE_TOGGLECASE_REC:

diff --git a/src/keyspace.c b/src/keyspace.c
@@ -567,7 +567,7 @@ uint64_t keyspace (const int in_len, const uint8_t *in_buf, cs_t mp_sys[5], cs_t
 void usage (char *program)
 {
   const char *help_text[] = {
-    "%s, keyspace utility for oclHashcat",
+    "%s, keyspace utility for hashcat",
     "",
     "Usage: %s [options] mask",
     "",