Commit Graph

75 Commits

Author SHA1 Message Date
djm@openbsd.org dd369320d2 upstream commit
eliminate explicit specification of protocol in tests and
loops over protocol. We only support SSHv2 now.

Upstream-Regress-ID: 0082838a9b8a382b7ee9cbf0c1b9db727784fadd
2017-05-01 11:59:42 +10:00
dtucker@openbsd.org 0c4430a19b upstream commit
Remove deprecated SSH1 options RSAAuthentication and
RhostsRSAAuthentication from regression test sshd_config.

Upstream-Regress-ID: 8066b753d9dce7cf02ff87af5c727ff680d99491
2017-02-17 14:52:25 +11:00
dtucker@openbsd.org 2f2ffa4fbe upstream commit
Move the "stop sshd" code into its own helper function.
Patch from Zev Weiss <zev at bewilderbeest.net>, ok djm@

Upstream-Regress-ID: a113dea77df5bd97fb4633ea31f3d72dbe356329
2016-12-16 13:16:34 +11:00
dtucker@openbsd.org 79e4829ec8 upstream commit
Allow PuTTY interop tests to run unattended.  bz#2639,
patch from cjwatson at debian.org.

Upstream-Regress-ID: 4345253558ac23b2082aebabccd48377433b6fe0
2016-11-29 17:19:57 +11:00
dtucker@openbsd.org 504c3a9a1b upstream commit
Reverse args to sshd-log-wrapper.  Matches change in
portable, where it allows sshd do be optionally run under Valgrind.

Upstream-Regress-ID: b438d1c6726dc5caa2a45153e6103a0393faa906
2016-11-29 17:19:21 +11:00
dtucker@openbsd.org bd13017736 upstream commit
Fix typo in trace message; from portable.

Upstream-Regress-ID: 4c4a2ba0d37faf5fd230a91b4c7edb5699fbd73a
2016-11-29 17:17:19 +11:00
djm@openbsd.org a39627134f upstream commit
remove Protocol directive from client/server configs that
causes spammy deprecation warnings

hardcode SSH_PROTOCOLS=2, since that's all we support on the server
now (the client still may support both, so it could get confused)

Upstream-Regress-ID: c16662c631af51633f9fd06aca552a70535de181
2016-08-23 16:38:10 +10:00
djm@openbsd.org 0f839e5969 upstream commit
missing bit of Include regress

Upstream-Regress-ID: 1063595f7f40f8489a1b7a27230b9e8acccea34f
2016-04-15 12:58:35 +10:00
djm@openbsd.org 0767877024 upstream commit
add test knob and warning for StrictModes

Upstream-Regress-ID: 8cd10952ce7898655ee58945904f2a0a3bdf7682
2016-04-15 11:16:12 +10:00
Darren Tucker d9b9b43656 Fix misspellings of regress CONFOPTS env variables.
Patch from Bryan Drewery.
2015-04-07 09:10:00 +10:00
Tim Rice 9f82e5a904 portability fix: Solaris systems may not have a grep that understands -q 2015-03-16 22:49:20 -07:00
markus@openbsd.org dad2b1892b upstream commit
make it possible to run tests w/o ssh1 support; ok djm@
2015-03-05 05:59:47 +11:00
Damien Miller bd58853102 valgrind support 2015-02-26 14:55:55 -08:00
Damien Miller 612f965239 - djm@cvs.openbsd.org 2014/07/06 07:42:03
[multiplex.sh test-exec.sh]
     add a hook to the cleanup() function to kill $SSH_PID if it is set

     use it to kill the mux master started in multiplex.sh (it was being left
     around on fatal failures)
2014-07-09 13:22:03 +10:00
Darren Tucker 6e2fe81f92 - dtucker@cvs.openbsd.org 2013/11/09 05:41:34
[regress/test-exec.sh regress/rekey.sh]
     Use smaller test data files to speed up tests.  Grow test datafiles
     where necessary for a specific test.
