Merge pull request #3147 from philsmd/master

tests: cleanup and module dependencies fix

tools/test_modules/m00050.pm

@@ -9,7 +9,7 @@ use strict;
 use warnings;
 
 use Digest::MD5  qw (md5);
-use Digest::HMAC qw (hmac hmac_hex);
+use Digest::HMAC qw (hmac_hex);
 
 sub module_constraints { [[0, 256], [0, 256], [0, 55], [0, 55], [-1, -1]] }
 

tools/test_modules/m00060.pm

@@ -9,7 +9,7 @@ use strict;
 use warnings;
 
 use Digest::MD5  qw (md5);
-use Digest::HMAC qw (hmac hmac_hex);
+use Digest::HMAC qw (hmac_hex);
 
 sub module_constraints { [[0, 256], [0, 256], [0, 55], [0, 55], [-1, -1]] }
 

tools/test_modules/m00150.pm

@@ -9,7 +9,7 @@ use strict;
 use warnings;
 
 use Digest::SHA1 qw (sha1);
-use Digest::HMAC qw (hmac hmac_hex);
+use Digest::HMAC qw (hmac_hex);
 
 sub module_constraints { [[0, 256], [0, 256], [0, 55], [0, 55], [-1, -1]] }
 

tools/test_modules/m00160.pm

@@ -9,7 +9,7 @@ use strict;
 use warnings;
 
 use Digest::SHA1 qw (sha1);
-use Digest::HMAC qw (hmac hmac_hex);
+use Digest::HMAC qw (hmac_hex);
 
 sub module_constraints { [[0, 256], [0, 256], [0, 55], [0, 55], [-1, -1]] }
 

tools/test_modules/m00900.pm

@@ -9,7 +9,6 @@ use strict;
 use warnings;
 
 use Digest::MD4 qw (md4_hex);
-use Encode;
 
 sub module_constraints { [[0, 256], [-1, -1], [0, 27], [-1, -1], [-1, -1]] }
 

tools/test_modules/m01711.pm

@@ -9,7 +9,7 @@ use strict;
 use warnings;
 
 use Digest::SHA  qw (sha512_hex);
-use MIME::Base64 qw (encode_base64);
+use MIME::Base64 qw (encode_base64 decode_base64);
 
 sub module_constraints { [[0, 256], [0, 256], [0, 55], [0, 55], [0, 55]] }
 

tools/test_modules/m02100.pm

@@ -8,7 +8,7 @@
 use strict;
 use warnings;
 
-use Digest::MD4 qw (md4 md4_hex);
+use Digest::MD4 qw (md4);
 use Crypt::PBKDF2;
 use Encode;
 

tools/test_modules/m02400.pm

@@ -9,7 +9,7 @@ use strict;
 use warnings;
 
 use Digest::MD5 qw (md5);
-use POSIX qw (strftime ceil);
+use POSIX qw (ceil);
 
 sub module_constraints { [[-1, -1], [-1, -1], [1, 55], [-1, -1], [-1, -1]] }
 

tools/test_modules/m05500.pm

@@ -9,10 +9,8 @@ use strict;
 use warnings;
 
 use Authen::Passphrase::NTHash;
-use Digest::HMAC qw (hmac hmac_hex);
 use Digest::MD5 qw (md5);
