From e12ce123c980f81c4db81216c5426a3f69ddc227 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Tue, 8 Jan 2019 23:00:23 +0100 Subject: [PATCH 1/2] Added test modules for mode 130, 131 and 132 --- tools/test_modules/m00130.pm | 45 +++++++++++++++++++++++++++++++ tools/test_modules/m00131.pm | 51 ++++++++++++++++++++++++++++++++++++ tools/test_modules/m00132.pm | 51 ++++++++++++++++++++++++++++++++++++ 3 files changed, 147 insertions(+) create mode 100644 tools/test_modules/m00130.pm create mode 100644 tools/test_modules/m00131.pm create mode 100644 tools/test_modules/m00132.pm diff --git a/tools/test_modules/m00130.pm b/tools/test_modules/m00130.pm new file mode 100644 index 000000000..745a75b59 --- /dev/null +++ b/tools/test_modules/m00130.pm @@ -0,0 +1,45 @@ +#!/usr/bin/env perl + +## +## Author......: See docs/credits.txt +## License.....: MIT +## + +use strict; +use warnings; + +use Digest::SHA1 qw (sha1_hex); +use Encode; + +sub module_constraints { [[0, 255], [0, 255], [0, 27], [0, 55], [0, 27]] } + +sub module_generate_hash +{ + my $word = shift; + my $salt = shift; + + my $digest = sha1_hex (encode ("UTF-16LE", $word) . $salt); + + my $hash = sprintf ("%s:%s", $digest, $salt); + + return $hash; +} + +sub module_verify_hash +{ + my $line = shift; + + my ($hash, $salt, $word) = split (':', $line); + + return unless defined $hash; + return unless defined $salt; + return unless defined $word; + + $word = pack_if_HEX_notation ($word); + + my $new_hash = module_generate_hash ($word, $salt); + + return ($new_hash, $word); +} + +1; diff --git a/tools/test_modules/m00131.pm b/tools/test_modules/m00131.pm new file mode 100644 index 000000000..3f30acfc2 --- /dev/null +++ b/tools/test_modules/m00131.pm @@ -0,0 +1,51 @@ +#!/usr/bin/env perl + +## +## Author......: See docs/credits.txt +## License.....: MIT +## + +use strict; +use warnings; + +use Digest::SHA1 qw (sha1_hex); +use Encode; + +sub module_constraints { [[0, 255], [8, 8], [0, 27], [8, 8], [8, 27]] } + +sub module_generate_hash +{ + my $word = shift; + my $salt = shift; + + my $salt_bin = pack ("H*", $salt); + + my $digest = sha1_hex (encode ("UTF-16LE", uc($word)) . $salt_bin); + + my $hash = sprintf ("0x0100%s%s%s", $salt, "0" x 40, $digest); + + return $hash; +} + +sub module_verify_hash +{ + my $line = shift; + + my ($digest, $word) = split (':', $line); + + my ($prefix, $hash) = split('-', $digest); + + my $salt = substr($prefix, 6, 8); + + return unless defined $hash; + return unless defined $salt; + return unless defined $word; + + $word = pack_if_HEX_notation ($word); + + my $new_hash = module_generate_hash ($word, $salt); + + return ($new_hash, $word); +} + +1; diff --git a/tools/test_modules/m00132.pm b/tools/test_modules/m00132.pm new file mode 100644 index 000000000..e0b7e4c93 --- /dev/null +++ b/tools/test_modules/m00132.pm @@ -0,0 +1,51 @@ +#!/usr/bin/env perl + +## +## Author......: See docs/credits.txt +## License.....: MIT +## + +use strict; +use warnings; + +use Digest::SHA1 qw (sha1_hex); +use Encode; + +sub module_constraints { [[0, 255], [8, 8], [0, 27], [8, 8], [8, 27]] } + +sub module_generate_hash +{ + my $word = shift; + my $salt = shift; + + my $salt_bin = pack ("H*", $salt); + + my $digest = sha1_hex (encode ("UTF-16LE", $word) . $salt_bin); + + my $hash = sprintf ("0x0100%s%s", $salt, $digest); + + return $hash; +} + +sub module_verify_hash +{ + my $line = shift; + + my ($digest, $word) = split (':', $line); + + my $salt = substr($digest, 6, 8); + + my $hash = substr($digest, 14); + + return unless defined $hash; + return unless defined $salt; + return unless defined $word; + + $word = pack_if_HEX_notation ($word); + + my $new_hash = module_generate_hash ($word, $salt); + + return ($new_hash, $word); +} + +1; From a1fa4aa12f7a53f5656b0f94244e1ad29a55ad03 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Wed, 9 Jan 2019 10:50:26 +0100 Subject: [PATCH 2/2] Fixed spacing --- tools/test_modules/m00131.pm | 2 +- tools/test_modules/m00132.pm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/test_modules/m00131.pm b/tools/test_modules/m00131.pm index 3f30acfc2..f3011c514 100644 --- a/tools/test_modules/m00131.pm +++ b/tools/test_modules/m00131.pm @@ -20,7 +20,7 @@ sub module_generate_hash my $salt_bin = pack ("H*", $salt); - my $digest = sha1_hex (encode ("UTF-16LE", uc($word)) . $salt_bin); + my $digest = sha1_hex (encode ("UTF-16LE", uc ($word)) . $salt_bin); my $hash = sprintf ("0x0100%s%s%s", $salt, "0" x 40, $digest); diff --git a/tools/test_modules/m00132.pm b/tools/test_modules/m00132.pm index e0b7e4c93..37b53a6c7 100644 --- a/tools/test_modules/m00132.pm +++ b/tools/test_modules/m00132.pm @@ -33,9 +33,9 @@ sub module_verify_hash my ($digest, $word) = split (':', $line); - my $salt = substr($digest, 6, 8); + my $salt = substr ($digest, 6, 8); - my $hash = substr($digest, 14); + my $hash = substr ($digest, 14); return unless defined $hash; return unless defined $salt;