Fix several constraints of raw modes

This commit is contained in:
jsteube
2019-02-16 13:37:17 +01:00
parent eb0e8eed2a
commit ba803a79ae
25 changed files with 63 additions and 45 deletions

View File

@@ -10,16 +10,19 @@ use warnings;
use Digest::MD5 qw (md5);
sub module_constraints { [[0, 255], [1, 11], [0, 33], [1, 11], [1, 33]] }
sub module_constraints { [[0, 232], [0, 232], [0, 32], [0, 32], [0, 32]] }
sub module_generate_hash
{
my $word = shift;
my $salt = shift;
my $pass = sprintf ("%s:Administration Tools:%s", $salt, $word);
# we need to reduce the maximum password and salt buffer size by 23 since we
# add it here statically
my $hash_buf = md5 ($pass);
my $final = sprintf ("%s:Administration Tools:%s", $salt, $word);
my $hash_buf = md5 ($final);
my $res = "";

View File

@@ -20,7 +20,9 @@ sub module_generate_hash
# we need to reduce the maximum password and salt buffer size by 8 since we
# add it here statically
my $digest = md5_hex ($salt . "\nskyper\n" . $word);
my $final = sprintf ("%s\nskyper\n%s", $salt, $word);
my $digest = md5_hex ($final);
my $hash = sprintf ("%s:%s", $digest, $salt);

View File

@@ -11,7 +11,7 @@ use warnings;
use Digest::MD5 qw (md5_hex);
use Encode;
sub module_constraints { [[0, 255], [0, 255], [0, 27], [0, 55], [0, 27]] }
sub module_constraints { [[0, 255], [0, 255], [0, 27], [0, 27], [0, 27]] }
sub module_generate_hash
{

View File

@@ -11,7 +11,7 @@ use warnings;
use Digest::MD5 qw (md5_hex);
use Encode;
sub module_constraints { [[0, 255], [0, 255], [0, 27], [0, 55], [0, 27]] }
sub module_constraints { [[0, 255], [0, 255], [0, 27], [0, 27], [0, 27]] }
sub module_generate_hash
{

View File

@@ -10,7 +10,7 @@ use warnings;
use Digest::SHA qw (sha1_hex);
sub module_constraints { [[0, 255], [8, 8], [0, 55], [8, 8], [8, 55]] }
sub module_constraints { [[0, 253], [8, 8], [0, 53], [8, 8], [8, 53]] }
sub module_generate_hash
{

View File

@@ -11,7 +11,7 @@ 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_constraints { [[0, 255], [0, 255], [0, 27], [0, 27], [0, 27]] }
sub module_generate_hash
{

View File

@@ -11,7 +11,7 @@ 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_constraints { [[0, 255], [0, 255], [0, 27], [0, 27], [0, 27]] }
sub module_generate_hash
{

View File

@@ -12,7 +12,7 @@ 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_constraints { [[0, 255], [0, 255], [0, 27], [0, 27], [0, 27]] }
sub module_generate_hash
{

View File

@@ -10,7 +10,7 @@ use warnings;
use Digest::SHA qw (sha256_hex);
sub module_constraints { [[0, 255], [6, 6], [0, 55], [6, 6], [0, 55]] }
sub module_constraints { [[0, 255], [6, 6], [0, 55], [6, 6], [6, 55]] }
sub module_generate_hash
{

View File

@@ -11,7 +11,7 @@ use warnings;
use Digest::SHA qw (sha256_hex);
use Encode;
sub module_constraints { [[0, 255], [0, 255], [0, 27], [0, 55], [0, 27]] }
sub module_constraints { [[0, 255], [0, 255], [0, 27], [0, 27], [0, 27]] }
sub module_generate_hash
{

View File

@@ -11,7 +11,7 @@ use warnings;
use Digest::SHA qw (sha256_hex);
use Encode;
sub module_constraints { [[0, 255], [0, 255], [0, 27], [0, 55], [0, 27]] }
sub module_constraints { [[0, 255], [0, 255], [0, 27], [0, 27], [0, 27]] }
sub module_generate_hash
{

View File

@@ -11,7 +11,7 @@ use warnings;
use Digest::SHA qw (sha256);
use Digest::HMAC qw (hmac_hex);
sub module_constraints { [[0, 255], [0, 255], [0, 55], [0, 55], [0, 55]] }
sub module_constraints { [[0, 255], [0, 255], [0, 55], [0, 55], [-1, -1]] }
sub module_generate_hash
{

View File

@@ -11,7 +11,7 @@ use warnings;
use Digest::SHA qw (sha256);
use Digest::HMAC qw (hmac_hex);
sub module_constraints { [[0, 255], [0, 255], [0, 55], [0, 55], [0, 55]] }
sub module_constraints { [[0, 255], [0, 255], [0, 55], [0, 55], [-1, -1]] }
sub module_generate_hash
{

View File

@@ -10,7 +10,7 @@ use warnings;
use Digest::SHA qw (sha512_hex);
sub module_constraints { [[0, 255], [8, 8], [0, 55], [8, 8], [0, 55]] }
sub module_constraints { [[0, 255], [8, 8], [0, 55], [8, 8], [8, 55]] }
sub module_generate_hash
{

View File

@@ -11,7 +11,7 @@ use warnings;
use Digest::SHA qw (sha512_hex);
use Encode;
sub module_constraints { [[0, 255], [0, 255], [0, 27], [0, 55], [0, 27]] }
sub module_constraints { [[0, 255], [0, 255], [0, 27], [0, 27], [0, 27]] }
sub module_generate_hash
{

View File

@@ -11,7 +11,7 @@ use warnings;
use Digest::SHA qw (sha512_hex);
use Encode;
sub module_constraints { [[0, 255], [0, 255], [0, 27], [0, 55], [0, 27]] }
sub module_constraints { [[0, 255], [0, 255], [0, 27], [0, 27], [0, 27]] }
sub module_generate_hash
{

View File

@@ -11,7 +11,7 @@ use warnings;
use Digest::SHA qw (sha512);
use Digest::HMAC qw (hmac_hex);
sub module_constraints { [[0, 255], [0, 255], [0, 55], [0, 55], [0, 55]] }
sub module_constraints { [[0, 255], [0, 255], [0, 55], [0, 55], [-1, -1]] }
sub module_generate_hash
{

View File

@@ -11,7 +11,7 @@ use warnings;
use Digest::SHA qw (sha512);
use Digest::HMAC qw (hmac_hex);
sub module_constraints { [[0, 255], [0, 255], [0, 55], [0, 55], [0, 55]] }
sub module_constraints { [[0, 255], [0, 255], [0, 55], [0, 55], [-1, -1]] }
sub module_generate_hash
{