Merge pull request #167 from gm4tr1x/issue84

Issue84

diff --cc include/shared.h
Simple merge

diff --cc include/types.h
index 4369935,cff1e02..ac7611a
--- 1/include/types.h
--- 2/include/types.h
+++ b/include/types.h
@@@ -1029,34 -1029,39 +1029,40 @@@ typedef struc
     * attack specific
     */
  
 -  uint                wordlist_mode;
 -  uint                hashlist_mode;
 -  uint                hashlist_format;
 +  uint    wordlist_mode;
 +  uint    hashlist_mode;
 +  uint    hashlist_format;
 +
 +  uint    attack_mode;
 +  uint    attack_kern;
 +  uint    attack_exec;
  
 -  uint                attack_mode;
 -  uint                attack_kern;
 -  uint                attack_exec;
 +  uint    kernel_rules_cnt;
  
 -  uint                kernel_rules_cnt;
 -  kernel_rule_t      *kernel_rules_buf;
 +  kernel_rule_t *kernel_rules_buf;
  
 -  uint                combs_mode;
 -  uint                combs_cnt;
 +  uint    combs_mode;
 +  uint    combs_cnt;
  
 -  uint                bfs_cnt;
 +  uint    bfs_cnt;
  
 -  uint                css_cnt;
 -  cs_t               *css_buf;
 +  uint    css_cnt;
 +  cs_t   *css_buf;
  
 -  cs_t               *root_css_buf;
 -  cs_t               *markov_css_buf;
 +  cs_t   *root_css_buf;
 +  cs_t   *markov_css_buf;
  
 -  char               *rule_buf_l;
 -  char               *rule_buf_r;
 -  int                 rule_len_l;
 -  int                 rule_len_r;
 +  char   *rule_buf_l;
 +  char   *rule_buf_r;
 +  int     rule_len_l;
 +  int     rule_len_r;
  
+   /**
+    * opencl
+    */
+ 
+   void               *ocl;
+ 
    /**
     * hardware watchdog
     */

diff --cc src/Makefile
Simple merge

diff --cc src/oclHashcat.c
Simple merge