2013-11-09 16:55:03 +11:00
Darren Tucker acd2060f75 - (dtucker) [regress/Makefile regress/test-exec.sh] Roll back the -nt
removal.  The "make clean" removes modpipe which is built by the top-level
   directory before running the tests.  Spotted by tim@
2013-08-08 17:02:12 +10:00
Darren Tucker a5a3cbfa0f - (dtucker) [regress/Makefile regress/test-exec.sh] Don't try to use test -nt
since some platforms (eg really old FreeBSD) don't have it.  Instead,
   run "make clean" before a complete regress run.  ok djm.
2013-08-08 10:58:49 +10:00
Damien Miller d1e26cf391 - djm@cvs.openbsd.org 2013/06/21 02:26:26
[regress/sftp-cmds.sh regress/test-exec.sh]
     unbreak sftp-cmds for renamed test data (s/ls/data/)
2013-07-25 12:11:18 +10:00
Damien Miller fea440639e - dtucker@cvs.openbsd.org 2013/05/30 20:12:32
[regress/test-exec.sh]
     use ssh and sshd as testdata since it needs to be >256k for the rekey test
2013-07-25 12:08:07 +10:00
Darren Tucker 00478d30cb - dtucker@cvs.openbsd.org 2013/05/17 10:30:07
[regress/test-exec.sh]
     wait a bit longer for startup and use case for absolute path.
     from portable (id sync only)
2013-05-17 20:45:06 +10:00
Darren Tucker 05b5e518c9 - dtucker@cvs.openbsd.org 2013/05/17 10:23:52
[regress/login-timeout.sh regress/reexec.sh regress/test-exec.sh]
     Use SUDO when cat'ing pid files and running the sshd log wrapper so that
     it works with a restrictive umask and the pid files are not world readable.
     Changes from -portable.  (id sync only)
2013-05-17 20:41:07 +10:00
Darren Tucker f8d5b34517 - (dtucker) [regress/stderr-after-eof.sh regress/test-exec.sh] Move the md5
helper function to the portable part of test-exec.sh.
2013-05-17 19:53:25 +10:00
Darren Tucker 6f66981ed3 - (dtucker) [regress/test-exec.sh] Move the portable-specific functions
together and add a couple of missing lines from openbsd.
2013-05-17 19:28:51 +10:00
Darren Tucker 5f1a89a3b6 - (dtucker) [regress/integrity.sh regress/krl.sh regress/test-exec.sh]
Move the jot helper function to portable-specific part of test-exec.sh.
2013-05-17 19:17:58 +10:00
Darren Tucker 59d928d3b4 - dtucker@cvs.openbsd.org 2013/05/17 04:29:14
[regress/sftp.sh regress/putty-ciphers.sh regress/cipher-speed.sh
     regress/test-exec.sh regress/sftp-batch.sh regress/dynamic-forward.sh
     regress/putty-transfer.sh regress/conch-ciphers.sh regress/sftp-cmds.sh
     regress/scp.sh regress/ssh-com-sftp.sh regress/rekey.sh
     regress/putty-kex.sh regress/stderr-data.sh regress/stderr-after-eof.sh
     regress/sftp-badcmds.sh regress/reexec.sh regress/ssh-com-client.sh
     regress/sftp-chroot.sh regress/forwarding.sh regress/transfer.sh
     regress/multiplex.sh]
     Move the setting of DATA and COPY into test-exec.sh
2013-05-17 15:32:29 +10:00
Darren Tucker 56347efe79 - dtucker@cvs.openbsd.org 2013/05/17 00:37:40
[regress/agent.sh regress/keytype.sh regress/cfgmatch.sh
     regress/forcecommand.sh regress/proto-version.sh regress/test-exec.sh
     regress/cipher-speed.sh regress/cert-hostkey.sh regress/cert-userkey.sh
     regress/ssh-com.sh]
     replace 'echo -n' with 'printf' since it's more portable
     also remove "echon" hack.
