From c959d1bb34f0d870b19ad78e32007aea6cb6440e Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Thu, 3 Jan 2019 13:43:05 +0100 Subject: [PATCH 1/2] Added test modules for mode 101, 111 and 112 --- tools/test_modules/m00101.pm | 45 +++++++++++++++++++++++++++++++++++ tools/test_modules/m00111.pm | 46 ++++++++++++++++++++++++++++++++++++ tools/test_modules/m00112.pm | 46 ++++++++++++++++++++++++++++++++++++ 3 files changed, 137 insertions(+) create mode 100644 tools/test_modules/m00101.pm create mode 100644 tools/test_modules/m00111.pm create mode 100644 tools/test_modules/m00112.pm diff --git a/tools/test_modules/m00101.pm b/tools/test_modules/m00101.pm new file mode 100644 index 000000000..0910d1832 --- /dev/null +++ b/tools/test_modules/m00101.pm @@ -0,0 +1,45 @@ +#!/usr/bin/env perl + +## +## Author......: See docs/credits.txt +## License.....: MIT +## + +use strict; +use warnings; + +use Digest::SHA qw (sha1); +use MIME::Base64 qw (encode_base64); + +sub module_constraints { [[0, 255], [-1, -1], [0, 55], [-1, -1], [-1, -1]] } + +sub module_generate_hash +{ + my $word = shift; + + my $digest = sha1 ($word); + + my $base64_buf = encode_base64 ($digest, ""); + + my $hash = sprintf ("{SHA}%s", $base64_buf); + + 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); + + return ($new_hash, $word); +} + +1; diff --git a/tools/test_modules/m00111.pm b/tools/test_modules/m00111.pm new file mode 100644 index 000000000..8469f3db1 --- /dev/null +++ b/tools/test_modules/m00111.pm @@ -0,0 +1,46 @@ +#!/usr/bin/env perl + +## +## Author......: See docs/credits.txt +## License.....: MIT +## + +use strict; +use warnings; + +use Digest::SHA qw (sha1); +use MIME::Base64 qw (encode_base64); + +sub module_constraints { [[0, 255], [-1, -1], [0, 55], [-1, -1], [-1, -1]] } + +sub module_generate_hash +{ + my $word = shift; + my $salt = shift; + + my $digest = sha1 ($word . $salt); + + my $base64_buf = encode_base64 ($digest . $salt, ""); + + my $hash = sprintf ("{SSHA}%s", $base64_buf); + + 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); + + return ($new_hash, $word); +} + +1; diff --git a/tools/test_modules/m00112.pm b/tools/test_modules/m00112.pm new file mode 100644 index 000000000..0f544e2d9 --- /dev/null +++ b/tools/test_modules/m00112.pm @@ -0,0 +1,46 @@ +#!/usr/bin/env perl + +## +## Author......: See docs/credits.txt +## License.....: MIT +## + +use strict; +use warnings; + +use Digest::SHA qw (sha1_hex); + +sub module_constraints { [[0, 255], [0, 255], [0, 55], [20, 20], [20, 55]] } + +sub module_generate_hash +{ + my $word = shift; + my $salt = shift; + + my $salt_bin = pack("H*", $salt); + + my $digest = sha1_hex ($word . $salt_bin); + + 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; + + my $word_packed = pack_if_HEX_notation ($word); + + my $new_hash = module_generate_hash ($word_packed); + + return ($new_hash, $word); +} + +1; From 7b033a58aebbac56707d7e101a6f7ff67e70d978 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Thu, 3 Jan 2019 15:50:15 +0100 Subject: [PATCH 2/2] Fixed test module constraints --- tools/test_modules/m00111.pm | 2 +- tools/test_modules/m00112.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/test_modules/m00111.pm b/tools/test_modules/m00111.pm index 8469f3db1..15e407bdf 100644 --- a/tools/test_modules/m00111.pm +++ b/tools/test_modules/m00111.pm @@ -11,7 +11,7 @@ use warnings; use Digest::SHA qw (sha1); use MIME::Base64 qw (encode_base64); -sub module_constraints { [[0, 255], [-1, -1], [0, 55], [-1, -1], [-1, -1]] } +sub module_constraints { [[0, 255], [0, 255], [0, 55], [0, 55], [0, 55]] } sub module_generate_hash { diff --git a/tools/test_modules/m00112.pm b/tools/test_modules/m00112.pm index 0f544e2d9..ce4db24ca 100644 --- a/tools/test_modules/m00112.pm +++ b/tools/test_modules/m00112.pm @@ -10,7 +10,7 @@ use warnings; use Digest::SHA qw (sha1_hex); -sub module_constraints { [[0, 255], [0, 255], [0, 55], [20, 20], [20, 55]] } +sub module_constraints { [[0, 30], [20, 20], [0, 30], [20, 20], [20, 55]] } sub module_generate_hash {