arno
/
hashcat
mirror of https://github.com/hashcat/hashcat.git
1
0
Fork 0
Code Issues Releases Wiki Activity

cosmetic: minor code style fixes

Browse Source
pull/2448/head
philsmd 4 years ago
parent 323e7463b8
commit e59f61e8cf
No known key found for this signature in database
GPG Key ID: 4F25D016D9D6A8AF
120 changed files with 892 additions and 885 deletions
Show Stats Download Patch File Download Diff File

1
OpenCL/m17400_a3-optimized.cl
Unescape View File

@ -80,7 +80,6 @@ DECLSPEC void m17400m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER
u64x a43 = 0;
u64x a44 = 0;
#define Rho_Pi(ad,r) \
bc0 = ad; \
ad = hc_rotl64 (t, r); \

1
OpenCL/m17600_a3-optimized.cl
Unescape View File

@ -80,7 +80,6 @@ DECLSPEC void m17600m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER
u64x a43 = 0;
u64x a44 = 0;
#define Rho_Pi(ad,r) \
bc0 = ad; \
ad = hc_rotl64 (t, r); \

1
src/modules/module_13400.c
Unescape View File

@ -616,6 +616,7 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
for (u32 i = 0; i < contents_hash_len; i++, ptr_data += 8)
sprintf (ptr_data, "%08x", ptr_contents_hash[i]);
}
if (keyfile_len)
{
*ptr_data = '*';

2
src/modules/module_19600.c
Unescape View File

@ -211,7 +211,9 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
u8 *account_info_ptr = (u8 *) krb5tgs->account_info;
// domain must be uppercase
u8 domain[128];
memcpy (domain, domain_pos, domain_len);
uppercase (domain, domain_len);

2
src/modules/module_19700.c
Unescape View File

@ -211,7 +211,9 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
u8 *account_info_ptr = (u8 *) krb5tgs->account_info;
// domain must be uppercase
u8 domain[128];
memcpy (domain, domain_pos, domain_len);
uppercase (domain, domain_len);

2
src/modules/module_19800.c
Unescape View File

@ -153,7 +153,9 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
u8 *account_info_ptr = (u8 *) krb5pa->account_info;
// domain must be uppercase
u8 domain[128];
memcpy (domain, domain_pos, domain_len);
uppercase (domain, domain_len);

2
src/modules/module_19900.c
Unescape View File

@ -153,7 +153,9 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
u8 *account_info_ptr = (u8 *) krb5pa->account_info;
// domain must be uppercase
u8 domain[128];
memcpy (domain, domain_pos, domain_len);
uppercase (domain, domain_len);

2
src/terminal.c
Unescape View File

@ -1084,6 +1084,7 @@ void status_display_status_json (hashcat_ctx_t *hashcat_ctx)
{
printf (",");
}
printf (" { \"device_id\": %d,", device_id + 1);
printf (" \"speed\": %" PRIu64 ",", (u64) (device_info->hashes_msec_dev * 1000));
@ -1883,6 +1884,7 @@ void status_speed_json (hashcat_ctx_t *hashcat_ctx)
printf (" \"speed\": %" PRIu64 " }", (u64) (device_info->hashes_msec_dev_benchmark * 1000));
device_num++;
}
printf (" ] }");
status_status_destroy (hashcat_ctx, hashcat_status);

1
tools/test_modules/m01731.pm
Unescape View File

@ -49,4 +49,3 @@ sub module_verify_hash
}
1;

1
tools/test_modules/m04800.pm
Unescape View File

@ -80,4 +80,3 @@ sub module_verify_hash
}
1;

1
tools/test_modules/m06600.pm
Unescape View File

@ -114,4 +114,3 @@ sub module_verify_hash
}
1;

1
tools/test_modules/m06700.pm
Unescape View File

@ -105,4 +105,3 @@ sub module_verify_hash
}
1;

1
tools/test_modules/m06800.pm
Unescape View File

@ -69,4 +69,3 @@ sub module_verify_hash
}
1;

1
tools/test_modules/m07000.pm
Unescape View File

@ -61,4 +61,3 @@ sub module_verify_hash
}
1;

