arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2025-06-27 02:12:38 +00:00
Code Issues Releases Wiki Activity

Fix -Wmissing-declarations

Browse Source
This commit is contained in:
Rosen Penev 2016-08-30 18:13:41 -07:00
parent 88519f9437
commit ed1ad9714d
No known key found for this signature in database
GPG Key ID: 8B5A63249D3D4CE7
7 changed files with 80 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/cpu-des.h Normal file
View File

@ -0,0 +1,2 @@
void _des_keysetup (u32 data[2], u32 Kc[16], u32 Kd[16], const u32 s_skb[8][64]);
void _des_encrypt (u32 data[2], u32 Kc[16], u32 Kd[16], const u32 s_SPtrans[8][64]);

2
include/cpu-md5.h
View File

@ -1,2 +1,2 @@
void md5_64 (uint block[16], uint digest[4]); void md5_64 (uint block[16], uint digest[4]);
void md5_complete_no_limit (uint digest[4], uint *plain, uint plain_len);

1
include/cpu-sha1.h Normal file
View File

@ -0,0 +1 @@
void sha1_64 (uint block[16], uint digest[5]);

1
include/cpu-sha256.h Normal file
View File

@ -0,0 +1 @@
void sha256_64 (uint block[16], uint digest[8]);

6
include/shared.h
View File

@ -1746,17 +1746,23 @@ void *thread_device_watch (void *p);
void *thread_keypress (void *p); void *thread_keypress (void *p);
void *thread_runtime (void *p); void *thread_runtime (void *p);
void status_display ();
void status_display_machine_readable ();
/** /**
* checksum for use on cpu * checksum for use on cpu
*/ */
#include "cpu-crc32.h" #include "cpu-crc32.h"
#include "cpu-md5.h" #include "cpu-md5.h"
#include "cpu-sha1.h"
#include "cpu-sha256.h"
/** /**
* ciphers for use on cpu * ciphers for use on cpu
*/ */
#include "cpu-aes.h" #include "cpu-aes.h"
#include "cpu-des.h"
#endif // SHARED_H #endif // SHARED_H

15
src/hashcat.c
View File