-use Encode       qw (encode);
-use Crypt::ECB   qw (encrypt);
+use Crypt::ECB;
 
 sub setup_des_key
 {

tools/test_modules/m07500.pm

@@ -12,7 +12,6 @@ use Encode;
 use Crypt::RC4;
 use Digest::HMAC_MD5 qw (hmac_md5);
 use Digest::MD4      qw (md4);
-use Digest::MD5      qw (md5_hex);
 use POSIX            qw (strftime);
 
 sub get_random_kerberos5_salt

tools/test_modules/m10901.pm

@@ -7,8 +7,9 @@
 
 use strict;
 use warnings;
+
 use Crypt::PBKDF2;
-use MIME::Base64;
+use MIME::Base64 qw (encode_base64 decode_base64);
 
 sub module_constraints { [[0, 256], [64, 64], [-1, -1], [-1, -1], [-1, -1]] }
 

tools/test_modules/m11200.pm

@@ -8,7 +8,6 @@
 use strict;
 use warnings;
 
-use Digest::MD5 qw (md5_hex);
 use Digest::SHA qw (sha1);
 
 sub module_constraints { [[0, 256], [40, 40], [0, 55], [40, 40], [-1, -1]] }

tools/test_modules/m13100.pm

@@ -12,8 +12,6 @@ use Encode;
 use Crypt::RC4;
 use Digest::HMAC_MD5 qw (hmac_md5);
 use Digest::MD4      qw (md4);
-use Digest::MD5      qw (md5_hex);
-use POSIX            qw (strftime);
 
 sub module_constraints { [[0, 256], [16, 16], [0, 27], [16, 16], [-1, -1]] }
 

tools/test_modules/m13900.pm

@@ -9,7 +9,6 @@ use strict;
 use warnings;
 
 use Digest::SHA qw (sha1_hex);
-use Encode;
 
 sub module_constraints { [[0, 256], [9, 9], [0, 46], [9, 9], [-1, -1]] }
 

tools/test_modules/m15300.pm

@@ -8,9 +8,9 @@
 use strict;
 use warnings;
 
-use Crypt::ECB  qw (encrypt);
 use Digest::MD4 qw (md4);
 use Digest::SHA qw (sha1 hmac_sha1);
+use Crypt::ECB;
 use Encode;
 
 sub module_constraints { [[0, 256], [-1, -1], [-1, -1], [-1, -1], [-1, -1]] }

tools/test_modules/m15900.pm

@@ -8,10 +8,10 @@
 use strict;
 use warnings;
 
-use Crypt::CBC;
-use Crypt::ECB  qw (encrypt);
 use Digest::MD4 qw (md4);
 use Digest::SHA qw (sha1 hmac_sha1 hmac_sha512);
+use Crypt::CBC;
+use Crypt::ECB;
 use Encode;
 
 sub module_constraints { [[0, 256], [-1, -1], [-1, -1], [-1, -1], [-1, -1]] }

tools/test_modules/m18200.pm

@@ -12,8 +12,6 @@ use Encode;
 use Crypt::RC4;
 use Digest::HMAC_MD5 qw (hmac_md5);
 use Digest::MD4      qw (md4);
-use Digest::MD5      qw (md5_hex);
-use POSIX            qw (strftime);
 
 sub module_constraints { [[0, 256], [16, 16], [0, 27], [16, 16], [-1, -1]] }
 

tools/test_modules/m19600.pm

@@ -11,8 +11,6 @@ use warnings;
 use Digest::SHA qw (hmac_sha1);
 use Crypt::Mode::CBC;
 use Crypt::PBKDF2;
-use Encode;
-use POSIX            qw (strftime);
 
 sub byte2hex
 {

tools/test_modules/m19700.pm

@@ -11,8 +11,6 @@ use warnings;
 use Digest::SHA qw (hmac_sha1);
 use Crypt::Mode::CBC;
 use Crypt::PBKDF2;
-use Encode;
-use POSIX            qw (strftime);
 
 sub byte2hex
 {

tools/test_modules/m19800.pm

@@ -11,8 +11,6 @@ use warnings;
 use Digest::SHA qw (hmac_sha1);
 use Crypt::Mode::CBC;
 use Crypt::PBKDF2;
-use Encode;
-use POSIX            qw (strftime);
 
 sub byte2hex
 {

tools/test_modules/m19900.pm

@@ -11,8 +11,6 @@ use warnings;
 use Digest::SHA qw (hmac_sha1);
 use Crypt::Mode::CBC;
 use Crypt::PBKDF2;
-use Encode;
-use POSIX            qw (strftime);
 
 sub byte2hex
 {

tools/test_modules/m20011.pm

@@ -9,7 +9,7 @@ use strict;
 use warnings;
 
 use Crypt::PBKDF2;
-use MIME::Base64 qw (encode_base64 decode_base64);
+use MIME::Base64 qw (encode_base64);
 use Encode;
 
 sub module_constraints { [[0, 256], [128, 128], [-1, -1], [-1, -1], [-1, -1]] }

tools/test_modules/m20012.pm

@@ -9,7 +9,7 @@ use strict;
 use warnings;
 
 use Crypt::PBKDF2;
-use MIME::Base64 qw (encode_base64 decode_base64);
+use MIME::Base64 qw (encode_base64);
 use Encode;
 
 sub module_constraints { [[0, 256], [128, 128], [-1, -1], [-1, -1], [-1, -1]] }

tools/test_modules/m20013.pm

@@ -9,7 +9,7 @@ use strict;
 use warnings;
 
 use Crypt::PBKDF2;
-use MIME::Base64 qw (encode_base64 decode_base64);
+use MIME::Base64 qw (encode_base64);
 use Encode;
 
 sub module_constraints { [[0, 256], [128, 128], [-1, -1], [-1, -1], [-1, -1]] }

tools/test_modules/m20600.pm

@@ -9,7 +9,7 @@ use strict;
 use warnings;
 
 use Digest::SHA  qw (sha256);
-use MIME::Base64;
+use MIME::Base64 qw (encode_base64);
 
 sub module_constraints { [[0, 256], [0, 16], [-1, -1], [-1, -1], [-1, -1]] }
 

tools/test_modules/m21500.pm

@@ -8,9 +8,9 @@
 use strict;
 use warnings;
 
-use MIME::Base64 qw (encode_base64 decode_base64);
-use Crypt::PBKDF2;
+use MIME::Base64 qw (encode_base64);
 use Digest::SHA  qw (sha512);
+use Crypt::PBKDF2;
 use Encode;
 
 sub module_constraints { [[0, 256], [0, 256], [-1, -1], [-1, -1], [-1, -1]] }

tools/test_modules/m21501.pm

@@ -8,9 +8,9 @@
 use strict;
 use warnings;
 
-use MIME::Base64 qw (encode_base64 decode_base64);
-use Crypt::PBKDF2;
+use MIME::Base64 qw (encode_base64);
 use Digest::SHA  qw (sha512);
+use Crypt::PBKDF2;
 use Encode;
 
 sub module_constraints { [[0, 256], [16, 16], [-1, -1], [-1, -1], [-1, -1]] }

tools/test_modules/m21600.pm

@@ -8,13 +8,10 @@
 use strict;
 use warnings;
 
-use MIME::Base64 qw (encode_base64 decode_base64);
 use Crypt::PBKDF2;
 
 sub module_constraints { [[0, 256], [1, 15], [-1, -1], [-1, -1], [-1, -1]] }
 
-#pbkdf2(1000,20,sha512)$a2a2ca127df6bc19$77bb5a3d129e2ce710daaefeefef8356c4c827ff";
-
 sub module_generate_hash
 {
   my $word       = shift;
@@ -37,8 +34,6 @@ sub module_generate_hash
   return $hash;
 }
 
-#pbkdf2(1000,20,sha512)$a2a2ca127df6bc19$77bb5a3d129e2ce710daaefeefef8356c4c827ff";
-
 sub module_verify_hash
 {
   my $line = shift;

tools/test_modules/m24700.pm

@@ -8,7 +8,6 @@
 use strict;
 use warnings;
 
-use Digest::MD5 qw (md5_hex);
 use Digest::MD5 qw (md5);
 
 sub module_constraints { [[0, 256], [-1, -1], [0, 55], [-1, -1], [-1, -1]] }

tools/test_modules/m24800.pm

@@ -9,9 +9,9 @@ use strict;
 use warnings;
 
 use Digest::SHA1 qw (sha1);
-use Digest::HMAC qw (hmac hmac_hex);
-use Encode qw (encode decode);
-use MIME::Base64;
+use Digest::HMAC qw (hmac);
+use Encode       qw (encode);
+use MIME::Base64 qw (encode_base64);
 
 sub module_constraints { [[0, 256], [0, 256], [0, 27], [0, 27], [0, 27]] }
 

tools/test_modules/m24900.pm

@@ -7,7 +7,6 @@
 
 use strict;
 use warnings;
-use MIME::Base64 qw (encode_base64 decode_base64);
 
 use Digest::MD5 qw (md5);
 

tools/test_modules/m25000.pm

@@ -10,7 +10,7 @@ use warnings;
 
 use Digest::MD5  qw (md5 md5_hex);
 use Digest::SHA  qw (sha1 sha1_hex);
-use Digest::HMAC qw (hmac hmac_hex);
+use Digest::HMAC qw (hmac_hex);
 
 sub module_constraints { [[8, 256], [24, 3000], [-1, -1], [-1, -1], [-1, -1]] }
 

tools/test_modules/m25100.pm

@@ -9,7 +9,7 @@ use strict;
 use warnings;
 
 use Digest::MD5  qw (md5 md5_hex);
-use Digest::HMAC qw (hmac hmac_hex);
+use Digest::HMAC qw (hmac_hex);
 
 sub module_constraints { [[8, 256], [24, 3000], [-1, -1], [-1, -1], [-1, -1]] }
 

tools/test_modules/m25200.pm

@@ -9,7 +9,7 @@ use strict;
 use warnings;
 
 use Digest::SHA  qw (sha1 sha1_hex);
-use Digest::HMAC qw (hmac hmac_hex);
+use Digest::HMAC qw (hmac_hex);
 
 sub module_constraints { [[8, 256], [24, 3000], [-1, -1], [-1, -1], [-1, -1]] }
 

tools/test_modules/m25300.pm

@@ -8,7 +8,7 @@
 use strict;
 use warnings;
 
-use MIME::Base64 qw (encode_base64 decode_base64);
+use MIME::Base64 qw (encode_base64);
 use Digest::SHA  qw (sha512);
 use Encode;
 

tools/test_modules/m25400.pm

@@ -290,7 +290,8 @@ sub module_verify_hash
   my $o        = shift @data;
 
   my $u_pass = "";
-  if($i_data == 12) {
+  if ($i_data == 12)
+  {
     $u_pass = shift @data;
   }
 

tools/test_modules/m25700.pm

@@ -145,4 +145,3 @@ sub module_verify_hash
 }
 
 1;
-

tools/test_modules/m26700.pm

@@ -9,7 +9,7 @@ use strict;
 use warnings;
 
 use Digest::SHA  qw (sha224 sha224_hex);
-use Digest::HMAC qw (hmac hmac_hex);
+use Digest::HMAC qw (hmac_hex);
 
 sub module_constraints { [[8, 256], [32, 3000], [-1, -1], [-1, -1], [-1, -1]] }
 

tools/test_modules/m26800.pm

@@ -9,7 +9,7 @@ use strict;
 use warnings;
 
 use Digest::SHA  qw (sha256 sha256_hex);
-use Digest::HMAC qw (hmac hmac_hex);
+use Digest::HMAC qw (hmac_hex);
 
 sub module_constraints { [[8, 256], [48, 3000], [-1, -1], [-1, -1], [-1, -1]] }
 

tools/test_modules/m26900.pm

@@ -9,7 +9,6 @@ use strict;
 use warnings;
 
 use Digest::SHA qw (sha384 sha384_hex hmac_sha384_hex);
-#use Digest::HMAC qw (hmac hmac_hex);
 
 sub module_constraints { [[8, 256], [64, 3000], [-1, -1], [-1, -1], [-1, -1]] }
 

tools/test_modules/m27000.pm

@@ -8,10 +8,8 @@
 use strict;
 use warnings;
 
-use Digest::HMAC qw (hmac hmac_hex);
 use Digest::MD5 qw (md5);
-use Encode       qw (encode);
-use Crypt::ECB   qw (encrypt);
+use Crypt::ECB;
 
 sub setup_des_key
 {

tools/test_modules/m27100.pm

@@ -87,4 +87,3 @@ sub random_client_challenge
 }
 
 1;
-

tools/test_modules/m27500.pm

@@ -9,8 +9,7 @@ use strict;
 use warnings;
 
 use Crypt::PBKDF2;
-use MIME::Base64 qw (encode_base64 decode_base64);
-use Encode;
+use MIME::Base64 qw (encode_base64);
 
 sub module_constraints { [[0, 256], [64, 64], [-1, -1], [-1, -1], [-1, -1]] }
 

tools/test_modules/m27600.pm

@@ -9,8 +9,7 @@ use strict;
 use warnings;
 
 use Crypt::PBKDF2;
-use MIME::Base64 qw (encode_base64 decode_base64);
-use Encode;
+use MIME::Base64 qw (encode_base64);
 
 sub module_constraints { [[0, 256], [64, 64], [-1, -1], [-1, -1], [-1, -1]] }
 

tools/test_modules/m28300.pm

@@ -8,9 +8,8 @@
 use strict;
 use warnings;
 
-use Digest::SHA1 qw (sha1 sha1_hex);
-use Encode qw (encode decode);
-use MIME::Base64;
+use Digest::SHA1 qw (sha1);
+use MIME::Base64 qw (encode_base64 decode_base64);
 
 sub module_constraints { [[0, 256], [224, 224], [-1, -1], [-1, -1], [-1, -1]] }