2013-05-17 13:28:36 +10:00
Darren Tucker dfea3bcdd7 - dtucker@cvs.openbsd.org 2013/04/07 02:16:03
[regress/Makefile regress/rekey.sh regress/integrity.sh
     regress/sshd-log-wrapper.sh regress/forwarding.sh regress/test-exec.sh]
     use -E option for ssh and sshd to write debuging logs to ssh{,d}.log and
     save the output from any failing tests.  If a test fails the debug output
     from ssh and sshd for the failing tests (and only the failing tests) should
     be available in failed-ssh{,d}.log.
2013-05-17 09:31:39 +10:00
Darren Tucker 75129025a2 - dtucker@cvs.openbsd.org 2013/04/06 06:00:22
[regress/rekey.sh regress/test-exec.sh regress/integrity.sh
     regress/multiplex.sh Makefile regress/cfgmatch.sh]
     Split the regress log into 3 parts: the debug output from ssh, the debug
     log from sshd and the output from the client command (ssh, scp or sftp).
     Somewhat functional now, will become more useful when ssh/sshd -E is added.
2013-05-17 09:19:10 +10:00
Darren Tucker 7c8b1e7233 - dtucker@cvs.openbsd.org 2013/03/23 11:09:43
[test-exec.sh]
     Only regenerate host keys if they don't exist or if ssh-keygen has changed
     since they were.  Reduces test runtime by 5-30% depending on machine
     speed.
2013-05-17 09:10:20 +10:00
Darren Tucker fe10a28e08 - (dtucker) [regress/Makefile regress/cipher-speed.sh regress/test-exec.sh]
Improve portability of cipher-speed test, based mostly on a patch from
   Iain Morgan.
2013-03-12 11:19:40 +11:00
Darren Tucker 6ea5dc6bb8 - (dtucker) [regress/test-exec.sh] Correct uname for cygwin/w2k. 2012-07-03 01:11:28 +10:00
Darren Tucker ec1e15d51a - (dtucker) [regress/reexec.sh regress/sftp-cmds.sh regress/test-exec.sh]
Move cygwin detection to test-exec and use to skip reexec test on cygwin.
2012-07-03 01:06:49 +10:00
Damien Miller 6efd94f32e - (djm) [regress/connect-privsep.sh regress/test-exec.sh] demote fatal
regress errors for the sandbox to warnings. ok tim dtucker
2011-09-04 19:04:16 +10:00
Damien Miller 58497780ab - (djm) [configure.ac regress/agent-getpeereid.sh regress/multiplex.sh]
[regress/sftp-glob.sh regress/test-exec.sh] Rework how feature tests are
   disabled on platforms that do not support them; add a "config_defined()"
   shell function that greps for defines in config.h and use them to decide
   on feature tests.
   Convert a couple of existing grep's over config.h to use the new function
   Add a define "FILESYSTEM_NO_BACKSLASH" for filesystem that can't represent
   backslash characters in filenames, enable it for Cygwin and use it to turn
   of tests for quotes backslashes in sftp-glob.sh.
   based on discussion with vinschen AT redhat.com and dtucker@; ok dtucker@
2011-01-17 16:17:09 +11:00
Tim Rice 722b8d14f1 - (tim) [regress/login-timeout.sh regress/reconfigure.sh regress/reexec.sh
regress/test-exec.sh] Under certain conditions when testing with sudo
   tests would fail because the pidfile could not be read by a regular user.
   "cat: cannot open ...../regress/pidfile: Permission denied (error 13)"
   Make sure cat is run by $SUDO.  no objection from me. djm@
2010-08-12 09:43:13 -07:00
Damien Miller c1739211a6 - djm@cvs.openbsd.org 2010/02/24 06:21:56
[regress/test-exec.sh]
     wait for sshd to fully stop in cleanup() function; avoids races in tests
     that do multiple start_sshd/cleanup cycles; "I hate pidfiles" deraadt@
