Commit Graph

1008 Commits

Author SHA1 Message Date
dtucker@openbsd.org 7cc3fe2889 upstream: Add test for client termination status on signal.
Based on patch from Alexxz via github PR#235 with some tweaks, to
match patch in bz#3281.

OpenBSD-Regress-ID: d87c7446fb8b5f8b45894fbbd6875df326e729e2
2021-09-03 14:35:07 +10:00
dtucker@openbsd.org cb37e2f0c0 upstream: Fix ssh-rsa fallback for old PuTTY interop tests.
OpenBSD-Regress-ID: a19ac929da604843a5b5f0f48d2c0eb6e0773d37
2021-09-01 13:32:45 +10:00
dtucker@openbsd.org 8b02ef0f28 upstream: Add a function to skip remaining tests.
Many tests skip tests for various reasons but not in a consistent way and
don't always clean up, so add that and switch the tests that do that over.

OpenBSD-Regress-ID: 72d2ec90a3ee8849486956a808811734281af735
2021-09-01 11:40:43 +10:00
dtucker@openbsd.org d486845c07 upstream: Specify path to PuTTY keys.
Portable needs this and it makes no difference on OpenBSD, so resync
them.  (Id sync only, Portable already had this.)

OpenBSD-Regress-ID: 33f6f66744455886d148527af8368811e4264162
2021-09-01 11:40:17 +10:00
dtucker@openbsd.org d22b299115 upstream: Better compat tests with old PuTTY.
When running PuTTY interop tests and using a PuTTY version older than
0.76, re-enable the ssh-rsa host key algorithm (the 256 and 512 variants
of RSA were added some time between 0.73 and 0.76).

OpenBSD-Regress-ID: e6138d6987aa705fa1e4f216db0bb386e1ff38e1
2021-08-31 17:08:38 +10:00
Darren Tucker 87ad70d605 Resync PuTTY interop tests.
Resync behaviour when REGRESS_INTEROP_PUTTY is not set with OpenBSD.
2021-08-31 17:04:50 +10:00
dtucker@openbsd.org e47b82a7bf upstream: Specify hostkeyalgorithms in SSHFP test.
Specify host key algorithms in sshd's default set for the SSHFP test,
from djm@.  Make the reason for when the test is skipped a bit clearer.

OpenBSD-Regress-ID: 4f923dfc761480d5411de17ea6f0b30de3e32cea
2021-08-31 12:02:12 +10:00
djm@openbsd.org 7db3e0a9e8 upstream: adapt to RSA/SHA1 deprectation
OpenBSD-Regress-ID: 952397c39a22722880e4de9d1c50bb1a14f907bb
2021-08-30 11:26:02 +10:00
Darren Tucker b71b2508f1 Put stdint.h inside HAVE_STDINT_H.
From Tom G. Christensen.
2021-08-17 07:59:27 +10:00
djm@openbsd.org 2a2cd00783 upstream: test -Oprint-pubkey
OpenBSD-Regress-ID: 3d51afb6d1f287975fb6fddd7a2c00a3bc5094e0
2021-08-11 18:56:35 +10:00
djm@openbsd.org 931f592f26 upstream: adapt to scp -M flag change; make scp3.sh test SFTP mode too
OpenBSD-Regress-ID: 43fea26704a0f0b962b53c1fabcb68179638f9c0
2021-08-10 13:37:27 +10:00
dtucker@openbsd.org 86b4cb3a88 upstream: Although it's POSIX, not all shells used in Portable support
the implicit 'in "$@"' after 'for i'.

OpenBSD-Regress-ID: 3c9aec6bca4868f85d2742b6ba5223fce110bdbc
2021-08-08 18:43:41 +10:00
Darren Tucker f2ccf6c9f3 Move portable specific settings down.
This brings the top hunk of the file back in sync with OpenBSD
so patches to the CVS Id should apply instead of always being
rejected.
2021-08-08 17:39:56 +10:00
dtucker@openbsd.org 71b0eb997e upstream: Move setting of USER further down the startup In portable
we have to change this and having it in the same hunk as the CVS Id string
means applying changes fails every. single. time.

OpenBSD-Regress-ID: 87cd603eb6db58c9b430bf90adacb7f90864429b
2021-08-08 17:35:45 +10:00
dtucker@openbsd.org f0aca2706c upstream: Drop -q in ssh-log-wrapper.sh to preserve logs.
scp and sftp like to add -q to the command line passed to ssh which
overrides the LogLevel we set in the config files and suppresses output
to the debug logs so drop any "-q" from the invoked ssh.  In the one
case where we actually want to use -q in the banner test, call the ssh
binary directly bypassing the logging wrapper.

OpenBSD-Regress-ID: e2c97d3c964bda33a751374c56f65cdb29755b75
2021-08-08 17:19:56 +10:00
dtucker@openbsd.org 395d8fbdb0 upstream: Make diff invocation more portable.
POSIX does not require diff to have -N, so compare in both directions
with just -r, which should catch missing files in either directory.

