arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2025-01-16 10:40:58 +00:00
Code Issues Releases Wiki Activity

Avoid sprintf

Browse Source
This commit is contained in:
Gabriele 'matrix' Gristina 2016-01-24 13:05:02 +01:00
parent 87c9afd910
commit 8d891ef0ba
3 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ext_smi.c
View File

@ -7,9 +7,9 @@
int hc_nvidia_smi (int dev, int *temperature, int *gpu) int hc_nvidia_smi (int dev, int *temperature, int *gpu)
{ {
char cmd[256]; memset (cmd, 0, sizeof (cmd)); char cmd[256] = { 0 };
sprintf (cmd, "nvidia-smi -q -g %d", dev); snprintf (cmd, sizeof (cmd) - 1, "nvidia-smi -q -g %d", dev);
FILE *fp = popen (cmd, "r"); FILE *fp = popen (cmd, "r");

17
src/oclHashcat.c
View File

@ -12690,16 +12690,11 @@ int main (int argc, char **argv)
snprintf (device_name_chksum, INFOSZ - 1, "%u-%u-%u-%s-%s-%s-%u", 32, device_param->vendor_id, device_param->vector_width, device_param->device_name, device_param->device_version, device_param->driver_version, COMPTIME); snprintf (device_name_chksum, INFOSZ - 1, "%u-%u-%u-%s-%s-%s-%u", 32, device_param->vendor_id, device_param->vector_width, device_param->device_name, device_param->device_version, device_param->driver_version, COMPTIME);
#endif #endif
uint device_name_digest[4]; uint device_name_digest[4] = { 0 };
device_name_digest[0] = 0;
device_name_digest[1] = 0;
device_name_digest[2] = 0;
device_name_digest[3] = 0;
md5_64 ((uint *) device_name_chksum, device_name_digest); md5_64 ((uint *) device_name_chksum, device_name_digest);
sprintf (device_name_chksum, "%08x", device_name_digest[0]); snprintf (device_name_chksum, INFOSZ - 1, "%08x", device_name_digest[0]);
device_param->device_name_chksum = device_name_chksum; device_param->device_name_chksum = device_name_chksum;
@ -13483,11 +13478,11 @@ int main (int argc, char **argv)
* default building options * default building options
*/ */
char build_opts[1024]; char build_opts[1024] = { 0 };
// we don't have sm_* on vendors not NV but it doesn't matter // we don't have sm_* on vendors not NV but it doesn't matter
sprintf (build_opts, "-I%s/ -DVENDOR_ID=%d -DCUDA_ARCH=%d -DVECT_SIZE=%u -DDEVICE_TYPE=%u", shared_dir, device_param->vendor_id, (device_param->sm_major * 100) + device_param->sm_minor, device_param->vector_width, (u32) device_param->device_type); snprintf (build_opts, sizeof (build_opts) - 1, "-I%s/ -DVENDOR_ID=%d -DCUDA_ARCH=%d -DVECT_SIZE=%u -DDEVICE_TYPE=%u", shared_dir, device_param->vendor_id, (device_param->sm_major * 100) + device_param->sm_minor, device_param->vector_width, (u32) device_param->device_type);
/** /**
* main kernel * main kernel
@ -13581,11 +13576,11 @@ int main (int argc, char **argv)
if (force_jit_compilation == 1500) if (force_jit_compilation == 1500)
{ {
sprintf (build_opts, "%s -DDESCRYPT_SALT=%d", build_opts, data.salts_buf[0].salt_buf[0]); snprintf (build_opts, sizeof (build_opts) - 1, "%s -DDESCRYPT_SALT=%d", build_opts, data.salts_buf[0].salt_buf[0]);
} }
else if (force_jit_compilation == 8900) else if (force_jit_compilation == 8900)
{ {
sprintf (build_opts, "%s -DSCRYPT_N=%d -DSCRYPT_R=%d -DSCRYPT_P=%d -DSCRYPT_TMTO=%d", build_opts, data.salts_buf[0].scrypt_N, data.salts_buf[0].scrypt_r, data.salts_buf[0].scrypt_p, 1 << data.salts_buf[0].scrypt_tmto); snprintf (build_opts, sizeof (build_opts) - 1, "%s -DSCRYPT_N=%d -DSCRYPT_R=%d -DSCRYPT_P=%d -DSCRYPT_TMTO=%d", build_opts, data.salts_buf[0].scrypt_N, data.salts_buf[0].scrypt_r, data.salts_buf[0].scrypt_p, 1 << data.salts_buf[0].scrypt_tmto);
} }
hc_clBuildProgram (device_param->program, 1, &device_param->device, build_opts, NULL, NULL); hc_clBuildProgram (device_param->program, 1, &device_param->device, build_opts, NULL, NULL);

20
src/shared.c
View File

@ -2607,7 +2607,7 @@ char *logfile_generate_topid ()
char *topid = (char *) mymalloc (1 + 16 + 1); char *topid = (char *) mymalloc (1 + 16 + 1);
sprintf (topid, "TOP%08x", id); snprintf (topid, 1 + 16, "TOP%08x", id);
return topid; return topid;
} }
@ -2618,7 +2618,7 @@ char *logfile_generate_subid ()
char *subid = (char *) mymalloc (1 + 16 + 1); char *subid = (char *) mymalloc (1 + 16 + 1);
sprintf (subid, "SUB%08x", id); snprintf (subid, 1 + 16, "SUB%08x", id);
return subid; return subid;
} }
@ -4130,9 +4130,9 @@ char *get_exec_path ()
#ifdef LINUX #ifdef LINUX
char tmp[32]; char tmp[32] = { 0 };
sprintf (tmp, "/proc/%d/exe", getpid ()); snprintf (tmp, sizeof (tmp) - 1, "/proc/%d/exe", getpid ());
const int len = readlink (tmp, exec_path, exec_path_len - 1); const int len = readlink (tmp, exec_path, exec_path_len - 1);
@ -4188,9 +4188,11 @@ char *get_profile_dir (const char *homedir)
{ {
#define DOT_HASHCAT ".hashcat" #define DOT_HASHCAT ".hashcat"
char *profile_dir = (char *) mymalloc (strlen (homedir) + 1 + strlen (DOT_HASHCAT) + 1); size_t len = strlen (homedir) + 1 + strlen (DOT_HASHCAT);
sprintf (profile_dir, "%s/%s", homedir, DOT_HASHCAT); char *profile_dir = (char *) mymalloc (len + 1);
snprintf (profile_dir, len, "%s/%s", homedir, DOT_HASHCAT);
return profile_dir; return profile_dir;
} }
@ -4199,9 +4201,11 @@ char *get_session_dir (const char *profile_dir)
{ {
#define SESSIONS_FOLDER "sessions" #define SESSIONS_FOLDER "sessions"
char *session_dir = (char *) mymalloc (strlen (profile_dir) + 1 + strlen (SESSIONS_FOLDER) + 1); size_t len = strlen (profile_dir) + 1 + strlen (SESSIONS_FOLDER);
sprintf (session_dir, "%s/%s", profile_dir, SESSIONS_FOLDER); char *session_dir = (char *) mymalloc (len + 1);
snprintf (session_dir, len, "%s/%s", profile_dir, SESSIONS_FOLDER);
return session_dir; return session_dir;
} }