2010-02-24 17:29:34 +11:00
Darren Tucker e23a79cbed - markus@cvs.openbsd.org 2009/10/08 18:04:27
[regress/test-exec.sh]
     re-enable protocol v1 for the tests.
2009-10-12 09:37:22 +11:00
Damien Miller a766cea689 - (djm) [regress/Makefile] search for conch by path, like we do putty 2008-06-30 08:12:37 +10:00
Damien Miller 4268a136d4 - djm@cvs.openbsd.org 2008/06/28 13:57:25
[regress/Makefile regress/test-exec.sh regress/conch-ciphers.sh]
     very basic regress test against Twisted Conch in "make interop"
     target (conch is available in ports/devel/py-twisted/conch);
     ok markus@
2008-06-30 08:07:56 +10:00
Darren Tucker d8bafea5a0 - dtucker@cvs.openbsd.org 2008/06/10 15:28:49
[test-exec.sh]
     Add quotes
2008-06-11 01:39:38 +10:00
Darren Tucker 5f346649ce - dtucker@cvs.openbsd.org 2008/06/10 15:21:41
[test-exec.sh]
     Use a more portable construct for checking if we're running a putty test
2008-06-11 01:38:52 +10:00
Darren Tucker d788b7cb35 - dtucker@cvs.openbsd.org 2008/06/09 18:06:32
[regress/test-exec.sh]
     Don't generate putty keys if we're not going to use them.  ok djm
2008-06-10 23:15:54 +10:00
Damien Miller 8f8b156acc - (djm) [regress/test-exec.sh] Quote putty-related variables in case they are
empty; report and patch from Peter Stuge
 - (djm) [regress/test-exec.sh] Silence noise from detection of putty
   commands; report from Peter Stuge
2008-03-15 09:25:54 +11:00
Damien Miller c2cefb0fe9 - (djm) [Makefile.in regress/test-exec.sh] Find installed plink(1) and
puttygen(1) by $PATH
2008-03-13 12:41:31 +11:00
Damien Miller af78493bba - djm@cvs.openbsd.org 2007/12/21 04:13:53
[regress/Makefile regress/test-exec.sh regress/putty-ciphers.sh]
     [regress/putty-kex.sh regress/putty-transfer.sh regress/ssh2putty.sh]
     basic (crypto, kex and transfer) interop regression tests against putty
     To run these, install putty and run "make interop-tests" from the build
     directory - the tests aren't run by default yet.
2008-03-13 00:17:00 +11:00
Damien Miller da1e4bd3bf - djm@cvs.openbsd.org 2007/10/26 05:30:01
[regress/sftp-glob.sh regress/test-exec.sh]
     remove "echo -E" crap that I added in last commit and use printf(1) for
     cases where we strictly require echo not to reprocess escape characters.
2007-10-26 15:35:54 +10:00
Damien Miller ce0e60ee57 - djm@cvs.openbsd.org 2007/10/24 03:32:35
[regress/sftp-cmds.sh regress/sftp-glob.sh regress/test-exec.sh]
     comprehensive tests for sftp escaping its interaction with globbing;
     ok dtucker@
2007-10-26 14:54:12 +10:00
Damien Miller e682cb0780 - (djm) [regress/test-exec.sh] Try 'logname' as well as 'whoami' to
determine the user's login name - needed for regress tests on Solaris
   10 and OpenSolaris
2006-02-01 11:21:01 +11:00
Damien Miller 76be6b8765 - djm@cvs.openbsd.org 2005/05/20 23:14:15
[regress/test-exec.sh]
     force addressfamily=inet for tests, unbreaking dynamic-forward regress for
     recently committed nc SOCKS5 changes
2006-01-31 21:59:01 +11:00
Darren Tucker faec5ca73f - (dtucker) [regress/test-exec.sh] Use 1024 bit keys since we generate so
many and use them only once.  Speeds up testing on older/slower hardware.
2005-11-24 23:18:54 +11:00