OpenBSD-Regress-ID: 0e2ec8594556a6f369ed5a0a90c6806419b845f7
2021-08-06 19:33:31 +10:00
djm@openbsd.org d247a73ce2 upstream: regression test for scp -3
OpenBSD-Regress-ID: b44375d125c827754a1f722ec6b6b75b634de05d
2021-08-06 16:57:37 +10:00
djm@openbsd.org af5d8094d8 upstream: regression tests for scp SFTP protocol support; mostly by
Jakub Jelen in GHPR#194 ok markus

OpenBSD-Regress-ID: 36f1458525bcb111741ec8547eaf58b13cddc715
2021-08-03 11:15:06 +10:00
anton@openbsd.org e4673b7f67 upstream: Treat doas with arguments as a valid SUDO variable.
Allows one to specify SUDO="doas -n" which I do while running make regress.

ok dtucker@

OpenBSD-Regress-ID: 4fe5814b5010dbf0885500d703bea06048d11005
2021-08-03 11:08:46 +10:00
dtucker@openbsd.org b398f499c6 upstream: Skip unit and makefile-based key conversion tests when
we're building with OPENSSL=no.

OpenBSD-Regress-ID: 20455ed9a977c93f846059d1fcb48e29e2c8d732
2021-07-25 22:37:19 +10:00
dtucker@openbsd.org 727ce36c8c upstream: Replace OPENSSL as the variable that points to the
openssl binary with OPENSSL_BIN.  This will allow us to use the OPENSSL
variable from mk.conf or the make(1) command line indicating if we're
building with our without OpenSSL, and ultimately get the regress tests
working in the OPENSSL=no configuration.

OpenBSD-Regress-ID: 2d788fade3264d7803e5b54cae8875963f688c4e
2021-07-25 22:35:24 +10:00
dtucker@openbsd.org 55e17101a9 upstream: Skip RFC4716 format import and export tests when built
without OpenSSL.

OpenBSD-Regress-ID: d2c2d5d38c1acc2b88cc99cfe00a2eb8bb39dfa4
2021-07-24 14:22:45 +10:00
djm@openbsd.org 9d38074b54 upstream: test for first-match-wins in authorized_keys environment=
options

OpenBSD-Regress-ID: 1517c90276fe84b5dc5821c59f88877fcc34c0e8
2021-07-24 12:31:05 +10:00
dtucker@openbsd.org 2b76f1dd19 upstream: Simplify keygen-convert by using $SSH_KEYTYPES directly.
OpenBSD-Regress-ID: cdbe408ec3671ea9ee9b55651ee551370d2a4108
2021-07-24 12:31:05 +10:00
dtucker@openbsd.org 1653ece683 upstream: Test conversion of ed25519 and ecdsa keys too.
OpenBSD-Regress-ID: 3676d2d00e58e0d6d37f2878f108cc2b83bbe4bb
2021-07-23 15:25:34 +10:00
dtucker@openbsd.org 8b7af02dcf upstream: Add test for exporting pubkey from a passphrase-protected
private key.

OpenBSD-Regress-ID: da99d93e7b235fbd5b5aaa01efc411225e6ba8ac
2021-07-23 15:25:34 +10:00
djm@openbsd.org 441095d4a3 upstream: regression test for time-limited signature keys
OpenBSD-Regress-ID: 2a6f3bd900dbee0a3c96f1ff23e032c93ab392bc
2021-07-23 15:25:34 +10:00
dtucker@openbsd.org 44142068dc upstream: Use SUDO when setting up hostkey.
OpenBSD-Regress-ID: 990cf4481cab8dad62e90818a9b4b36c533851a7
2021-07-19 19:20:33 +10:00
dtucker@openbsd.org 6b67f3f1d1 upstream: Increase time margin for rekey tests. Should help
reliability on very heavily loaded hosts.

OpenBSD-Regress-ID: 4c28a0fce3ea89ebde441d7091464176e9730533
2021-07-19 17:08:56 +10:00
Darren Tucker 7953e1bfce Add sshfp-connect.sh file missed in previous. 2021-07-19 13:47:51 +10:00
dtucker@openbsd.org 33abbe2f41 upstream: Add test for host key verification via SSHFP records. This
requires some external setup to operate so is disabled by default (see
comments in sshfp-connect.sh).

OpenBSD-Regress-ID: c52c461bd1df3a803d17498917d156ef64512fd9
2021-07-19 13:02:55 +10:00
dtucker@openbsd.org f0cd000d8e upstream: Add ed25519 key and test SSHFP export of it. Only test
RSA SSHFP export if we have RSA functionality compiled in.

