[ProFTPD-committers] proftpd/tests/t/lib/ProFTPD/Tests/Modules mod_sftp.pm, 1.138, 1.139

[TJ S. <cas...@us...>]

Update of /cvsroot/proftp/proftpd/tests/t/lib/ProFTPD/Tests/Modules
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26020/t/lib/ProFTPD/Tests/Modules

Modified Files:
	mod_sftp.pm 
Log Message:

Fix the mod_sftp regression tests which SHOULD have caught Bug#4033.


Index: mod_sftp.pm
===================================================================
RCS file: /cvsroot/proftp/proftpd/tests/t/lib/ProFTPD/Tests/Modules/mod_sftp.pm,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -d -r1.138 -r1.139
--- mod_sftp.pm	21 Feb 2014 06:06:50 -0000	1.138
+++ mod_sftp.pm	2 Mar 2014 06:09:06 -0000	1.139
@@ -5687,6 +5687,7 @@
         "SFTPLog $log_file",
         "SFTPHostKey $rsa_host_key",
         "SFTPHostKey $dsa_host_key",
+        "SFTPCiphers none",
       ],
     },
   };
@@ -5723,7 +5724,7 @@
       }
 
       my $cipher_used = $ssh2->method('crypt_cs');
-      $self->assert($cipher ne $cipher_used,
+      $self->assert($cipher eq $cipher_used,
         test_msg("Expected '$cipher', got '$cipher_used'"));
 
       $ssh2->disconnect();
@@ -6756,6 +6757,7 @@
         "SFTPLog $log_file",
         "SFTPHostKey $rsa_host_key",
         "SFTPHostKey $dsa_host_key",
+        "SFTPCiphers none",
       ],
     },
   };
@@ -6792,7 +6794,7 @@
       }
 
       my $cipher_used = $ssh2->method('crypt_sc');
-      $self->assert($cipher ne $cipher_used,
+      $self->assert($cipher eq $cipher_used,
         test_msg("Expected '$cipher', got '$cipher_used'"));
 
       $ssh2->disconnect();
@@ -7554,6 +7556,7 @@
         "SFTPLog $log_file",
         "SFTPHostKey $rsa_host_key",
         "SFTPHostKey $dsa_host_key",
+        "SFTPDigests none",
       ],
     },
   };
@@ -7590,7 +7593,7 @@
       }
 
       my $mac_used = $ssh2->method('mac_cs');
-      $self->assert($mac ne $mac_used,
+      $self->assert($mac eq $mac_used,
         test_msg("Expected '$mac', got '$mac_used'"));
 
       $ssh2->disconnect();
@@ -8352,6 +8355,7 @@
         "SFTPLog $log_file",
         "SFTPHostKey $rsa_host_key",
         "SFTPHostKey $dsa_host_key",
+        "SFTPDigests none",
       ],
     },
   };
@@ -8388,7 +8392,7 @@
       }
 
       my $mac_used = $ssh2->method('mac_sc');
-      $self->assert($mac ne $mac_used,
+      $self->assert($mac eq $mac_used,
         test_msg("Expected '$mac', got '$mac_used'"));
 
       $ssh2->disconnect();