Commit Graph

639 Commits

Author SHA1 Message Date
bluhm@openbsd.org ca71c36645 upstream commit
Add a makefile rule to create the ssh library when
regress needs it.  This allows to run the ssh regression tests without doing
a "make build" before. Discussed with dtucker@ and djm@; OK djm@

Upstream-Regress-ID: ce489bd53afcd471225a125b4b94565d4717c025
2016-10-01 06:44:43 +10:00
bluhm@openbsd.org ce44c970f9 upstream commit
Allow to run ssh regression tests as root.  If the user
is already root, the test should not expect that SUDO is set.  If ssh needs
another user, use sudo or doas to switch from root if necessary. OK dtucker@

Upstream-Regress-ID: b464e55185ac4303529e3e6927db41683aaeace2
2016-10-01 06:44:00 +10:00
djm@openbsd.org 5f63ab474f upstream commit
disable tests for affirmative negated match after backout of
match change

Upstream-Regress-ID: acebb8e5042f03d66d86a50405c46c4de0badcfd
2016-09-22 03:15:25 +10:00
djm@openbsd.org 119b7a2ca0 upstream commit
test all the AuthorizedPrincipalsCommand % expansions

Upstream-Regress-ID: 0a79a84dfaa59f958e46b474c3db780b454d30e3
2016-09-21 11:43:57 +10:00
djm@openbsd.org 920585b826 upstream commit
add a note on kexfuzz' limitations

Upstream-Regress-ID: 03804d4a0dbc5163e1a285a4c8cc0a76a4e864ec
2016-09-21 11:07:47 +10:00
djm@openbsd.org 0445ff1840 upstream commit
fix for newer modp DH groups
(diffie-hellman-group14-sha256 etc)

Upstream-Regress-ID: fe942c669959462b507516ae1634fde0725f1c68
2016-09-21 11:07:47 +10:00
dtucker@openbsd.org 2b939c272a upstream commit
Improve test coverage of ssh-keygen -T a bit.

Upstream-Regress-ID: 8851668c721bcc2b400600cfc5a87644cc024e72
2016-09-14 11:34:59 +10:00
dtucker@openbsd.org 44d82fc83b upstream commit
Add testcase for ssh-keygen -j, -J and -K options for
moduli screening. Does not currently test generation as that is extremely
slow.

Upstream-Regress-ID: 9de6ce801377ed3ce0a63a1413f1cd5fd3c2d062
2016-09-14 10:57:21 +10:00
djm@openbsd.org 44e5f756d2 upstream commit
add tests for addr_match_list()

Upstream-Regress-ID: fae2d1fef84687ece584738a924c7bf969616c8e
2016-09-14 10:55:22 +10: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
Damien Miller 6ee4f1c01e hook match and utf8 unittests up to Makefile 2016-08-23 16:33:48 +10:00
djm@openbsd.org 114efe2bc0 upstream commit
add tests for matching functions

Upstream-Regress-ID: 0869d4f5c5d627c583c6a929d69c17d5dd65882c
2016-08-23 15:18:57 +10:00
Darren Tucker eac1bbd068 Conditionally include err.h. 2016-07-18 17:12:22 +10:00
Darren Tucker 0a45414756 Remove local implementation of err, errx.
We now have a shared implementation in libopenbsd-compat.
2016-07-18 16:27:26 +10:00
dtucker@openbsd.org ee67716f61 upstream commit
Correct equal in test.

Upstream-Regress-ID: 4e32f7a5c57a619c4e8766cb193be2a1327ec37a
2016-07-14 11:39:34 +10:00
Damien Miller 8aaec70506 fix missing include for systems with err.h 2016-07-14 09:48:48 +10:00
Darren Tucker 6310ef27a2 Move err.h replacements into compat lib.
Move implementations of err.h replacement functions into their own file
in the libopenbsd-compat so we can use them in kexfuzz.c too.  ok djm@
2016-07-13 14:42:35 +10:00
guenther@openbsd.org 18813a32b6 upstream commit
DEBUGLIBS has been broken since the gcc4 switch, so delete
it.  CFLAGS contains -g by default anyway

problem noted by Edgar Pettijohn (edgar (at) pettijohn-web.com)
ok millert@ kettenis@ deraadt@

