switched CBC mode test (which is the default Rjindael encryption mode) to ECB mode
authorMichael Rash <mbr@cipherdyne.org>
Wed, 8 Feb 2012 19:29:33 +0000 (14:29 -0500)
committerMichael Rash <mbr@cipherdyne.org>
Wed, 8 Feb 2012 19:29:33 +0000 (14:29 -0500)
test/conf/ecb_mode_access.conf [moved from test/conf/cbc_mode_access.conf with 70% similarity]
test/test-fwknop.pl

similarity index 70%
rename from test/conf/cbc_mode_access.conf
rename to test/conf/ecb_mode_access.conf
index b93d30f..a7b62ed 100644 (file)
@@ -1,4 +1,4 @@
 SOURCE: ANY;
 KEY: fwknoptest;
 FW_ACCESS_TIMEOUT:  3;
-ENCRYPTION_MODE: CBC;
+ENCRYPTION_MODE: ECB;
index 6148774..e48ae2e 100755 (executable)
@@ -22,7 +22,7 @@ my $gpg_client_home_dir = "$conf_dir/client-gpg";
 my $nat_conf            = "$conf_dir/nat_fwknopd.conf";
 my $default_conf        = "$conf_dir/default_fwknopd.conf";
 my $default_access_conf = "$conf_dir/default_access.conf";
-my $cbc_mode_access_conf = "$conf_dir/cbc_mode_access.conf";
+my $ecb_mode_access_conf = "$conf_dir/ecb_mode_access.conf";
 my $expired_access_conf = "$conf_dir/expired_stanza_access.conf";
 my $future_expired_access_conf = "$conf_dir/future_expired_stanza_access.conf";
 my $expired_epoch_access_conf = "$conf_dir/expired_epoch_stanza_access.conf";
@@ -926,12 +926,12 @@ my @tests = (
     {
         'category' => 'Rijndael SPA',
         'subcategory' => 'client+server',
-        'detail'   => 'CBC mode (tcp/22 ssh)',
+        'detail'   => 'ECB mode (tcp/22 ssh)',
         'err_msg'  => 'could not complete SPA cycle',
         'function' => \&spa_cycle,
-        'cmdline'  => "$default_client_args -M cbc",
+        'cmdline'  => "$default_client_args -M ecb",
         'fwknopd_cmdline'  => "LD_LIBRARY_PATH=$lib_dir $valgrind_str " .
-            "$fwknopdCmd -c $default_conf -a $cbc_mode_access_conf " .
+            "$fwknopdCmd -c $default_conf -a $ecb_mode_access_conf " .
             "-d $default_digest_file -p $default_pid_file $intf_str",
         'server_negative_output_matches' => [qr/Decryption\sfailed/i],
         'fw_rule_created' => $NEW_RULE_REQUIRED,