Merge pull request #283 from Fist0urs/Keepass

-m 13400 Cosmetic changes + remove commented part

src/oclHashcat.c

@@ -743,7 +743,7 @@ const char *USAGE_BIG[] =
   "   8200 = 1Password, cloudkeychain",
   "  11300 = Bitcoin/Litecoin wallet.dat",
   "  12700 = Blockchain, My Wallet",
-  "  13400 = Keepass 1 (AES/Twofish) and Keepass 2 (AES)"
+  "  13400 = Keepass 1 (AES/Twofish) and Keepass 2 (AES)",
   "",
   NULL
 };

tools/test.pl

@@ -8462,7 +8462,7 @@ sub get_random_axcrypt_salt
 
 sub get_random_keepass_salt
 {
-  my $version = 1;# get_random_num (1, 3);
+  my $version = get_random_num (1, 3);
 
   my $algorithm;
 
@@ -8472,7 +8472,7 @@ sub get_random_keepass_salt
 
   if ($version == 1)
   {
-    $algorithm = 1;#get_random_num (0, 2);
+    $algorithm = get_random_num (0, 2);
 
     $iteration = get_random_num (50000, 100000);