Upstream-Regress-ID: 4a0bb72f95c63f2ae9daa8a040ac23914bddb542
2016-07-08 13:51:12 +10:00
Darren Tucker 9f919d1a32 Remove now-defunct .cvsignore files. ok djm 2016-06-14 13:51:01 +10:00
dtucker@openbsd.org e6508898c3 upstream commit
Add a test for ssh(1)'s config file parsing.

Upstream-Regress-ID: 558b7f4dc45cc3761cc3d3e889b9f3c5bc91e601
2016-06-08 11:46:32 +10:00
dtucker@openbsd.org ab0a536066 upstream commit
Add 'sshd' to the test ID as I'm about to add a similar
 set for ssh.

Upstream-Regress-ID: aea7a9c3bac638530165c801ce836875b228ae7a
2016-06-08 11:45:39 +10:00
schwarze@openbsd.org a5577c1ed3 upstream commit
stricter malloc.conf(5) options for utf8 tests

Upstream-Regress-ID: 111efe20a0fb692fa1a987f6e823310f9b25abf6
2016-06-08 11:45:05 +10:00
schwarze@openbsd.org 75f0844b4f upstream commit
Fix two rare edge cases: 1. If vasprintf() returns < 0,
 do not access a NULL pointer in snmprintf(), and do not free() the pointer
 returned from vasprintf() because on some systems other than OpenBSD, it
 might be a bogus pointer. 2. If vasprintf() returns == 0, return 0 and ""
 rather than -1 and NULL.

Besides, free(dst) is pointless after failure (not a bug).

One half OK martijn@, the other half OK deraadt@;
committing quickly before people get hurt.

Upstream-Regress-ID: b164f20923812c9bac69856dbc1385eb1522cba4
2016-06-08 11:45:05 +10:00
schwarze@openbsd.org 016881eb33 upstream commit
test the new utf8 module

Upstream-Regress-ID: c923d05a20e84e4ef152cbec947fdc4ce6eabbe3
2016-06-08 11:45:05 +10:00
dtucker@openbsd.org d4219028bd upstream commit
Set umask to prevent "Bad owner or permissions" errors.

Upstream-Regress-ID: 8fdf2fc4eb595ccd80c443f474d639f851145417
2016-06-08 11:42:39 +10:00
djm@openbsd.org 07d5608bb2 upstream commit
support doas

Upstream-Regress-ID: 8d5572b27ea810394eeda432d8b4e9e1064a7c38
2016-06-08 11:42:39 +10:00
djm@openbsd.org 01cabf10ad upstream commit
unit tests for sshbuf_dup_string()

Upstream-Regress-ID: 7521ff150dc7f20511d1c2c48fd3318e5850a96d
2016-06-08 11:40:38 +10:00
dtucker@openbsd.org cca3b43958 upstream commit
Use a subshell for constructing key types to work around
 different sed behaviours for -portable.

Upstream-Regress-ID: 0f6eb673162df229eda9a134a0f10da16151552d
2016-05-03 23:05:32 +10:00
djm@openbsd.org 67f1459efd upstream commit
unit and regress tests for SHA256/512; ok markus

Upstream-Regress-ID: a0cd1a92dc824067076a5fcef83c18df9b0bf2c6
2016-05-02 20:59:50 +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 12e4ac46ae upstream commit
remove redundant CLEANFILES section

Upstream-Regress-ID: 29ef1b267fa56daa60a1463396635e7d53afb587
2016-04-15 12:58:09 +10:00
djm@openbsd.org b1d05aa653 upstream commit
sync CLEANFILES with portable, sort

Upstream-Regress-ID: cb782f4f1ab3e079efbc335c6b64942f790766ed
2016-04-15 11:16:13 +10:00
djm@openbsd.org 35f22dad26 upstream commit
regression test for ssh_config Include directive

Upstream-Regress-ID: 46a38c8101f635461c506d1aac2d96af80f97f1e
2016-04-15 11:16:13 +10:00
djm@openbsd.org 6b8a1a8700 upstream commit
unbreak test for recent ssh de-duplicated forwarding
 change

Upstream-Regress-ID: 6b2b115d99acd7cff13986e6739ea214cf2a3da3
2016-04-15 11:16:12 +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 732b463d37 Pass supported malloc options to connect-privsep.
This allows us to activate only the supported options during the malloc
option portion of the connect-privsep test.
2016-03-14 16:04:23 +11:00
Darren Tucker e960051f9a Wrap stdint.h inside #ifdef HAVE_STDINT_H. 2016-03-09 13:14:18 +11:00
Damien Miller c425494d6b unbreak kexfuzz for -Werror without __bounded__ 2016-03-08 14:03:54 -08:00
dtucker@openbsd.org 331b8e07ee upstream commit
Filter debug messages out of log before picking the last
 two lines. Should prevent problems if any more debug output is added late in
 the connection.