1
tools/test_modules/m07700.pm
Unescape View File

@ -178,4 +178,3 @@ sub module_verify_hash
}
1;

1
tools/test_modules/m07701.pm
Unescape View File

@ -178,4 +178,3 @@ sub module_verify_hash
}
1;

1
tools/test_modules/m07800.pm
Unescape View File

@ -104,4 +104,3 @@ sub module_verify_hash
}
1;

1
tools/test_modules/m07801.pm
Unescape View File

@ -104,4 +104,3 @@ sub module_verify_hash
}
1;

1
tools/test_modules/m08300.pm
Unescape View File

@ -89,4 +89,3 @@ sub module_verify_hash
}
1;

1
tools/test_modules/m08900.pm
Unescape View File

@ -88,4 +88,3 @@ sub module_verify_hash
}
1;

1
tools/test_modules/m09300.pm
Unescape View File

@ -84,4 +84,3 @@ sub module_verify_hash
}
1;

3
tools/test_modules/m10901.pm
Unescape View File

@ -61,7 +61,7 @@ sub module_verify_hash
my $iterbytes = substr $hashbytes, 0, 4;
my $iter = unpack('N*', pack('L*', unpack("I",$iterbytes)));
my $iter = unpack ('N*', pack ('L*', unpack ('I', $iterbytes)));
my $salt = substr $hashbytes, 4, 64;
@ -75,4 +75,3 @@ sub module_verify_hash
}
1;

6
tools/test_modules/m15300.pm
Unescape View File

@ -76,21 +76,27 @@ sub get_random_dpapimk_salt
# Thanks to Jochen Hoenicke <hoenicke@gmail.com>
# (one of the authors of Palm Keyring)
# for these next two subs.
sub dpapi_pbkdf2
{
my ($password, $salt, $iter, $keylen, $prf) = @_;
my ($k, $t, $u, $ui, $i);
$t = "";
for ($k = 1; length ($t) < $keylen; $k++)
{
$u = $ui = &$prf ($salt . pack ('N', $k), $password);
for ($i = 1; $i < $iter; $i++)
{
# modification to fit Microsoft
# weird pbkdf2 implementation...
$ui = &$prf ($u, $password);
$u ^= $ui;
}
$t .= $u;
}
return substr ($t, 0, $keylen);

7
tools/test_modules/m15900.pm
Unescape View File

@ -77,23 +77,30 @@ sub get_random_dpapimk_salt
# Thanks to Jochen Hoenicke <hoenicke@gmail.com>
# (one of the authors of Palm Keyring)
# for these next two subs.
sub dpapi_pbkdf2
{
my ($password, $salt, $iter, $keylen, $prf) = @_;
my ($k, $t, $u, $ui, $i);
$t = "";
for ($k = 1; length ($t) < $keylen; $k++)
{
$u = $ui = &$prf ($salt . pack ('N', $k), $password);
for ($i = 1; $i < $iter; $i++)
{
# modification to fit Microsoft
# weird pbkdf2 implementation...
$ui = &$prf ($u, $password);
$u ^= $ui;
}
$t .= $u;
}
return substr ($t, 0, $keylen);
}

1
tools/test_modules/m16900.pm
Unescape View File

@ -74,4 +74,3 @@ sub module_verify_hash
}
1;

1
tools/test_modules/m18300.pm
Unescape View File

@ -240,4 +240,3 @@ sub module_verify_hash
}
1;

3
tools/test_modules/m20600.pm
Unescape View File

@ -24,7 +24,8 @@ sub module_generate_hash
my $digest = sha256 ($salt . $word);
for (my $i = 1; $i < $iter; $i++) {
for (my $i = 1; $i < $iter; $i++)
{
$digest = sha256 ($digest);
}

2
tools/test_rules.pl
Unescape View File

@ -9,7 +9,7 @@ use strict;
use warnings;
use Digest::MD5 qw (md5_hex);
use File::Basename qw (dirname);
use YAML::XS "LoadFile";
use YAML::XS qw (LoadFile);
use Test::More;
# Use `eq_or_diff` from Test::Differences if it's available for an easier to read comparison

Write Preview
Loading…
Cancel
Save