int last_len = 0;
-void log_final (FILE *fp, const char *fmt, va_list ap)
+int log_final (FILE *fp, const char *fmt, va_list ap)
{
if (last_len)
{
fflush (fp);
last_len = len;
+
+ return len;
}
-void log_out_nn (FILE *fp, const char *fmt, ...)
+int log_out_nn (FILE *fp, const char *fmt, ...)
{
- if (SUPPRESS_OUTPUT) return;
+ if (SUPPRESS_OUTPUT) return 0;
va_list ap;
va_start (ap, fmt);
- log_final (fp, fmt, ap);
+ const int len = log_final (fp, fmt, ap);
va_end (ap);
+
+ return len;
}
-void log_info_nn (const char *fmt, ...)
+int log_info_nn (const char *fmt, ...)
{
- if (SUPPRESS_OUTPUT) return;
+ if (SUPPRESS_OUTPUT) return 0;
va_list ap;
va_start (ap, fmt);
- log_final (stdout, fmt, ap);
+ const int len = log_final (stdout, fmt, ap);
va_end (ap);
+
+ return len;
}
-void log_error_nn (const char *fmt, ...)
+int log_error_nn (const char *fmt, ...)
{
- if (SUPPRESS_OUTPUT) return;
+ if (SUPPRESS_OUTPUT) return 0;
va_list ap;
va_start (ap, fmt);
- log_final (stderr, fmt, ap);
+ const int len = log_final (stderr, fmt, ap);
va_end (ap);
+
+ return len;
}
-void log_out (FILE *fp, const char *fmt, ...)
+int log_out (FILE *fp, const char *fmt, ...)
{
- if (SUPPRESS_OUTPUT) return;
+ if (SUPPRESS_OUTPUT) return 0;
va_list ap;
va_start (ap, fmt);
- log_final (fp, fmt, ap);
+ const int len = log_final (fp, fmt, ap);
va_end (ap);
fputc ('\n', fp);
last_len = 0;
+
+ return len;
}
-void log_info (const char *fmt, ...)
+int log_info (const char *fmt, ...)
{
- if (SUPPRESS_OUTPUT) return;
+ if (SUPPRESS_OUTPUT) return 0;
va_list ap;
va_start (ap, fmt);
- log_final (stdout, fmt, ap);
+ const int len = log_final (stdout, fmt, ap);
va_end (ap);
fputc ('\n', stdout);
last_len = 0;
+
+ return len;
}
-void log_error (const char *fmt, ...)
+int log_error (const char *fmt, ...)
{
- if (SUPPRESS_OUTPUT) return;
+ if (SUPPRESS_OUTPUT) return 0;
fputc ('\n', stderr);
fputc ('\n', stderr);
va_start (ap, fmt);
- log_final (stderr, fmt, ap);
+ const int len = log_final (stderr, fmt, ap);
va_end (ap);
fputc ('\n', stderr);
last_len = 0;
+
+ return len;
}
/**
{
if (errno != EINTR)
{
- log_error ("ERROR: failed acquiring write lock: %s", strerror (errno));
+ log_error ("ERROR: Failed acquiring write lock: %s", strerror (errno));
exit (-1);
}
}
#endif // F_SETLKW
-#ifdef _WIN
+#ifdef WIN
void fsync (int fd)
{
HANDLE h = (HANDLE) _get_osfhandle (fd);
if (data.devices_param[device_id].device_vendor_id == VENDOR_ID_NV)
{
- #if defined(LINUX)
- return 0;
- #endif
-
- #if defined(WIN)
return 1;
- #endif
}
}
return -1;
}
+int hm_set_fanspeed_with_device_id_nvapi (const uint device_id, const int fanspeed, const int fanpolicy)
+{
+ if (data.hm_device[device_id].fan_set_supported == 1)
+ {
+ if (data.hm_nvapi)
+ {
+ NV_GPU_COOLER_LEVELS CoolerLevels = { 0 };
+
+ CoolerLevels.Version = GPU_COOLER_LEVELS_VER | sizeof (NV_GPU_COOLER_LEVELS);
+
+ CoolerLevels.Levels[0].Level = fanspeed;
+ CoolerLevels.Levels[0].Policy = fanpolicy;
+
+ if (hm_NvAPI_GPU_SetCoolerLevels (data.hm_nvapi, data.hm_device[device_id].nvapi, 0, &CoolerLevels) != NVAPI_OK) return -1;
+
+ return 0;
+ }
+ }
+
+ return -1;
+}
+
+int hm_set_fanspeed_with_device_id_xnvctrl (const uint device_id, const int fanspeed)
+{
+ if (data.hm_device[device_id].fan_set_supported == 1)
+ {
+ if (data.hm_xnvctrl)
+ {
+ if (set_fan_speed_target (data.hm_xnvctrl, data.hm_device[device_id].xnvctrl, fanspeed) != 0) return -1;
+
+ return 0;
+ }
+ }
+
+ return -1;
+}
+
#endif // HAVE_HWMON
/**
if (css_cnt > SP_PW_MAX)
{
- log_error ("ERROR: mask length is too long");
+ log_error ("ERROR: Mask length is too long");
exit (-1);
}
if (in_pos == in_len)
{
- log_error ("ERROR: the hex-charset option always expects couples of exactly 2 hexadecimal chars, failed mask: %s", in_buf);
+ log_error ("ERROR: The hex-charset option always expects couples of exactly 2 hexadecimal chars, failed mask: %s", in_buf);
exit (-1);
}
if ((is_valid_hex_char (p0) == 0) || (is_valid_hex_char (p1) == 0))
{
- log_error ("ERROR: invalid hex character detected in mask %s", in_buf);
+ log_error ("ERROR: Invalid hex character detected in mask %s", in_buf);
exit (-1);
}
break;
case '?': mp_add_cs_buf (&chr, 1, css, css_pos);
break;
- default: log_error ("ERROR: syntax error: %s", mask_buf);
+ default: log_error ("ERROR: Syntax error: %s", mask_buf);
exit (-1);
}
}
if (mask_pos == mask_len)
{
- log_error ("ERROR: the hex-charset option always expects couples of exactly 2 hexadecimal chars, failed mask: %s", mask_buf);
+ log_error ("ERROR: The hex-charset option always expects couples of exactly 2 hexadecimal chars, failed mask: %s", mask_buf);
exit (-1);
}
if ((is_valid_hex_char (p0) == 0) || (is_valid_hex_char (p1) == 0))
{
- log_error ("ERROR: invalid hex character detected in mask %s", mask_buf);
+ log_error ("ERROR: Invalid hex character detected in mask %s", mask_buf);
exit (-1);
}
if (css_pos == 0)
{
- log_error ("ERROR: invalid mask length (0)");
+ log_error ("ERROR: Invalid mask length (0)");
exit (-1);
}
if (len == 0)
{
- log_info ("WARNING: charset file corrupted");
+ log_info ("WARNING: Charset file corrupted");
mp_expand (buf, strlen (buf), mp_sys, mp_usr, index, 1);
}
if (mask_pos == mask_len)
{
- log_error ("ERROR: the hex-charset option always expects couples of exactly 2 hexadecimal chars, failed mask: %s", mask_buf);
+ log_error ("ERROR: The hex-charset option always expects couples of exactly 2 hexadecimal chars, failed mask: %s", mask_buf);
exit (-1);
}
if ((is_valid_hex_char (p0) == 0) || (is_valid_hex_char (p1) == 0))
{
- log_error ("ERROR: invalid hex character detected in mask: %s", mask_buf);
+ log_error ("ERROR: Invalid hex character detected in mask: %s", mask_buf);
exit (-1);
}
void set_cpu_affinity (char *cpu_affinity)
{
- #ifdef WIN
+ #ifdef _WIN
DWORD_PTR aff_mask = 0;
#elif _POSIX
cpu_set_t cpuset;
if (cpu_id == 0)
{
- #ifdef WIN
+ #ifdef _WIN
aff_mask = 0;
#elif _POSIX
CPU_ZERO (&cpuset);
if (cpu_id > 32)
{
- log_error ("ERROR: invalid cpu_id %u specified", cpu_id);
+ log_error ("ERROR: Invalid cpu_id %u specified", cpu_id);
exit (-1);
}
- #ifdef WIN
+ #ifdef _WIN
aff_mask |= 1 << (cpu_id - 1);
#elif _POSIX
CPU_SET ((cpu_id - 1), &cpuset);
free (devices);
}
- #ifdef WIN
+ #ifdef _WIN
SetProcessAffinityMask (GetCurrentProcess (), aff_mask);
SetThreadAffinityMask (GetCurrentThread (), aff_mask);
#elif _POSIX
dictstat_t *d1 = (dictstat_t *) s1;
dictstat_t *d2 = (dictstat_t *) s2;
- #ifdef LINUX
+ #ifdef _LINUX
d2->stat.st_atim = d1->stat.st_atim;
#else
d2->stat.st_atime = d1->stat.st_atime;
if (platform < 1 || platform > 32)
{
- log_error ("ERROR: invalid OpenCL platform %u specified", platform);
+ log_error ("ERROR: Invalid OpenCL platform %u specified", platform);
exit (-1);
}
if (device_id < 1 || device_id > 32)
{
- log_error ("ERROR: invalid device_id %u specified", device_id);
+ log_error ("ERROR: Invalid device_id %u specified", device_id);
exit (-1);
}
if (device_type < 1 || device_type > 3)
{
- log_error ("ERROR: invalid device_type %u specified", device_type);
+ log_error ("ERROR: Invalid device_type %u specified", device_type);
exit (-1);
}
case 141: return ((char *) HT_00141); break;
case 150: return ((char *) HT_00150); break;
case 160: return ((char *) HT_00160); break;
- case 190: return ((char *) HT_00190); break;
case 200: return ((char *) HT_00200); break;
case 300: return ((char *) HT_00300); break;
case 400: return ((char *) HT_00400); break;
if (data.restore_disable == 1)
{
- log_info ("WARNING: this feature is disabled when --restore-disable was specified");
+ log_info ("WARNING: This feature is disabled when --restore-disable is specified");
return;
}
data.checkpoint_cur_words = get_lowest_words_done ();
- log_info ("Checkpoint enabled: will quit at next Restore Point update");
+ log_info ("Checkpoint enabled: Will quit at next Restore Point update");
}
else
{
data.devices_status = STATUS_QUIT;
}
+void naive_escape (const char *cpath_real, char *cpath_escaped, const size_t cpath_escaped_len)
+{
+ const size_t len = strlen (cpath_real);
+
+ for (size_t in = 0, out = 0; in < len; in++, out++)
+ {
+ const u8 c = cpath_real[in];
+
+ if (c == ' ')
+ {
+ cpath_escaped[out] = '\\';
+
+ out++;
+ }
+
+ if (out == cpath_escaped_len) break;
+
+ cpath_escaped[out] = c;
+ }
+}
+
void load_kernel (const char *kernel_file, int num_devices, size_t *kernel_lengths, const u8 **kernel_sources)
{
FILE *fp = fopen (kernel_file, "rb");
if (nread != 1)
{
- log_error ("ERROR: cannot read %s", data.eff_restore_file);
+ log_error ("ERROR: Cannot read %s", data.eff_restore_file);
exit (-1);
}
if (strcmp (argv0_r, pidbin_r) == 0)
{
- log_error ("ERROR: already an instance %s running on pid %d", pidbin, rd->pid);
+ log_error ("ERROR: Already an instance %s running on pid %d", pidbin, rd->pid);
exit (-1);
}
{
if (strcmp (pidbin, pidbin2) == 0)
{
- log_error ("ERROR: already an instance %s running on pid %d", pidbin2, rd->pid);
+ log_error ("ERROR: Already an instance %s running on pid %d", pidbin2, rd->pid);
exit (-1);
}
if (rd->version_bin < RESTORE_MIN)
{
- log_error ("ERROR: cannot use outdated %s. Please remove it.", data.eff_restore_file);
+ log_error ("ERROR: Cannot use outdated %s. Please remove it.", data.eff_restore_file);
exit (-1);
}
if (fp == NULL)
{
- log_error ("ERROR: restore file '%s': %s", eff_restore_file, strerror (errno));
+ log_error ("ERROR: Restore file '%s': %s", eff_restore_file, strerror (errno));
exit (-1);
}
if (fread (rd, sizeof (restore_data_t), 1, fp) != 1)
{
- log_error ("ERROR: cannot read %s", eff_restore_file);
+ log_error ("ERROR: Can't read %s", eff_restore_file);
exit (-1);
}
{
if (fgets (buf, HCBUFSIZ - 1, fp) == NULL)
{
- log_error ("ERROR: cannot read %s", eff_restore_file);
+ log_error ("ERROR: Can't read %s", eff_restore_file);
exit (-1);
}
{
if (unlink (eff_restore_file))
{
- log_info ("WARN: unlink file '%s': %s", eff_restore_file, strerror (errno));
+ log_info ("WARN: Unlink file '%s': %s", eff_restore_file, strerror (errno));
}
}
if (rename (new_restore_file, eff_restore_file))
{
- log_info ("WARN: rename file '%s' to '%s': %s", new_restore_file, eff_restore_file, strerror (errno));
+ log_info ("WARN: Rename file '%s' to '%s': %s", new_restore_file, eff_restore_file, strerror (errno));
}
}
if (salt_len > 36)
{
- log_info ("WARNING: the length of the ESSID is too long. The hccap file may be invalid or corrupted");
+ log_info ("WARNING: The ESSID length is too long, the hccap file may be invalid or corrupted");
return (PARSER_SALT_LENGTH);
}
return (PARSER_OK);
}
-int sha1linkedin_parse_hash (char *input_buf, uint input_len, hash_t *hash_buf)
-{
- if ((input_len < DISPLAY_LEN_MIN_100) || (input_len > DISPLAY_LEN_MAX_100)) return (PARSER_GLOBAL_LENGTH);
-
- u32 *digest = (u32 *) hash_buf->digest;
-
- digest[0] = hex_to_u32 ((const u8 *) &input_buf[ 0]);
- digest[1] = hex_to_u32 ((const u8 *) &input_buf[ 8]);
- digest[2] = hex_to_u32 ((const u8 *) &input_buf[16]);
- digest[3] = hex_to_u32 ((const u8 *) &input_buf[24]);
- digest[4] = hex_to_u32 ((const u8 *) &input_buf[32]);
-
- return (PARSER_OK);
-}
-
int sha1axcrypt_parse_hash (char *input_buf, uint input_len, hash_t *hash_buf)
{
if ((input_len < DISPLAY_LEN_MIN_13300) || (input_len > DISPLAY_LEN_MAX_13300)) return (PARSER_GLOBAL_LENGTH);
pstoken->pc_offset = 0;
- for (int i = 0; i < (int) pstoken->salt_len - 64; i += 64)
+ for (int i = 0; i < (int) pstoken->salt_len - 63; i += 64)
{
uint w[16];
if (memcmp (directive_pos, "MD5", 3))
{
- log_info ("ERROR: only the MD5 directive is currently supported\n");
+ log_info ("ERROR: Only the MD5 directive is currently supported\n");
myfree (temp_input_buf);
projects / hashcat.git / blobdiff