OpenBSD-Regress-ID: b4ff5181b8c9a5862e7f0ecdd96108622333a9af
2021-07-19 12:50:51 +10:00
dtucker@openbsd.org 0075511e27 upstream: Group keygen tests together.
OpenBSD-Regress-ID: 07e2d25c527bb44f03b7c329d893a1f2d6c5c40c
2021-07-19 12:50:12 +10:00
dtucker@openbsd.org 034828820c upstream: Add test for ssh-keygen printing of SSHFP records.
OpenBSD-Regress-ID: fde9566b56eeb980e149bbe157a884838507c46b
2021-07-19 09:23:57 +10:00
djm@openbsd.org 7ae69f2628 upstream: fix some broken tests; clean up output
OpenBSD-Regress-ID: 1d5038edb511dc4ce1622344c1e724626a253566
2021-07-14 09:20:56 +10:00
dtucker@openbsd.org 31fac20c94 upstream: Use $SUDO when reading sshd's pidfile here too.
OpenBSD-Regress-ID: 6bfb0d455d493f24839034a629c5306f84dbd409
2021-06-10 20:15:20 +10:00
dtucker@openbsd.org a3a58acffc upstream: Use $SUDO when reading sshd's pidfile in case it was
created with a very restrictive umask.  This resyncs with -portable.

OpenBSD-Regress-ID: 07fd2af06df759d4f64b82c59094accca1076a5d
2021-06-10 20:14:56 +10:00
dtucker@openbsd.org 249ad4ae51 upstream: Set umask when creating hostkeys to prevent excessive
permissions warning.

OpenBSD-Regress-ID: 382841db0ee28dfef7f7bffbd511803e1b8ab0ef
2021-06-10 20:13:09 +10:00
dtucker@openbsd.org 9d0892153c upstream: Add regress test for SIGHUP restart
while handling active and unauthenticated clients.  Should catch anything
similar to the pselect bug just fixed in sshd.c.

OpenBSD-Regress-ID: 3b3c19b5e75e43af1ebcb9586875b3ae3a4cac73
2021-06-10 19:49:13 +10:00
djm@openbsd.org c785c0ae13 upstream: test that UserKnownHostsFile correctly accepts multiple
arguments; would have caught readconf.c r1.356 regression

OpenBSD-Regress-ID: 71ca54e66c2a0211b04999263e56390b1f323a6a
2021-06-09 08:38:51 +10:00
djm@openbsd.org 78e30af3e2 upstream: test argv_split() optional termination on comments
OpenBSD-Regress-ID: 9fd1c4a27a409897437c010cfd79c54b639a059c
2021-06-08 17:41:56 +10:00
dtucker@openbsd.org a023138957 upstream: Add testcases from bz#3319 for IPQoS and TunnelDevice
being overridden on the command line.

OpenBSD-Regress-ID: 801674d5d2d02abd58274a78cab2711f11de14a8
2021-06-08 17:17:24 +10:00
djm@openbsd.org 660cea10b2 upstream: sprinkle some "# comment" at end of configuration lines
to test comment handling

OpenBSD-Regress-ID: cb82fbf40bda5c257a9f742c63b1798e5a8fdda7
2021-06-08 17:17:24 +10:00
djm@openbsd.org acc9c32dcb upstream: more descriptive failure message
OpenBSD-Regress-ID: 5300f6faf1d9e99c0cd10827b51756c5510e3509
2021-06-08 17:17:24 +10:00
djm@openbsd.org ce04dd4eae upstream: test AuthenticationMethods inside a Match block as well
as in the main config section

OpenBSD-Regress-ID: ebe0a686621b7cb8bb003ac520975279c28747f7
2021-06-08 17:17:24 +10:00
djm@openbsd.org 9018bd821f upstream: prepare for stricter sshd_config parsing that will refuse
a config that has {Allow,Deny}{Users,Groups} on a line with no subsequent
arguments. Such lines are permitted but are nonsensical noops ATM

OpenBSD-Regress-ID: ef65463fcbc0bd044e27f3fe400ea56eb4b8f650
2021-06-08 17:17:24 +10:00
Darren Tucker 5de0867b82 Check for $OPENSSL in md5 fallback too. 2021-06-02 11:22:12 +10:00
dtucker@openbsd.org a3f2dd955f upstream: Merge back shell portability changes
bringing it back in sync with -portable.

OpenBSD-Regress-ID: c07905ba931e66ad7d849b87b7d19648007175d1
2021-06-02 10:33:46 +10:00
dtucker@openbsd.org 9d482295c9 upstream: Use a default value for $OPENSSL,
allowing it to be overridden. Do the same in the PuTTY tests since it's
needed there and not exported by test-exec.sh.

OpenBSD-Regress-ID: c49dcd6aa7602a8606b7afa192196ca1fa65de16
2021-06-02 10:11:25 +10:00
dtucker@openbsd.org 07660b3c99 upstream: Find openssl binary via environment variable. This
allows overriding if necessary (eg in -portable where we're testing against a
specific version of OpenSSL).

OpenBSD-Regress-ID: 491f39cae9e762c71aa4bf045803d077139815c5
2021-06-01 14:38:41 +10:00