Daniel Black's test suite fixes and initial test cases for SOCKS4/5 using

openssh

1 files changed, 9 insertions, 2 deletions

diff --git a/tests/README b/tests/README
index 8eaeee21f..aa442f755 100644
--- a/tests/README
+++ b/tests/README
@@ -11,6 +11,8 @@ Requires:
   diff (when a test fail, a diff is shown)
   stunnel (for HTTPS and FTPS tests)
   sshd (for SCP and SFTP tests; OpenSSH ver. 3.8 is known to work)
+  ssh (for SOCKS4 and SOCK5 tests; OpenSSH ver. 4.5 is known to work.
+       OpenSSH version 3.7 or greater is needed for SOCKS5)
 
 TCP ports used by default:
 
@@ -23,11 +25,13 @@ TCP ports used by default:
   - 8996 on localhost for FTP IPv6 tests
   - 8997 on localhost for TFTP tests
   - 8999 on localhost for SCP/SFTP tests
+  - 9000 on localhost for SOCKS tests
 
   The test suite runs simple FTP, HTTP and TFTP servers on these ports to
   which it makes requests.  For SSL tests, it runs stunnel to handle
   encryption to the regular servers. For SSH, it runs a standard OpenSSH
-  server.  
+  server. For SOCKS4/5 tests SSH is used to perform the SOCKS functionality
+  and requires a SSH client and server.
 
   The base port number shown above can be changed using runtests' -b option
   to allow running more than one instance of the test suite simultaneously
@@ -92,7 +96,8 @@ TEST CASE NUMBERS
  400 - 499   FTPS
  500 - 599   libcurl source code tests, not using the curl command tool
  600 - 699   SCP/SFTP
- 700 - 799   miscellanous*
+ 700 - 799   SOCKS4 (even numbers) and SOCK5 (odd numbers)
+ 1000 - x    miscellanous*
 
  Since 30-apr-2003, there's nothing in the system that requires us to keep
  within these number series, and those sections marked with * actually
@@ -102,3 +107,5 @@ TEST CASE NUMBERS
 TODO:
 
   * Add tests for TELNET, LDAP, DICT...
+  * SOCKS4/5 test deficiencies - no proxy authentication tests as SSH (the 
+    test mechanism) doesn't support them