3535#define UNICODE
3636#define _UNICODE
3737
38+ #ifdef _MSC_VER
39+ char * stpcpy (char * dst , const char * src ) {
40+ strcpy (dst , src );
41+ return dst + strlen (dst );
42+ }
43+ #endif
44+
3845char * rexgen_alphabets [256 ];
46+ static c_iterator_ptr iter = NULL ;
47+ static c_regex_ptr regex_ptr = NULL ;
48+ static char * save_str ;
49+ static const char * cur_regex , * save_regex ;
50+ static char * restore_str , * restore_regex ;
51+ static int save_str_len ;
3952
4053static void fix_state (void )
4154{
@@ -50,6 +63,52 @@ static void save_state(FILE *file)
5063{
5164}
5265
66+ int rexgen_restore_state_hybrid (const char * sig , FILE * file )
67+ {
68+ if (!strncmp (sig , "rex-v1" , 6 ))
69+ {
70+ int len , ret ;
71+ ret = fscanf (file , "%d\n" , & len );
72+ if (ret != 1 ) return 1 ;
73+ restore_regex = mem_alloc_tiny (len + 2 , 8 );
74+ fgetl (restore_regex , len + 1 , file );
75+ ret = fscanf (file , "%d\n" , & len );
76+ if (ret != 1 ) return 1 ;
77+ restore_str = mem_alloc_tiny (len + 2 , 8 );
78+ fgetl (restore_str , len + 1 , file );
79+ log_event ("resuming a regex expr or %s and state of %s\n" , restore_regex , restore_str );
80+ return 0 ;
81+ }
82+ return 1 ;
83+ }
84+
85+ static void save_state_hybrid (FILE * file )
86+ {
87+ if (save_str && strlen (save_str )) {
88+ fprintf (file , "rex-v1\n" );
89+ fprintf (file , "%d\n" , (int )strlen (save_regex ));
90+ fprintf (file , "%s\n" , save_regex );
91+ fprintf (file , "%d\n" , (int )strlen (save_str ));
92+ fprintf (file , "%s\n" , save_str );
93+ }
94+ }
95+
96+ static void rex_hybrid_fix_state ()
97+ {
98+ char * dstptr = 0 ;
99+ if (iter )
100+ c_iterator_get_state (iter , & dstptr );
101+ if (dstptr ) {
102+ if (strlen (dstptr ) > save_str_len ) {
103+ save_str_len = strlen (dstptr )+ 256 ;
104+ MEM_FREE (save_str );
105+ save_str = mem_alloc (save_str_len + 1 );
106+ }
107+ strcpy (save_str , dstptr );
108+ save_regex = cur_regex ;
109+ }
110+ }
111+
53112static int restore_state (FILE * file )
54113{
55114 return 0 ;
@@ -76,6 +135,7 @@ static void rexgen_setlocale()
76135 }
77136}
78137
138+ // Would be nice to have SOME way to be thread safe!!!
79139static char BaseWord [1024 ];
80140
81141size_t callback (char * dst , const size_t buffer_size )
@@ -134,24 +194,39 @@ int do_regex_hybrid_crack(struct db_main *db, const char *regex,
134194 const char * base_word , int regex_case , const char * regex_alpha )
135195{
136196 c_simplestring_ptr buffer = c_simplestring_new ();
137- c_iterator_ptr iter = NULL ;
138- c_regex_ptr regex_ptr = NULL ;
139197 char word [PLAINTEXT_BUFFER_SIZE ];
140198 static int bFirst = 1 ;
141199 static int bALPHA = 0 ;
142200 int max_len = db -> format -> params .plaintext_length ;
143201 int retval ;
144202
203+ cur_regex = regex ;
145204 if (options .req_maxlength )
146205 max_len = options .req_maxlength ;
147206
207+ strcpy (BaseWord , base_word );
148208 if (bFirst ) {
149209 bFirst = 0 ;
150210 rexgen_setlocale ();
151211 if (regex_alpha && !strncmp (regex_alpha , "alpha" , 5 )) {
152212 bALPHA = 1 ;
153213 SetupAlpha (regex_alpha );
154214 }
215+ rec_init_hybrid (save_state_hybrid );
216+ crk_set_hybrid_fix_state_func_ptr (rex_hybrid_fix_state );
217+
218+ regex_ptr = c_regex_cb (regex , callback );
219+ if (!regex_ptr ) {
220+ c_simplestring_delete (buffer );
221+ fprintf (stderr ,
222+ "Error, invalid regex expression. John exiting now base_word=%s Regex= %s\n" ,
223+ base_word , regex );
224+ error ();
225+ }
226+ iter = c_regex_iterator (regex_ptr );
227+
228+ if (restore_str )
229+ c_iterator_set_state (iter , restore_str );
155230 }
156231
157232 if (bALPHA ) {
@@ -190,7 +265,6 @@ int do_regex_hybrid_crack(struct db_main *db, const char *regex,
190265 }
191266 }
192267
193- strcpy (BaseWord , base_word );
194268 if (!regex [0 ]) {
195269 if (options .mask ) {
196270 if (do_mask_crack (fmt_null_key )) {
@@ -208,15 +282,6 @@ int do_regex_hybrid_crack(struct db_main *db, const char *regex,
208282 goto out ;
209283 }
210284
211- regex_ptr = c_regex_cb (regex , callback );
212- if (!regex_ptr ) {
213- c_simplestring_delete (buffer );
214- fprintf (stderr ,
215- "Error, invalid regex expression. John exiting now base_word=%s Regex= %s\n" ,
216- base_word , regex );
217- error ();
218- }
219- iter = c_regex_iterator (regex_ptr );
220285 while (c_iterator_next (iter )) {
221286 c_iterator_value (iter , buffer );
222287 c_simplestring_to_utf8_string (buffer , & word [0 ], sizeof (word ));
@@ -240,38 +305,37 @@ int do_regex_hybrid_crack(struct db_main *db, const char *regex,
240305
241306out :
242307 c_simplestring_delete (buffer );
243- c_regex_delete (regex_ptr );
244- c_iterator_delete (iter );
245308 return retval ;
246309}
247310
248311void do_regex_crack (struct db_main * db , const char * regex )
249312{
250313 c_simplestring_ptr buffer = c_simplestring_new ();
251- c_iterator_ptr iter = NULL ;
252- c_regex_ptr regex_ptr = NULL ;
253314 char word [PLAINTEXT_BUFFER_SIZE ];
254315 int max_len = db -> format -> params .plaintext_length ;
255316
256317 if (options .req_maxlength )
257318 max_len = options .req_maxlength ;
258319
259- if (john_main_process )
260- fprintf (stderr , "Warning: regex mode currently can't be "
261- "resumed if aborted\n" );
262-
320+ cur_regex = regex ;
263321 rexgen_setlocale ();
264322 status_init (& get_progress , 0 );
265323 rec_restore_mode (restore_state );
266324 rec_init (db , save_state );
267325 crk_init (db , fix_state , NULL );
326+ rec_init_hybrid (save_state_hybrid );
327+
268328 regex_ptr = c_regex_cb (regex , callback );
269329 if (!regex_ptr ) {
270330 fprintf (stderr ,
271331 "Error, invalid regex expression. John exiting now\n" );
272332 error ();
273333 }
274334 iter = c_regex_iterator (regex_ptr );
335+ if (restore_str ) {
336+ c_iterator_set_state (iter , restore_str );
337+ restore_str = 0 ;
338+ }
275339 while (c_iterator_next (iter )) {
276340 c_iterator_value (iter , buffer );
277341 c_simplestring_to_utf8_string (buffer , & word [0 ], sizeof (word ));
0 commit comments