Merge pull request #311 from fgaudreault/master

[hashcat.git] / include / types.h

diff --git a/include/types.h b/include/types.h
index 3487106..621a92a 100644 (file)
--- a/include/types.h
+++ b/include/types.h
@@ -702,6 +702,13 @@ typedef struct
 
 } psafe3_t;
 
+typedef struct 
+{
+  u32 salt_buf[128];
+  u32 salt_len;
+
+} pstoken_t;
+
 typedef struct
 {
   char    plain_buf[256];
@@ -955,21 +962,12 @@ struct __hc_device_param
   uint    exec_pos;
   double  exec_ms[EXEC_CACHE];
 
-  // this is "average" speed, we'll use this for benchmark and final status screen
-
-  u64     speed_cnt_total;
-  double  speed_ms_total;
-
   // this is "current" speed
 
   uint    speed_pos;
   u64     speed_cnt[SPEED_CACHE];
   double  speed_ms[SPEED_CACHE];
 
-  // speed_rec is what additionally limits the "current" speed in time, not array elements
-
-  hc_timer_t speed_rec[SPEED_CACHE];
-
   hc_timer_t timer_speed;
 
   // device specific attributes starting