From 02b2ca41c5189840d5bb67a22447dd8214cc2182 Mon Sep 17 00:00:00 2001 From: Gabriele Gristina Date: Sat, 12 Jun 2021 16:51:47 +0200 Subject: [PATCH] add unit-test and set pw_max to 16 for ProgressEncode --- src/modules/module_26200.c | 9 +++- tools/test_modules/m26200.pm | 102 +++++++++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+), 1 deletion(-) create mode 100644 tools/test_modules/m26200.pm diff --git a/src/modules/module_26200.c b/src/modules/module_26200.c index b9445df79..63989796e 100644 --- a/src/modules/module_26200.c +++ b/src/modules/module_26200.c @@ -57,6 +57,13 @@ bool module_unstable_warning (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE return false; } +u32 module_pw_max (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) +{ + const u32 pw_max = 16; + + return pw_max; +} + char *module_jit_build_options (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra, MAYBE_UNUSED const hashes_t *hashes, MAYBE_UNUSED const hc_device_param_t *device_param) { char *jit_build_options = NULL; @@ -170,7 +177,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_potfile_disable = MODULE_DEFAULT; module_ctx->module_potfile_keep_all_hashes = MODULE_DEFAULT; module_ctx->module_pwdump_column = MODULE_DEFAULT; - module_ctx->module_pw_max = MODULE_DEFAULT; + module_ctx->module_pw_max = module_pw_max; module_ctx->module_pw_min = MODULE_DEFAULT; module_ctx->module_salt_max = MODULE_DEFAULT; module_ctx->module_salt_min = MODULE_DEFAULT; diff --git a/tools/test_modules/m26200.pm b/tools/test_modules/m26200.pm new file mode 100644 index 000000000..a89596625 --- /dev/null +++ b/tools/test_modules/m26200.pm @@ -0,0 +1,102 @@ +#!/usr/bin/env perl + +## +## Author......: See docs/credits.txt +## License.....: MIT +## + +use strict; +use warnings; + +sub module_constraints { [[0, 16], [-1, -1], [-1, -1], [-1, -1], [0, 16]] } + +my @PE_CONST = ( + 0, 49345, 49537, 320, 49921, 960, 640, 49729, 50689, 1728, 1920, 51009, 1280, 50625, 50305, 1088, + 52225, 3264, 3456, 52545, 3840, 53185, 52865, 3648, 2560, 51905, 52097, 2880, 51457, 2496, 2176, 51265, + 55297, 6336, 6528, 55617, 6912, 56257, 55937, 6720, 7680, 57025, 57217, 8000, 56577, 7616, 7296, 56385, + 5120, 54465, 54657, 5440, 55041, 6080, 5760, 54849, 53761, 4800, 4992, 54081, 4352, 53697, 53377, 4160, + 61441, 12480, 12672, 61761, 13056, 62401, 62081, 12864, 13824, 63169, 63361, 14144, 62721, 13760, 13440, 62529, + 15360, 64705, 64897, 15680, 65281, 16320, 16000, 65089, 64001, 15040, 15232, 64321, 14592, 63937, 63617, 14400, + 10240, 59585, 59777, 10560, 60161, 11200, 10880, 59969, 60929, 11968, 12160, 61249, 11520, 60865, 60545, 11328, + 58369, 9408, 9600, 58689, 9984, 59329, 59009, 9792, 8704, 58049, 58241, 9024, 57601, 8640, 8320, 57409, + 40961, 24768, 24960, 41281, 25344, 41921, 41601, 25152, 26112, 42689, 42881, 26432, 42241, 26048, 25728, 42049, + 27648, 44225, 44417, 27968, 44801, 28608, 28288, 44609, 43521, 27328, 27520, 43841, 26880, 43457, 43137, 26688, + 30720, 47297, 47489, 31040, 47873, 31680, 31360, 47681, 48641, 32448, 32640, 48961, 32000, 48577, 48257, 31808, + 46081, 29888, 30080, 46401, 30464, 47041, 46721, 30272, 29184, 45761, 45953, 29504, 45313, 29120, 28800, 45121, + 20480, 37057, 37249, 20800, 37633, 21440, 21120, 37441, 38401, 22208, 22400, 38721, 21760, 38337, 38017, 21568, + 39937, 23744, 23936, 40257, 24320, 40897, 40577, 24128, 23040, 39617, 39809, 23360, 39169, 22976, 22656, 38977, + 34817, 18624, 18816, 35137, 19200, 35777, 35457, 19008, 19968, 36545, 36737, 20288, 36097, 19904, 19584, 35905, + 17408, 33985, 34177, 17728, 34561, 18368, 18048, 34369, 33281, 17088, 17280, 33601, 16640, 33217, 32897, 16448 +); + +sub PE_encode +{ + my $word_str = shift; + + my $word_str_len = length($word_str); + + my @word = split('', $word_str, $word_str_len); + + my @scratch = (0) x 16; + my @target = (0) x 16; + my $hash = 17; + + for (my $i=0; $i<5; $i++) { + for (my $j=0; $j<$word_str_len; $j++) { + my $idx = 15 - ($j % 16); + $scratch[$idx] ^= ord($word[$j]); + } + + for (my $j=0; $j<16; $j+=2) { + for (my $k=15; $k>=0; $k--) { + $hash = (($hash & 0xffff) >> 8 ^ $PE_CONST[($hash & 0xff)] ^ $PE_CONST[$scratch[$k]]); + } + + $scratch[$j] = $hash & 0xff; + $scratch[$j+1] = ($hash >> 8) & 0xff; + } + } + + my $low; + for (my $i=0; $i<16; $i++) { + $low = $scratch[$i] & 0x7f; + + if ($low >= 65 && $low <= 90 || $low >= 97 && $low <= 122) { + $target[$i] = $low; + } else { + $target[$i] = ((($scratch[$i] & 0xff) >> 4) + 0x61) & 0xff; + } + + $target[$i] = chr($target[$i]); + } + + return join '', @target; +} + +sub module_generate_hash +{ + my $word = shift; + + my $hash = PE_encode ($word); + + return $hash; +} + +sub module_verify_hash +{ + my $line = shift; + + my ($hash, $word) = split (':', $line); + + return unless defined $hash; + return unless defined $word; + +# my $word_packed = pack_if_HEX_notation ($word); + +# my $new_hash = module_generate_hash ($word_packed); + my $new_hash = module_generate_hash ($word); + + return ($new_hash, $word); +} + +1;