Upstream-Regress-ID: 345d0a9589c381e7d640a4ead06cfaadf4db1363
2016-03-04 15:12:25 +11:00
djm@openbsd.org 0892edaa3c upstream commit
add KEX fuzzer harness; ok deraadt@

Upstream-Regress-ID: 3df5242d30551b12b828aa9ba4a4cec0846be8d1
2016-03-04 15:12:24 +11:00
dtucker@openbsd.org ae2562c47d upstream commit
Look back 3 lines for possible error messages.  Changes
 to the code mean that "Bad packet length" errors are 3 lines back instead of
 the previous two, which meant we didn't skip some offsets that we intended
 to.

Upstream-Regress-ID: 24f36912740a634d509a3144ebc8eb7c09b9c684
2016-03-04 15:12:22 +11:00
Damien Miller 1acc058d0a Disable tests where fs perms are incorrect
Some tests have strict requirements on the filesystem permissions
for certain files and directories. This adds a regress/check-perm
tool that copies the relevant logic from sshd to exactly test
the paths in question. This lets us skip tests when the local
filesystem doesn't conform to our expectations rather than
continuing and failing the test run.

ok dtucker@
2016-02-23 17:40:16 +11:00
djm@openbsd.org 624fd395b5 upstream commit
include bad $SSH_CONNECTION in failure output

Upstream-Regress-ID: b22d72edfde78c403aaec2b9c9753ef633cc0529
2016-02-17 16:37:54 +11:00
dtucker@openbsd.org 537f88ec7b upstream commit
Add regression test for RekeyLimit parsing of >32bit values
 (4G and 8G).

Upstream-Regress-ID: 548390350c62747b6234f522a99c319eee401328
2016-02-04 16:13:37 +11:00
djm@openbsd.org da98c11d03 upstream commit
basic unit tests for rsa-sha2-* signature types

Upstream-Regress-ID: 7dc4b9db809d578ff104d591b4d86560c3598d3c
2015-12-07 13:21:30 +11:00
djm@openbsd.org b67e2e76fc upstream commit
regress test for "PubkeyAcceptedKeyTypes +..." inside a
 Match block

Upstream-Regress-ID: 246c37ed64a2e5704d4c158ccdca1ff700e10647
2015-10-29 19:07:20 +11:00
dtucker@openbsd.org abd9dbc3c0 upstream commit
Fix typo certopt->certopts in shell variable.  This would
 cause the test to hang at a host key prompt if you have an A or CNAME for
 "proxy" in your local domain.

Upstream-Regress-ID: 6ea03bcd39443a83c89e2c5606392ceb9585836a
2015-10-29 19:07:19 +11:00
dtucker@openbsd.org 86c10dbbef upstream commit
Update expected group sizes to match recent code changes.

Upstream-Regress-ID: 0004f0ea93428969fe75bcfff0d521c553977794
2015-10-25 14:56:09 +11:00
djm@openbsd.org fdd020e864 upstream commit
adapt to recent sshkey_parse_private_fileblob() API
 change

Upstream-Regress-ID: 5c0d818da511e33e0abf6a92a31bd7163b7ad988
2015-10-06 12:29:03 +11:00
djm@openbsd.org 21ae8ee3b6 upstream commit
fix command-line option to match what was actually
 committed

Upstream-Regress-ID: 3e8c24a2044e8afd37e7ce17b69002ca817ac699
2015-10-06 12:28:41 +11:00
djm@openbsd.org e14ac43b75 upstream commit
regress test for CertificateFile; patch from Meghana Bhat
 via bz#2436

Upstream-Regress-ID: e7a6e980cbe0f8081ba2e83de40d06c17be8bd25
2015-10-06 12:28:41 +11:00
djm@openbsd.org 0097248f90 upstream commit
skip if running as root; many systems (inc OpenBSD) allow
 root to ptrace arbitrary processes

Upstream-Regress-ID: be2b925df89360dff36f972951fa0fa793769038
2015-09-16 18:01:56 +10:00
djm@openbsd.org 9c06c814af upstream commit
try all supported key types here; bz#2455 reported by
 Jakub Jelen

