From 4d1c53b3e5950fdbb01c4f6e26198f7fbf227c49 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Tue, 8 Jan 2019 23:27:20 +0100 Subject: [PATCH 1/2] Added test modules for mode 133, 140 and 141 --- tools/test_modules/m00133.pm | 46 ++++++++++++++++++++++++++++ tools/test_modules/m00140.pm | 45 ++++++++++++++++++++++++++++ tools/test_modules/m00141.pm | 58 ++++++++++++++++++++++++++++++++++++ 3 files changed, 149 insertions(+) create mode 100644 tools/test_modules/m00133.pm create mode 100644 tools/test_modules/m00140.pm create mode 100644 tools/test_modules/m00141.pm diff --git a/tools/test_modules/m00133.pm b/tools/test_modules/m00133.pm new file mode 100644 index 000000000..eb0e8554a --- /dev/null +++ b/tools/test_modules/m00133.pm @@ -0,0 +1,46 @@ +#!/usr/bin/env perl + +## +## Author......: See docs/credits.txt +## License.....: MIT +## + +use strict; +use warnings; + +use Digest::SHA1 qw (sha1); +use MIME::Base64 qw (encode_base64); +use Encode; + +sub module_constraints { [[0, 255], [-1, -1], [0, 27], [-1, -1], [-1, -1]] } + +sub module_generate_hash +{ + my $word = shift; + + my $digest = sha1 (encode ("UTF-16LE", $word)); + + $digest = encode_base64 ($digest, ""); + + my $hash = sprintf ("%s", $digest); + + return $hash; +} + +sub module_verify_hash +{ + my $line = shift; + + my ($hash, $word) = split (':', $line); + + return unless defined $hash; + return unless defined $word; + + $word = pack_if_HEX_notation ($word); + + my $new_hash = module_generate_hash ($word); + + return ($new_hash, $word); +} + +1; diff --git a/tools/test_modules/m00140.pm b/tools/test_modules/m00140.pm new file mode 100644 index 000000000..1f4c92348 --- /dev/null +++ b/tools/test_modules/m00140.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 ($salt . encode ("UTF-16LE", $word)); + + 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/m00141.pm b/tools/test_modules/m00141.pm new file mode 100644 index 000000000..167716cfa --- /dev/null +++ b/tools/test_modules/m00141.pm @@ -0,0 +1,58 @@ +#!/usr/bin/env perl + +## +## Author......: See docs/credits.txt +## License.....: MIT +## + +use strict; +use warnings; + +use Digest::SHA1 qw (sha1); +use MIME::Base64 qw (encode_base64 decode_base64); +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 ($salt . encode ("UTF-16LE", $word)); + + my $base64_salt_buf = encode_base64 ($salt, ""); + my $base64_hash_buf = encode_base64 ($digest, ""); + + $base64_hash_buf = substr ($base64_hash_buf, 0, 27); + + my $hash = sprintf ("\$episerver\$*0*%s*%s", $base64_salt_buf, $base64_hash_buf); + + return $hash; +} + +sub module_verify_hash +{ + my $line = shift; + + my ($digest, $word) = split (':', $line); + + $digest = substr($digest, 14); + + my ($base64_salt, $base64_hash) = split('\*', $digest); + + my $hash = decode_base64($base64_hash); + my $salt = decode_base64($base64_salt); + + 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 2638052daaa6625b69319658782b0edf754fcf03 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Wed, 9 Jan 2019 10:51:26 +0100 Subject: [PATCH 2/2] Fixed spacing --- tools/test_modules/m00141.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/test_modules/m00141.pm b/tools/test_modules/m00141.pm index 167716cfa..e9e5e09eb 100644 --- a/tools/test_modules/m00141.pm +++ b/tools/test_modules/m00141.pm @@ -37,12 +37,12 @@ sub module_verify_hash my ($digest, $word) = split (':', $line); - $digest = substr($digest, 14); + $digest = substr ($digest, 14); - my ($base64_salt, $base64_hash) = split('\*', $digest); + my ($base64_salt, $base64_hash) = split ('\*', $digest); - my $hash = decode_base64($base64_hash); - my $salt = decode_base64($base64_salt); + my $hash = decode_base64 ($base64_hash); + my $salt = decode_base64 ($base64_salt); return unless defined $hash; return unless defined $salt;