@ -19,7 +19,8 @@
#include <rp_kernel_on_cpu.h> #include <rp_kernel_on_cpu.h>
#include <getopt.h> #include <getopt.h>
const char *PROGNAME = "hashcat"; static const char *PROGNAME = "hashcat";
const uint VERSION_BIN = 310; const uint VERSION_BIN = 310;
const uint RESTORE_MIN = 300; const uint RESTORE_MIN = 300;
@ -2931,9 +2932,9 @@ static int run_kernel (const uint kern_run, hc_device_param_t *device_param, con
{ {
switch (kern_run) switch (kern_run)
{ {
case KERN_RUN_1: if (device_param->exec_us_prev1[iteration] > 0) usleep ((__useconds_t)(device_param->exec_us_prev1[iteration] * device_param->nvidia_spin_damp)); break; case KERN_RUN_1: if (device_param->exec_us_prev1[iteration] > 0) usleep ((useconds_t)(device_param->exec_us_prev1[iteration] * device_param->nvidia_spin_damp)); break;
case KERN_RUN_2: if (device_param->exec_us_prev2[iteration] > 0) usleep ((__useconds_t)(device_param->exec_us_prev2[iteration] * device_param->nvidia_spin_damp)); break; case KERN_RUN_2: if (device_param->exec_us_prev2[iteration] > 0) usleep ((useconds_t)(device_param->exec_us_prev2[iteration] * device_param->nvidia_spin_damp)); break;
case KERN_RUN_3: if (device_param->exec_us_prev3[iteration] > 0) usleep ((__useconds_t)(device_param->exec_us_prev3[iteration] * device_param->nvidia_spin_damp)); break; case KERN_RUN_3: if (device_param->exec_us_prev3[iteration] > 0) usleep ((useconds_t)(device_param->exec_us_prev3[iteration] * device_param->nvidia_spin_damp)); break;
} }
} }
} }
@ -6055,7 +6056,7 @@ static void hlfmt_user (uint hashfile_format, char *line_buf, int line_len, char
} }
} }
char *strhlfmt (const uint hashfile_format) static char *strhlfmt (const uint hashfile_format)
{ {
switch (hashfile_format) switch (hashfile_format)
{ {
@ -6125,7 +6126,7 @@ static uint hlfmt_detect (FILE *fp, uint max_check)
// wrapper around mymalloc for ADL // wrapper around mymalloc for ADL
#if defined(HAVE_HWMON) #if defined(HAVE_HWMON)
void *HC_API_CALL ADL_Main_Memory_Alloc (const int iSize) static void *HC_API_CALL ADL_Main_Memory_Alloc (const int iSize)
{ {
return mymalloc (iSize); return mymalloc (iSize);
} }
@ -6182,7 +6183,7 @@ static uint generate_bitmaps (const uint digests_cnt, const uint dgst_size, cons
*/ */
#ifdef WIN #ifdef WIN
void SetConsoleWindowSize (const int x) static void SetConsoleWindowSize (const int x)
{ {
HANDLE h = GetStdHandle (STD_OUTPUT_HANDLE); HANDLE h = GetStdHandle (STD_OUTPUT_HANDLE);

120
src/shared.c
View File

@ -86,9 +86,9 @@ u64 byte_swap_64 (const u64 n)
* logging * logging
*/ */
int last_len = 0; static int last_len = 0;
int log_final (FILE *fp, const char *fmt, va_list ap) static int log_final (FILE *fp, const char *fmt, va_list ap)
{ {
if (last_len) if (last_len)
{ {
@ -229,7 +229,8 @@ int log_error (const char *fmt, ...)
* converter * converter
*/ */
u8 int_to_base32 (const u8 c) #if 0 //unused
static u8 int_to_base32 (const u8 c)
{ {
static const u8 tbl[0x20] = static const u8 tbl[0x20] =
{ {
@ -240,15 +241,16 @@ u8 int_to_base32 (const u8 c)
return tbl[c]; return tbl[c];
} }
u8 base32_to_int (const u8 c) static u8 base32_to_int (const u8 c)
{ {
if ((c >= 'A') && (c <= 'Z')) return c - 'A'; if ((c >= 'A') && (c <= 'Z')) return c - 'A';
else if ((c >= '2') && (c <= '7')) return c - '2' + 26; else if ((c >= '2') && (c <= '7')) return c - '2' + 26;
return 0; return 0;
} }
#endif
u8 int_to_itoa32 (const u8 c) static u8 int_to_itoa32 (const u8 c)
{ {
static const u8 tbl[0x20] = static const u8 tbl[0x20] =
{ {
@ -259,7 +261,7 @@ u8 int_to_itoa32 (const u8 c)
return tbl[c]; return tbl[c];
} }
u8 itoa32_to_int (const u8 c) static u8 itoa32_to_int (const u8 c)
{ {
if ((c >= '0') && (c <= '9')) return c - '0'; if ((c >= '0') && (c <= '9')) return c - '0';
else if ((c >= 'a') && (c <= 'v')) return c - 'a' + 10; else if ((c >= 'a') && (c <= 'v')) return c - 'a' + 10;
@ -267,7 +269,7 @@ u8 itoa32_to_int (const u8 c)
return 0; return 0;
} }
u8 int_to_itoa64 (const u8 c) static u8 int_to_itoa64 (const u8 c)
{ {
static const u8 tbl[0x40] = static const u8 tbl[0x40] =
{ {
@ -280,7 +282,7 @@ u8 int_to_itoa64 (const u8 c)
return tbl[c]; return tbl[c];
} }
u8 itoa64_to_int (const u8 c) static u8 itoa64_to_int (const u8 c)
{ {
static const u8 tbl[0x100] = static const u8 tbl[0x100] =
{ {
@ -305,7 +307,7 @@ u8 itoa64_to_int (const u8 c)
return tbl[c]; return tbl[c];
} }
u8 int_to_base64 (const u8 c) static u8 int_to_base64 (const u8 c)
{ {
static const u8 tbl[0x40] = static const u8 tbl[0x40] =
{ {
@ -318,7 +320,7 @@ u8 int_to_base64 (const u8 c)
return tbl[c]; return tbl[c];
} }
u8 base64_to_int (const u8 c) static u8 base64_to_int (const u8 c)
{ {
static const u8 tbl[0x100] = static const u8 tbl[0x100] =
{ {
@ -343,7 +345,7 @@ u8 base64_to_int (const u8 c)
return tbl[c]; return tbl[c];
} }
u8 int_to_bf64 (const u8 c) static u8 int_to_bf64 (const u8 c)
{ {
static const u8 tbl[0x40] = static const u8 tbl[0x40] =
{ {
@ -356,7 +358,7 @@ u8 int_to_bf64 (const u8 c)
return tbl[c]; return tbl[c];
} }
u8 bf64_to_int (const u8 c) static u8 bf64_to_int (const u8 c)
{ {
static const u8 tbl[0x100] = static const u8 tbl[0x100] =
{ {
@ -381,7 +383,7 @@ u8 bf64_to_int (const u8 c)
return tbl[c]; return tbl[c];
} }
u8 int_to_lotus64 (const u8 c) static u8 int_to_lotus64 (const u8 c)
{ {
if (c < 10) return '0' + c; if (c < 10) return '0' + c;
else if (c < 36) return 'A' + c - 10; else if (c < 36) return 'A' + c - 10;
@ -392,7 +394,7 @@ u8 int_to_lotus64 (const u8 c)
return 0; return 0;
} }
u8 lotus64_to_int (const u8 c) static u8 lotus64_to_int (const u8 c)
{ {
if ((c >= '0') && (c <= '9')) return c - '0'; if ((c >= '0') && (c <= '9')) return c - '0';
else if ((c >= 'A') && (c <= 'Z')) return c - 'A' + 10; else if ((c >= 'A') && (c <= 'Z')) return c - 'A' + 10;
@ -404,7 +406,7 @@ u8 lotus64_to_int (const u8 c)
return 0; return 0;
} }
int base32_decode (u8 (*f) (const u8), const u8 *in_buf, int in_len, u8 *out_buf) static int base32_decode (u8 (*f) (const u8), const u8 *in_buf, int in_len, u8 *out_buf)
{ {
const u8 *in_ptr = in_buf; const u8 *in_ptr = in_buf;
@ -443,7 +445,7 @@ int base32_decode (u8 (*f) (const u8), const u8 *in_buf, int in_len, u8 *out_buf
return out_len; return out_len;
} }
int base32_encode (u8 (*f) (const u8), const u8 *in_buf, int in_len, u8 *out_buf) static int base32_encode (u8 (*f) (const u8), const u8 *in_buf, int in_len, u8 *out_buf)
{ {
const u8 *in_ptr = in_buf; const u8 *in_ptr = in_buf;
@ -485,7 +487,7 @@ int base32_encode (u8 (*f) (const u8), const u8 *in_buf, int in_len, u8 *out_buf
return out_len; return out_len;
} }
int base64_decode (u8 (*f) (const u8), const u8 *in_buf, int in_len, u8 *out_buf) static int base64_decode (u8 (*f) (const u8), const u8 *in_buf, int in_len, u8 *out_buf)
{ {
const u8 *in_ptr = in_buf; const u8 *in_ptr = in_buf;
@ -518,7 +520,7 @@ int base64_decode (u8 (*f) (const u8), const u8 *in_buf, int in_len, u8 *out_buf
return out_len; return out_len;
} }
int base64_encode (u8 (*f) (const u8), const u8 *in_buf, int in_len, u8 *out_buf) static int base64_encode (u8 (*f) (const u8), const u8 *in_buf, int in_len, u8 *out_buf)
{ {
const u8 *in_ptr = in_buf; const u8 *in_ptr = in_buf;
@ -552,7 +554,7 @@ int base64_encode (u8 (*f) (const u8), const u8 *in_buf, int in_len, u8 *out_buf
return out_len; return out_len;
} }
int is_valid_hex_char (const u8 c) static int is_valid_hex_char (const u8 c)
{ {
if ((c >= '0') && (c <= '9')) return 1; if ((c >= '0') && (c <= '9')) return 1;
if ((c >= 'A') && (c <= 'F')) return 1; if ((c >= 'A') && (c <= 'F')) return 1;
@ -616,7 +618,7 @@ u64 hex_to_u64 (const u8 hex[16])
return (v); return (v);
} }
void bin_to_hex_lower (const u32 v, u8 hex[8]) static void bin_to_hex_lower (const u32 v, u8 hex[8])
{ {
hex[0] = v >> 28 & 15; hex[0] = v >> 28 & 15;
hex[1] = v >> 24 & 15; hex[1] = v >> 24 & 15;
@ -718,7 +720,7 @@ static void juniper_decrypt_hash (char *in, char *out)
AES128_decrypt_cbc (juniper_key, juniper_iv, in_ptr, out_ptr); AES128_decrypt_cbc (juniper_key, juniper_iv, in_ptr, out_ptr);
} }
void phpass_decode (u8 digest[16], u8 buf[22]) static void phpass_decode (u8 digest[16], u8 buf[22])
{ {
int l; int l;
@ -773,7 +775,7 @@ void phpass_decode (u8 digest[16], u8 buf[22])
digest[15] = (l >> 0) & 0xff; digest[15] = (l >> 0) & 0xff;
} }
void phpass_encode (u8 digest[16], u8 buf[22]) static void phpass_encode (u8 digest[16], u8 buf[22])
{ {
int l; int l;
@ -818,7 +820,7 @@ void phpass_encode (u8 digest[16], u8 buf[22])
buf[21] = int_to_itoa64 (l & 0x3f); buf[21] = int_to_itoa64 (l & 0x3f);
} }
void md5crypt_decode (u8 digest[16], u8 buf[22]) static void md5crypt_decode (u8 digest[16], u8 buf[22])
{ {
int l; int l;
@ -873,7 +875,7 @@ void md5crypt_decode (u8 digest[16], u8 buf[22])
digest[11] = (l >> 0) & 0xff; digest[11] = (l >> 0) & 0xff;
} }
void md5crypt_encode (u8 digest[16], u8 buf[22]) static void md5crypt_encode (u8 digest[16], u8 buf[22])
{ {
int l; int l;
@ -918,7 +920,7 @@ void md5crypt_encode (u8 digest[16], u8 buf[22])
buf[21] = int_to_itoa64 (l & 0x3f); l >>= 6; buf[21] = int_to_itoa64 (l & 0x3f); l >>= 6;
} }
void sha512crypt_decode (u8 digest[64], u8 buf[86]) static void sha512crypt_decode (u8 digest[64], u8 buf[86])
{ {
int l; int l;
@ -1117,7 +1119,7 @@ void sha512crypt_decode (u8 digest[64], u8 buf[86])
digest[63] = (l >> 0) & 0xff; digest[63] = (l >> 0) & 0xff;
} }
void sha512crypt_encode (u8 digest[64], u8 buf[86]) static void sha512crypt_encode (u8 digest[64], u8 buf[86])
{ {
int l; int l;
@ -1274,7 +1276,7 @@ void sha512crypt_encode (u8 digest[64], u8 buf[86])
buf[85] = int_to_itoa64 (l & 0x3f); l >>= 6; buf[85] = int_to_itoa64 (l & 0x3f); l >>= 6;
} }
void sha1aix_decode (u8 digest[20], u8 buf[27]) static void sha1aix_decode (u8 digest[20], u8 buf[27])
{ {
int l; int l;
@ -1340,7 +1342,7 @@ void sha1aix_decode (u8 digest[20], u8 buf[27])
digest[18] = (l >> 16) & 0xff; digest[18] = (l >> 16) & 0xff;
} }
void sha1aix_encode (u8 digest[20], u8 buf[27]) static void sha1aix_encode (u8 digest[20], u8 buf[27])
{ {
int l; int l;
@ -1393,7 +1395,7 @@ void sha1aix_encode (u8 digest[20], u8 buf[27])
buf[26] = int_to_itoa64 (l & 0x3f); buf[26] = int_to_itoa64 (l & 0x3f);
} }
void sha256aix_decode (u8 digest[32], u8 buf[43]) static void sha256aix_decode (u8 digest[32], u8 buf[43])
{ {
int l; int l;
@ -1496,7 +1498,7 @@ void sha256aix_decode (u8 digest[32], u8 buf[43])
digest[30] = (l >> 16) & 0xff; digest[30] = (l >> 16) & 0xff;
} }
void sha256aix_encode (u8 digest[32], u8 buf[43]) static void sha256aix_encode (u8 digest[32], u8 buf[43])
{ {
int l; int l;
@ -1577,7 +1579,7 @@ void sha256aix_encode (u8 digest[32], u8 buf[43])
buf[42] = int_to_itoa64 (l & 0x3f); buf[42] = int_to_itoa64 (l & 0x3f);
} }
void sha512aix_decode (u8 digest[64], u8 buf[86]) static void sha512aix_decode (u8 digest[64], u8 buf[86])
{ {
int l; int l;
@ -1776,7 +1778,7 @@ void sha512aix_decode (u8 digest[64], u8 buf[86])
digest[63] = (l >> 16) & 0xff; digest[63] = (l >> 16) & 0xff;
} }
void sha512aix_encode (u8 digest[64], u8 buf[86]) static void sha512aix_encode (u8 digest[64], u8 buf[86])
{ {
int l; int l;
@ -1933,7 +1935,7 @@ void sha512aix_encode (u8 digest[64], u8 buf[86])
buf[85] = int_to_itoa64 (l & 0x3f); l >>= 6; buf[85] = int_to_itoa64 (l & 0x3f); l >>= 6;
} }
void sha256crypt_decode (u8 digest[32], u8 buf[43]) static void sha256crypt_decode (u8 digest[32], u8 buf[43])
{ {
int l; int l;
@ -2035,7 +2037,7 @@ void sha256crypt_decode (u8 digest[32], u8 buf[43])
digest[30] = (l >> 0) & 0xff; digest[30] = (l >> 0) & 0xff;
} }
void sha256crypt_encode (u8 digest[32], u8 buf[43]) static void sha256crypt_encode (u8 digest[32], u8 buf[43])
{ {
int l; int l;
@ -2116,7 +2118,7 @@ void sha256crypt_encode (u8 digest[32], u8 buf[43])
buf[42] = int_to_itoa64 (l & 0x3f); buf[42] = int_to_itoa64 (l & 0x3f);
} }
void drupal7_decode (u8 digest[64], u8 buf[44]) static void drupal7_decode (u8 digest[64], u8 buf[44])
{ {
int l; int l;
@ -2252,7 +2254,7 @@ void drupal7_decode (u8 digest[64], u8 buf[44])
digest[63] = 0; digest[63] = 0;
} }
void drupal7_encode (u8 digest[64], u8 buf[43]) static void drupal7_encode (u8 digest[64], u8 buf[43])
{ {
int l; int l;
@ -2342,7 +2344,7 @@ void drupal7_encode (u8 digest[64], u8 buf[43])
static struct termios savemodes; static struct termios savemodes;
static int havemodes = 0; static int havemodes = 0;
int tty_break() static int tty_break()
{ {
struct termios modmodes; struct termios modmodes;
@ -2358,7 +2360,7 @@ int tty_break()
return tcsetattr (fileno (stdin), TCSANOW, &modmodes); return tcsetattr (fileno (stdin), TCSANOW, &modmodes);
} }
int tty_getchar() static int tty_getchar()
{ {
fd_set rfds; fd_set rfds;
@ -2379,7 +2381,7 @@ int tty_getchar()
return getchar(); return getchar();
} }
int tty_fix() static int tty_fix()
{ {
if (!havemodes) return 0; if (!havemodes) return 0;
@ -2439,7 +2441,7 @@ int tty_fix()
#ifdef WIN #ifdef WIN
static DWORD saveMode = 0; static DWORD saveMode = 0;
int tty_break() static int tty_break()
{ {
HANDLE stdinHandle = GetStdHandle (STD_INPUT_HANDLE); HANDLE stdinHandle = GetStdHandle (STD_INPUT_HANDLE);
@ -2449,7 +2451,7 @@ int tty_break()
return 0; return 0;
} }
int tty_getchar() static int tty_getchar()
{ {
HANDLE stdinHandle = GetStdHandle (STD_INPUT_HANDLE); HANDLE stdinHandle = GetStdHandle (STD_INPUT_HANDLE);
@ -2489,7 +2491,7 @@ int tty_getchar()
return 0; return 0;
} }
int tty_fix() static int tty_fix()
{ {
HANDLE stdinHandle = GetStdHandle (STD_INPUT_HANDLE); HANDLE stdinHandle = GetStdHandle (STD_INPUT_HANDLE);
@ -2569,7 +2571,7 @@ char *mystrdup (const char *s)
return (b); return (b);
} }
FILE *logfile_open (char *logfile) static FILE *logfile_open (char *logfile)
{ {
FILE *fp = fopen (logfile, "ab"); FILE *fp = fopen (logfile, "ab");
@ -2581,7 +2583,7 @@ FILE *logfile_open (char *logfile)
return fp; return fp;
} }
void logfile_close (FILE *fp) static void logfile_close (FILE *fp)
{ {
if (fp == stdout) return; if (fp == stdout) return;
@ -2609,7 +2611,7 @@ void logfile_append (const char *fmt, ...)
logfile_close (fp); logfile_close (fp);
} }
int logfile_generate_id () static int logfile_generate_id ()
{ {
const int n = rand (); const int n = rand ();
@ -2834,7 +2836,7 @@ void hm_get_opencl_busid_devid (hm_attrs_t *hm_device, uint opencl_num_devices,
} }
*/ */
void hm_sort_adl_adapters_by_busid_devid (u32 *valid_adl_device_list, int num_adl_adapters, LPAdapterInfo lpAdapterInfo) static void hm_sort_adl_adapters_by_busid_devid (u32 *valid_adl_device_list, int num_adl_adapters, LPAdapterInfo lpAdapterInfo)
{ {
// basically bubble sort // basically bubble sort
@ -3562,7 +3564,7 @@ void mp_css_to_uniq_tbl (uint css_cnt, cs_t *css, uint uniq_tbls[SP_PW_MAX][CHAR
} }
} }
void mp_add_cs_buf (uint *in_buf, size_t in_len, cs_t *css, int css_cnt) static void mp_add_cs_buf (uint *in_buf, size_t in_len, cs_t *css, int css_cnt)
{ {
cs_t *cs = &css[css_cnt]; cs_t *cs = &css[css_cnt];
@ -3597,7 +3599,7 @@ void mp_add_cs_buf (uint *in_buf, size_t in_len, cs_t *css, int css_cnt)
myfree (css_uniq); myfree (css_uniq);
} }
void mp_expand (char *in_buf, size_t in_len, cs_t *mp_sys, cs_t *mp_usr, int mp_usr_offset, int interpret) static void mp_expand (char *in_buf, size_t in_len, cs_t *mp_sys, cs_t *mp_usr, int mp_usr_offset, int interpret)
{ {
size_t in_pos; size_t in_pos;
@ -5036,7 +5038,7 @@ int sort_by_digest_p0p1 (const void *v1, const void *v2)
return 0; return 0;
} }
int sort_by_tuning_db_alias (const void *v1, const void *v2) static int sort_by_tuning_db_alias (const void *v1, const void *v2)
{ {
const tuning_db_alias_t *t1 = (const tuning_db_alias_t *) v1; const tuning_db_alias_t *t1 = (const tuning_db_alias_t *) v1;
const tuning_db_alias_t *t2 = (const tuning_db_alias_t *) v2; const tuning_db_alias_t *t2 = (const tuning_db_alias_t *) v2;
@ -5048,7 +5050,7 @@ int sort_by_tuning_db_alias (const void *v1, const void *v2)
return 0; return 0;
} }
int sort_by_tuning_db_entry (const void *v1, const void *v2) static int sort_by_tuning_db_entry (const void *v1, const void *v2)
{ {
const tuning_db_entry_t *t1 = (const tuning_db_entry_t *) v1; const tuning_db_entry_t *t1 = (const tuning_db_entry_t *) v1;
const tuning_db_entry_t *t2 = (const tuning_db_entry_t *) v2; const tuning_db_entry_t *t2 = (const tuning_db_entry_t *) v2;
@ -9200,7 +9202,7 @@ void to_hccap_t (hccap_t *hccap, uint salt_pos, uint digest_pos)
} }
} }
void SuspendThreads () static void SuspendThreads ()
{ {
if (data.devices_status != STATUS_RUNNING) return; if (data.devices_status != STATUS_RUNNING) return;
@ -9211,7 +9213,7 @@ void SuspendThreads ()
log_info ("Paused"); log_info ("Paused");
} }
void ResumeThreads () static void ResumeThreads ()
{ {
if (data.devices_status != STATUS_PAUSED) return; if (data.devices_status != STATUS_PAUSED) return;
@ -9226,14 +9228,14 @@ void ResumeThreads ()
log_info ("Resumed"); log_info ("Resumed");
} }
void bypass () static void bypass ()
{ {
data.devices_status = STATUS_BYPASS; data.devices_status = STATUS_BYPASS;
log_info ("Next dictionary / mask in queue selected, bypassing current one"); log_info ("Next dictionary / mask in queue selected, bypassing current one");
} }
void stop_at_checkpoint () static void stop_at_checkpoint ()
{ {
if (data.devices_status != STATUS_STOP_AT_CHECKPOINT) if (data.devices_status != STATUS_STOP_AT_CHECKPOINT)
{ {
@ -9971,7 +9973,7 @@ tuning_db_entry_t *tuning_db_search (tuning_db_t *tuning_db, hc_device_param_t *
* parser * parser
*/ */
uint parse_and_store_salt (char *out, char *in, uint salt_len) static uint parse_and_store_salt (char *out, char *in, uint salt_len)
{ {
u8 tmp[256] = { 0 }; u8 tmp[256] = { 0 };
@ -11315,7 +11317,7 @@ int md5asa_parse_hash (char *input_buf, uint input_len, hash_t *hash_buf)
return (PARSER_OK); return (PARSER_OK);
} }
void transform_netntlmv1_key (const u8 *nthash, u8 *key) static void transform_netntlmv1_key (const u8 *nthash, u8 *key)
{ {
key[0] = (nthash[0] >> 0); key[0] = (nthash[0] >> 0);
key[1] = (nthash[0] << 7) | (nthash[1] >> 1); key[1] = (nthash[0] << 7) | (nthash[1] >> 1);
@ -20999,7 +21001,7 @@ bool class_alpha (const u8 c)
return (class_lower (c) || class_upper (c)); return (class_lower (c) || class_upper (c));
} }
int conv_ctoi (const u8 c) static int conv_ctoi (const u8 c)
{ {
if (class_num (c)) if (class_num (c))
{ {
@ -21013,7 +21015,7 @@ int conv_ctoi (const u8 c)
return -1; return -1;
} }
int conv_itoc (const u8 c) static int conv_itoc (const u8 c)
{ {
if (c < 10) if (c < 10)
{ {
@ -21696,7 +21698,7 @@ int mangle_insert (char arr[BLOCK_SIZE], int arr_len, int upos, char c)
return (arr_len + 1); return (arr_len + 1);
} }
int mangle_insert_multi (char arr[BLOCK_SIZE], int arr_len, int arr_pos, char arr2[BLOCK_SIZE], int arr2_len, int arr2_pos, int arr2_cpy) static int mangle_insert_multi (char arr[BLOCK_SIZE], int arr_len, int arr_pos, char arr2[BLOCK_SIZE], int arr2_len, int arr2_pos, int arr2_cpy)
{ {
if ((arr_len + arr2_cpy) > BLOCK_SIZE) return (RULE_RC_REJECT_ERROR); if ((arr_len + arr2_cpy) > BLOCK_SIZE) return (RULE_RC_REJECT_ERROR);