Upstream-Regress-ID: 188cb7d9031cdbac3a0fa58b428b8fa2b2482bba
2015-09-16 18:01:08 +10:00
djm@openbsd.org 9e3ed9ebb1 upstream commit
trim junk from end of file; bz#2455 from Jakub Jelen

Upstream-Regress-ID: a4e64e8931e40d23874b047074444eff919cdfe6
2015-09-04 16:56:23 +10:00
Damien Miller 55b263fb7c let principals-command.sh work for noexec /var/run 2015-08-10 11:13:44 +10:00
Damien Miller 2651e34cd1 work around echo -n / sed behaviour in tests 2015-08-06 11:43:42 +10:00
djm@openbsd.org d85dad8177 upstream commit
adjust for RSA minimum modulus switch; ok deraadt@

Upstream-Regress-ID: 5a72c83431b96224d583c573ca281cd3a3ebfdae
2015-08-06 11:13:25 +10:00
djm@openbsd.org cd7324d066 upstream commit
remove -u flag to diff (only used for error output) to make
 things easier for -portable

Upstream-Regress-ID: a5d6777d2909540d87afec3039d9bb2414ade548
2015-07-17 13:36:30 +10:00
djm@openbsd.org 41e38c4d49 upstream commit
regen RSA1 test keys; the last batch was missing their
 private parts

Upstream-Regress-ID: 7ccf437305dd63ff0b48dd50c5fd0f4d4230c10a
2015-07-15 17:25:10 +10:00
markus@openbsd.org 5bf0933184 upstream commit
Adapt tests, now that DSA if off by default; use
 PubkeyAcceptedKeyTypes and PubkeyAcceptedKeyTypes to test DSA.

Upstream-Regress-ID: 0ff2a3ff5ac1ce5f92321d27aa07b98656efcc5c
2015-07-15 16:04:27 +10:00
markus@openbsd.org 7a6e3fd7b4 upstream commit
regen test data after mktestdata.sh changes

Upstream-Regress-ID: 3495ecb082b9a7c048a2d7c5c845d3bf181d25a4
2015-07-15 16:04:27 +10:00
markus@openbsd.org 7c8c174c69 upstream commit
adapt tests to new minimum RSA size and default FP format

Upstream-Regress-ID: a4b30afd174ce82b96df14eb49fb0b81398ffd0e
2015-07-15 16:04:26 +10:00
djm@openbsd.org 6a977a4b68 upstream commit
legacy v00 certificates are gone; adapt and don't try to
 test them; "sure" markus@ dtucker@

Upstream-Regress-ID: c57321e69b3cd4a3b3396dfcc43f0803d047da12
2015-07-15 16:04:02 +10:00
djm@openbsd.org 0c4123ad5e upstream commit
don't expect SSH v.1 in unittests

Upstream-Regress-ID: f8812b16668ba78e6a698646b2a652b90b653397
2015-07-15 16:04:02 +10:00
djm@openbsd.org 3c09984579 upstream commit
turn SSH1 back on to match src/usr.bin/ssh being tested

Upstream-Regress-ID: 6c4f763a2f0cc6893bf33983919e9030ae638333
2015-07-15 16:03:29 +10:00
Damien Miller 52fb6b9b03 skip IPv6-related portions on hosts without IPv6
with Tim Rice
2015-06-30 16:05:40 +10:00
Tim Rice a170f22baf Fix t12 rules for out of tree builds. 2015-06-09 22:41:13 -07:00
Damien Miller 51a1c21152 skip, rather than fatal when run without SUDO set 2015-05-29 18:27:21 +10:00
djm@openbsd.org db438f9285 upstream commit
make this work without SUDO set; ok dtucker@

Upstream-Regress-ID: bca88217b70bce2fe52b23b8e06bdeb82d98c715
2015-05-29 13:06:30 +10:00
djm@openbsd.org 13640798c7 upstream commit
regress test for AuthorizedPrincipalsCommand

Upstream-Regress-ID: c658fbf1ab6b6011dc83b73402322e396f1e1219
2015-05-21 16:46:56 +10:00
djm@openbsd.org 84452c5d03 upstream commit
regress test for AuthorizedKeysCommand arguments

Upstream-Regress-ID: bbd65c13c6b3be9a442ec115800bff9625898f12
2015-05-21 16:46:40 +10:00
dtucker@openbsd.org 0ef1de742b upstream commit
Add a simple regression test for sshd's configuration
 parser.  Right now, all it does is run the output of sshd -T back through
 itself and ensure the output is valid and invariant.
2015-05-10 11:35:16 +10:00
djm@openbsd.org 368f83c793 upstream commit
use correct key for nested certificate test
2015-05-10 11:35:12 +10:00
djm@openbsd.org 5ab283d001 upstream commit
whitespace

Upstream-Regress-ID: 6b708a3e709d5b7fd37890f874bafdff1f597519
2015-05-08 17:32:13 +10:00
djm@openbsd.org 8377d5008a upstream commit
whitespace at EOL

Upstream-Regress-ID: 9c48911643d5b05173b36a012041bed4080b8554
2015-05-08 17:28:28 +10:00
dtucker@openbsd.org 38b8272f82 upstream commit
Use diff w/out -u for better portability
2015-05-08 13:33:00 +10:00
Damien Miller 673a1c16ad remove dependency on arpa/telnet.h 2015-04-16 11:40:35 +10:00
Darren Tucker d9b9b43656 Fix misspellings of regress CONFOPTS env variables.
Patch from Bryan Drewery.
2015-04-07 09:10:00 +10:00
djm@openbsd.org 7da2be0cb9 upstream commit
adapt to recent hostfile.c change: when parsing
 known_hosts without fully parsing the keys therein, hostkeys_foreach() will
 now correctly identify KEY_RSA1 keys; ok markus@ miod@
2015-04-01 10:03:05 +11:00
markus@openbsd.org 9e1777a0d1 upstream commit
use ${SSH} for -Q instead of installed ssh
2015-04-01 10:02:56 +11:00
djm@openbsd.org ce1b358ea4 upstream commit
make CLEANFILES clean up more of the tests' droppings
2015-04-01 10:02:01 +11:00
Tim Rice 9f82e5a904 portability fix: Solaris systems may not have a grep that understands -q 2015-03-16 22:49:20 -07:00
Damien Miller 4df590cf8d make unit tests work for !OPENSSH_HAS_ECC 2015-03-11 10:02:39 +11:00
djm@openbsd.org 307bb40277 upstream commit
unbreak for w/SSH1 (default) case; ok markus@ deraadt@
2015-03-09 15:20:55 +11:00
Damien Miller b44ee0c998 unbreak hostkeys test for w/ SSH1 case 2015-03-05 18:39:20 -08:00
djm@openbsd.org ac5e8acefa upstream commit
make these work with !SSH1; ok markus@ deraadt@
2015-03-05 10:27:22 +11:00
Damien Miller a05adf95d2 netcat needs poll.h portability goop 2015-03-04 11:00:35 -08: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
djm@openbsd.org 3f7f5e6c5d upstream commit
expand __unused to full __attribute__ for better portability
2015-03-04 07:59:13 +11:00
Damien Miller 2fab9b0f87 avoid warning 2015-03-04 07:41:27 +11:00
djm@openbsd.org d608a51daa upstream commit
reorder logic for better portability; patch from Roumen
 Petrov
2015-03-04 04:54:27 +11:00
Damien Miller e47536ba96 portability fixes for regress/netcat.c
Mostly avoiding "err(1, NULL)"
2015-02-28 08:20:11 -08:00
Damien Miller 02973ad5f6 twiddle another test for portability
from Tom G. Christensen
2015-02-28 08:06:18 -08:00
Damien Miller f7f3116abf twiddle test for portability 2015-02-27 15:52:49 -08:00
Damien Miller 1ad3a77cc9 make regress/netcat.c fd passing (more) portable 2015-02-26 20:34:06 -08:00
Damien Miller 9e1cfca7e1 create OBJ/valgrind-out before running unittests 2015-02-26 20:34:06 -08:00
Damien Miller bd58853102 valgrind support 2015-02-26 14:55:55 -08:00
Darren Tucker 5d5ec165c5 Restrict ECDSA and ECDH tests.
ifdef out some more ECDSA and ECDH tests when built against an OpenSSL
that does not have eliptic curve functionality.
2015-02-25 15:32:49 +11:00
Damien Miller cb030ce25f include includes.h to avoid build failure on AIX 2015-02-24 09:23:30 -08:00
Tim Rice 13af342458 Original portability patch from djm@ for platforms missing err.h.
Fix name space clash on Solaris 10. Still more to do for Solaris 10
to deal with msghdr structure differences. ok djm@
2015-02-24 07:56:47 -08:00