Commit Graph

674 Commits

Author SHA1 Message Date
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
Darren Tucker 4c356308a8 Wrap stdint.h includes in HAVE_STDINT_H. 2015-02-24 13:49:31 +11:00
djm@openbsd.org b3c19151cb upstream commit
fix a race condition by using a mux socket rather than an
 ineffectual wait statement
2015-02-24 07:32:35 +11:00
Tim Rice f81f1bbc5b out of tree build fix 2015-02-21 18:12:10 -08:00
djm@openbsd.org 1a779a0dd6 upstream commit
correct paths to configuration files being written/updated;
 they live in $OBJ not cwd; some by Roumen Petrov
2015-02-22 07:58:24 +11:00
Damien Miller e89c780886 hook up hostkeys unittest to portable Makefiles 2015-02-17 10:04:55 +11:00
djm@openbsd.org 0abf41f99a upstream commit
enable hostkeys unit tests
2015-02-17 09:35:35 +11:00
djm@openbsd.org 68a5d647cc upstream commit
check string/memory compare arguments aren't NULL
2015-02-17 09:34:48 +11:00
djm@openbsd.org ef575ef20d upstream commit
unit tests for hostfile.c code, just hostkeys_foreach so
 far
2015-02-17 09:34:48 +11:00
markus@openbsd.org 8ea3365e6a upstream commit
test server rekey limit
2015-02-17 09:33:19 +11:00
djm@openbsd.org 86936ec245 upstream commit
regression test for 'wildcard CA' serial/key ID revocations
2015-01-30 12:19:29 +11:00
Damien Miller 69ff64f696 compile on systems without TCP_MD5SIG (e.g. OSX) 2015-01-27 23:07:43 +11:00
Damien Miller 358964f308 use ssh-keygen under test rather than system's 2015-01-27 23:07:25 +11:00
Damien Miller ade31d7b6f these need active_state defined to link on OSX
temporary measure until active_state goes away entirely
2015-01-27 23:06:23 +11:00
djm@openbsd.org e56aa87502 upstream commit
use printf instead of echo -n to reduce diff against
 -portable
2015-01-27 23:03:15 +11:00
djm@openbsd.org d411d39555 upstream commit
regression test for host key rotation
2015-01-27 00:03:53 +11:00
djm@openbsd.org fe8a3a5169 upstream commit
adapt to sshkey API tweaks
2015-01-27 00:03:31 +11:00
miod@openbsd.org 7dd355fb1f upstream commit
Move -lz late in the linker commandline for things to
 build on static arches.
2015-01-27 00:03:30 +11:00
miod@openbsd.org 0dad3b806f upstream commit
-Wpointer-sign is supported by gcc 4 only.
2015-01-27 00:03:30 +11:00
djm@openbsd.org 2b3b1c1e4b upstream commit
use SUBDIR to recuse into unit tests; makes "make obj"
 actually work
2015-01-27 00:03:12 +11:00
djm@openbsd.org 1d6424a6ff upstream commit
this test would accidentally delete agent.sh if run without
 obj/
2015-01-20 19:03:08 +11:00
Damien Miller 1ca3e2155a fix kex test 2015-01-20 10:11:31 +11:00
markus@openbsd.org c78a578107 upstream commit
finally enable the KEX tests I wrote some years ago...
2015-01-20 09:50:34 +11:00
markus@openbsd.org 31821d7217 upstream commit
adapt to new error message (SSH_ERR_MAC_INVALID)
2015-01-20 09:46:48 +11:00
djm@openbsd.org d3716ca19e upstream commit
this test was broken in at least two ways, such that it
 wasn't checking that a KRL was not excluding valid keys
2015-01-20 09:45:56 +11:00
djm@openbsd.org d85e062459 upstream commit
be a bit more careful in these tests to ensure that
 known_hosts is clean
2015-01-20 00:26:13 +11:00
djm@openbsd.org 7947810eab upstream commit
regression test for known_host file editing using
 ssh-keygen (-H / -R / -F) after hostkeys_foreach() change; feedback and ok
 markus@
2015-01-20 00:26:13 +11:00
djm@openbsd.org 3a2b09d147 upstream commit
more and better key tests

test signatures and verification
test certificate generation
flesh out nested cert test

removes most of the XXX todo markers
2015-01-20 00:25:12 +11:00
djm@openbsd.org 589e69fd82 upstream commit
make the signature fuzzing test much more rigorous:
 ensure that the fuzzed input cases do not match the original (using new
 fuzz_matches_original() function) and check that the verification fails in
 each case
2015-01-20 00:24:40 +11:00
djm@openbsd.org 80603c0daa upstream commit
add a fuzz_matches_original() function to the fuzzer to
 detect fuzz cases that are identical to the original data. Hacky
 implementation, but very useful when you need the fuzz to be different, e.g.
 when verifying signature
2015-01-20 00:24:39 +11:00
djm@openbsd.org 87d5495bd3 upstream commit
better dumps from the fuzzer (shown on errors) -
 include the original data as well as the fuzzed copy.
2015-01-20 00:24:39 +11:00
djm@openbsd.org d59ec478c4 upstream commit
enable hostkey-agent.sh test
2015-01-20 00:24:17 +11:00
djm@openbsd.org 26b3425170 upstream commit
unit test for hostkeys in ssh-agent
2015-01-20 00:23:43 +11:00
markus@openbsd.org 9e06a0fb23 upstream commit
add kex unit tests
2015-01-20 00:22:50 +11:00
Damien Miller 45c0fd70bb make bitmap test compile 2015-01-15 22:08:23 +11:00
djm@openbsd.org d333f89abf upstream commit
unit tests for KRL bitmap
2015-01-15 21:39:18 +11:00
markus@openbsd.org 7613f828f4 upstream commit
re-add comment about full path
2015-01-15 21:39:17 +11:00
markus@openbsd.org 6c43b48b30 upstream commit
don't reset  to the installed sshd; connect before
 reconfigure, too
2015-01-15 21:39:17 +11:00
djm@openbsd.org 771bb47a1d upstream commit
implement a SIGINFO handler so we can discern a stuck
 fuzz test from a merely glacial one; prompted by and ok markus
2015-01-15 21:39:16 +11:00
djm@openbsd.org cfaa57962f upstream commit
use $SSH instead of installed ssh to allow override;
 spotted by markus@
2015-01-15 21:39:16 +11:00
djm@openbsd.org 0920553d0a upstream commit
regress test for PubkeyAcceptedKeyTypes; ok markus@
2015-01-15 21:39:15 +11:00
markus@openbsd.org 27ca1a5c00 upstream commit
unbreak parsing of pubkey comments; with gerhard; ok
 djm/deraadt
2015-01-15 21:39:15 +11:00
djm@openbsd.org 55358f0b4e upstream commit
fatal if soft-PKCS11 library is missing rather (rather
 than continue and fail with a more cryptic error)
2015-01-15 21:39:15 +11:00
djm@openbsd.org c3554cdd2a upstream commit
let this test all supporte key types; pointed out/ok
 markus@
2015-01-15 21:39:14 +11:00
Damien Miller c332110291 some systems lack SO_REUSEPORT 2015-01-15 02:59:51 +11:00
djm@openbsd.org c4bfafcc2a upstream commit
adjust for sshkey_load_file() API change
2015-01-09 00:46:04 +11:00
Damien Miller 293cac52dc include and use OpenBSD netcat in regress/ 2014-12-23 08:38:12 +11:00
djm@openbsd.org 4bea0ab329 upstream commit
regression test for multiple required pubkey authentication;
 ok markus@
2014-12-22 19:13:38 +11:00
djm@openbsd.org 0d1b241a26 upstream commit
make this slightly easier to diff against portable
2014-12-22 17:21:51 +11:00
Damien Miller 0715bcdddb add missing regress output file 2014-12-22 13:47:07 +11:00
djm@openbsd.org 1e30483c8a upstream commit
adjust for new SHA256 key fingerprints and
 slightly-different MD5 hex fingerprint format
2014-12-22 13:21:07 +11:00
djm@openbsd.org 6b40567ed7 upstream commit
poll changes to netcat (usr.bin/netcat.c r1.125) broke
 this test; fix it by ensuring more stdio fds are sent to devnull
2014-12-22 13:18:41 +11:00
djm@openbsd.org 3dfd8d93df upstream commit
add tests for new client RevokedHostKeys option; refactor
 to make it a bit more readable
2014-12-05 09:31:08 +11:00
krw@openbsd.org a31046cad1 upstream commit
Nuke yet more obvious #include duplications.

ok deraadt@
2014-12-05 09:31:07 +11:00
djm@openbsd.org 51b64e4412 upstream commit
fix KRL generation when multiple CAs are in use

We would generate an invalid KRL when revoking certs by serial
number for multiple CA keys due to a section being written out
twice.

Also extend the regress test to catch this case by having it
produce a multi-CA KRL.

Reported by peter AT pean.org
2014-11-19 09:20:14 +11:00
Damien Miller 1b215c098b - (djm) [regress/unittests/sshbuf/test_sshbuf_getput_crypto.c]
[regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c]
   [regress/unittests/sshkey/common.c]
   [regress/unittests/sshkey/test_file.c]
   [regress/unittests/sshkey/test_fuzz.c]
   [regress/unittests/sshkey/test_sshkey.c] Don't include openssl/ec.h
   on !ECC OpenSSL systems
2014-08-27 04:04:40 +10:00
Damien Miller 4f1ff1ed78 - (djm) [regress/unittests/test_helper/test_helper.c] Fix for systems that
don't set __progname. Diagnosed by Tom Christensen.
2014-08-21 15:54:50 +10:00
Damien Miller f8988fbef0 - (djm) [regress/multiplex.sh] Use -d (detach stdin) flag to disassociate
nc from stdin, it's more portable
2014-08-01 13:31:52 +10:00
Damien Miller 5b3879fd4b - (djm) [regress/multiplex.sh] Instruct nc not to quit as soon as stdin
is closed; avoid regress failures when stdin is /dev/null
2014-08-01 12:28:31 +10:00
Damien Miller a9c46746d2 - (djm) [regress/multiplex.sh] Skip test for non-OpenBSD netcat. We need
a better solution, but this will have to do for now.
2014-08-01 12:26:49 +10:00
Damien Miller 56b840f2b8 - (djm) [regress/multiplex.sh] restore incorrectly deleted line;
pointed out by Christian Hesse
2014-07-25 08:11:30 +10:00
Darren Tucker dd417b60d5 - dtucker@cvs.openbsd.org 2014/07/22 23:35:38
[regress/unittests/sshkey/testdata/*]
     Regenerate test keys with certs signed with ed25519 instead of ecdsa.
     These can be used in -portable on platforms that don't support ECDSA.
2014-07-23 10:41:21 +10:00
Darren Tucker 40e5021189 - dtucker@cvs.openbsd.org 2014/07/22 23:57:40
[regress/unittests/sshkey/mktestdata.sh]
     Add $OpenBSD tag to make syncs easier
2014-07-23 10:35:45 +10:00
Darren Tucker 07e644251e - dtucker@cvs.openbsd.org 2014/07/22 23:23:22
[regress/unittests/sshkey/mktestdata.sh]
     Sign test certs with ed25519 instead of ecdsa so that they'll work in
     -portable on platforms that don't have ECDSA in their OpenSSL.  ok djm
2014-07-23 10:34:26 +10:00
Darren Tucker cea099a7c4 - djm@cvs.openbsd.org 2014/07/22 01:32:12
[regress/multiplex.sh]
     change the test for still-open Unix domain sockets to be robust against
     nc implementations that produce error messages. from -portable
     (Id sync only)
2014-07-23 10:04:02 +10:00
Darren Tucker c4ee219a66 - (dtucker) [regress/unittests/sshkey/test_{file,fuzz,sshkey}.c] Wrap ecdsa-
specific tests inside OPENSSL_HAS_ECC.
2014-07-23 04:27:50 +10:00
Damien Miller 04f4824940 - (djm) [regress/multiplex.sh] change the test for still-open Unix
domain sockets to be robust against nc implementations that produce
    error messages.
2014-07-22 11:31:47 +10:00
Damien Miller 5ea4fe00d5 - (djm) [regress/multiplex.sh] ssh mux master lost -N somehow;
put it back
2014-07-22 09:39:19 +10:00
Damien Miller c8f610f6cc - (djm) [regress/multiplex.sh] Not all netcat accept the -N option. 2014-07-21 10:23:27 +10:00
Damien Miller 0e4e95566c - millert@cvs.openbsd.org 2014/07/15 15:54:15
[forwarding.sh multiplex.sh]
     Add support for Unix domain socket forwarding.  A remote TCP port
     may be forwarded to a local Unix domain socket and vice versa or
     both ends may be a Unix domain socket.  This is a reimplementation
     of the streamlocal patches by William Ahern from:
         http://www.25thandclement.com/~william/projects/streamlocal.html
     OK djm@ markus@
2014-07-21 09:52:54 +10:00
Darren Tucker 93a87ab27e - (dtucker) [regress/unittests/sshkey/
{common,test_file,test_fuzz,test_sshkey}.c] Wrap stdint.h includes in
   ifdefs.
2014-07-21 06:30:25 +10:00
Damien Miller 7a57eb3d10 - djm@cvs.openbsd.org 2014/07/07 08:15:26
[multiplex.sh]
     remove forced-fatal that I stuck in there to test the new cleanup
     logic and forgot to remove...
2014-07-09 13:22:31 +10: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
Damien Miller 81309c857d - (djm) [regress/Makefile] fix execution of sshkey unit/fuzz test 2014-07-02 17:45:55 +10:00
Damien Miller dd8b1dd793 - djm@cvs.openbsd.org 2014/06/24 01:14:17
[Makefile.in regress/Makefile regress/unittests/Makefile]
     [regress/unittests/sshkey/Makefile]
     [regress/unittests/sshkey/common.c]
     [regress/unittests/sshkey/common.h]
     [regress/unittests/sshkey/mktestdata.sh]
     [regress/unittests/sshkey/test_file.c]
     [regress/unittests/sshkey/test_fuzz.c]
     [regress/unittests/sshkey/test_sshkey.c]
     [regress/unittests/sshkey/tests.c]
     [regress/unittests/sshkey/testdata/dsa_1]
     [regress/unittests/sshkey/testdata/dsa_1-cert.fp]
     [regress/unittests/sshkey/testdata/dsa_1-cert.pub]
     [regress/unittests/sshkey/testdata/dsa_1.fp]
     [regress/unittests/sshkey/testdata/dsa_1.fp.bb]
     [regress/unittests/sshkey/testdata/dsa_1.param.g]
     [regress/unittests/sshkey/testdata/dsa_1.param.priv]
     [regress/unittests/sshkey/testdata/dsa_1.param.pub]
     [regress/unittests/sshkey/testdata/dsa_1.pub]
     [regress/unittests/sshkey/testdata/dsa_1_pw]
     [regress/unittests/sshkey/testdata/dsa_2]
     [regress/unittests/sshkey/testdata/dsa_2.fp]
     [regress/unittests/sshkey/testdata/dsa_2.fp.bb]
     [regress/unittests/sshkey/testdata/dsa_2.pub]
     [regress/unittests/sshkey/testdata/dsa_n]
     [regress/unittests/sshkey/testdata/dsa_n_pw]
     [regress/unittests/sshkey/testdata/ecdsa_1]
     [regress/unittests/sshkey/testdata/ecdsa_1-cert.fp]
     [regress/unittests/sshkey/testdata/ecdsa_1-cert.pub]
     [regress/unittests/sshkey/testdata/ecdsa_1.fp]
     [regress/unittests/sshkey/testdata/ecdsa_1.fp.bb]
     [regress/unittests/sshkey/testdata/ecdsa_1.param.curve]
     [regress/unittests/sshkey/testdata/ecdsa_1.param.priv]
     [regress/unittests/sshkey/testdata/ecdsa_1.param.pub]
     [regress/unittests/sshkey/testdata/ecdsa_1.pub]
     [regress/unittests/sshkey/testdata/ecdsa_1_pw]
     [regress/unittests/sshkey/testdata/ecdsa_2]
     [regress/unittests/sshkey/testdata/ecdsa_2.fp]
     [regress/unittests/sshkey/testdata/ecdsa_2.fp.bb]
     [regress/unittests/sshkey/testdata/ecdsa_2.param.curve]
     [regress/unittests/sshkey/testdata/ecdsa_2.param.priv]
     [regress/unittests/sshkey/testdata/ecdsa_2.param.pub]
     [regress/unittests/sshkey/testdata/ecdsa_2.pub]
     [regress/unittests/sshkey/testdata/ecdsa_n]
     [regress/unittests/sshkey/testdata/ecdsa_n_pw]
     [regress/unittests/sshkey/testdata/ed25519_1]
     [regress/unittests/sshkey/testdata/ed25519_1-cert.fp]
     [regress/unittests/sshkey/testdata/ed25519_1-cert.pub]
     [regress/unittests/sshkey/testdata/ed25519_1.fp]
     [regress/unittests/sshkey/testdata/ed25519_1.fp.bb]
     [regress/unittests/sshkey/testdata/ed25519_1.pub]
     [regress/unittests/sshkey/testdata/ed25519_1_pw]
     [regress/unittests/sshkey/testdata/ed25519_2]
     [regress/unittests/sshkey/testdata/ed25519_2.fp]
     [regress/unittests/sshkey/testdata/ed25519_2.fp.bb]
     [regress/unittests/sshkey/testdata/ed25519_2.pub]
     [regress/unittests/sshkey/testdata/pw]
     [regress/unittests/sshkey/testdata/rsa1_1]
     [regress/unittests/sshkey/testdata/rsa1_1.fp]
     [regress/unittests/sshkey/testdata/rsa1_1.fp.bb]
     [regress/unittests/sshkey/testdata/rsa1_1.param.n]
     [regress/unittests/sshkey/testdata/rsa1_1.pub]
     [regress/unittests/sshkey/testdata/rsa1_1_pw]
     [regress/unittests/sshkey/testdata/rsa1_2]
     [regress/unittests/sshkey/testdata/rsa1_2.fp]
     [regress/unittests/sshkey/testdata/rsa1_2.fp.bb]
     [regress/unittests/sshkey/testdata/rsa1_2.param.n]
     [regress/unittests/sshkey/testdata/rsa1_2.pub]
     [regress/unittests/sshkey/testdata/rsa_1]
     [regress/unittests/sshkey/testdata/rsa_1-cert.fp]
     [regress/unittests/sshkey/testdata/rsa_1-cert.pub]
     [regress/unittests/sshkey/testdata/rsa_1.fp]
     [regress/unittests/sshkey/testdata/rsa_1.fp.bb]
     [regress/unittests/sshkey/testdata/rsa_1.param.n]
     [regress/unittests/sshkey/testdata/rsa_1.param.p]
     [regress/unittests/sshkey/testdata/rsa_1.param.q]
     [regress/unittests/sshkey/testdata/rsa_1.pub]
     [regress/unittests/sshkey/testdata/rsa_1_pw]
     [regress/unittests/sshkey/testdata/rsa_2]
     [regress/unittests/sshkey/testdata/rsa_2.fp]
     [regress/unittests/sshkey/testdata/rsa_2.fp.bb]
     [regress/unittests/sshkey/testdata/rsa_2.param.n]
     [regress/unittests/sshkey/testdata/rsa_2.param.p]
     [regress/unittests/sshkey/testdata/rsa_2.param.q]
     [regress/unittests/sshkey/testdata/rsa_2.pub]
     [regress/unittests/sshkey/testdata/rsa_n]
     [regress/unittests/sshkey/testdata/rsa_n_pw]
     unit and fuzz tests for new key API
2014-07-02 17:38:31 +10:00
Damien Miller c1dc24b71f - djm@cvs.openbsd.org 2014/06/24 01:04:43
[regress/krl.sh]
     regress test for broken consecutive revoked serial number ranges
2014-07-02 17:02:03 +10:00
Damien Miller 43d3ed2dd3 - djm@cvs.openbsd.org 2014/05/21 07:04:21
[regress/integrity.sh]
     when failing because of unexpected output, show the offending output
2014-07-02 17:01:08 +10:00
Damien Miller 5a96707ffc - djm@cvs.openbsd.org 2014/04/30 05:32:00
[regress/Makefile]
     unit tests for new buffer API; including basic fuzz testing
     NB. Id sync only.
2014-07-02 15:38:05 +10:00
Tim Rice 5e2b8894b0 - (tim) [regress/unittests/test_helper/test_helper.h] Add includes.h for
u_intXX_t types.
2014-06-11 18:31:10 -07:00
Darren Tucker 985ee2cbc3 - (dtucker) [regress/unittests/sshbuf/*.c regress/unittests/test_helper/*]
Wrap stdlib.h include an ifdef for platforms that don't have it.
2014-06-12 05:32:29 +10:00
Darren Tucker 15c254a253 - (dtucker) [regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c] ifdef
ECC variable too.
2014-06-11 07:38:49 +10:00
Darren Tucker 67508ac256 - (dtucker) [regress/unittests/sshbuf/test_sshbuf_getput_crypto.c
regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c] Only do NISTP256
   curve tests if OpenSSL has them.
2014-06-11 06:27:16 +10:00
Damien Miller e7429f2be8 - (djm) [regress/Makefile Makefile.in]
[regress/unittests/sshbuf/test_sshbuf.c
   [regress/unittests/sshbuf/test_sshbuf_fixed.c]
   [regress/unittests/sshbuf/test_sshbuf_fuzz.c]
   [regress/unittests/sshbuf/test_sshbuf_getput_basic.c]
   [regress/unittests/sshbuf/test_sshbuf_getput_crypto.c]
   [regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c]
   [regress/unittests/sshbuf/test_sshbuf_misc.c]
   [regress/unittests/sshbuf/tests.c]
   [regress/unittests/test_helper/fuzz.c]
   [regress/unittests/test_helper/test_helper.c]
   Hook new unit tests into the build and "make tests"
2014-05-15 18:01:01 +10:00
Damien Miller def1de0867 - (djm) [regress/unittests/Makefile]
[regress/unittests/Makefile.inc]
   [regress/unittests/sshbuf/Makefile]
   [regress/unittests/sshbuf/test_sshbuf.c]
   [regress/unittests/sshbuf/test_sshbuf_fixed.c]
   [regress/unittests/sshbuf/test_sshbuf_fuzz.c]
   [regress/unittests/sshbuf/test_sshbuf_getput_basic.c]
   [regress/unittests/sshbuf/test_sshbuf_getput_crypto.c]
   [regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c]
   [regress/unittests/sshbuf/test_sshbuf_misc.c]
   [regress/unittests/sshbuf/tests.c]
   [regress/unittests/test_helper/Makefile]
   [regress/unittests/test_helper/fuzz.c]
   [regress/unittests/test_helper/test_helper.c]
   [regress/unittests/test_helper/test_helper.h]
   Import new unit tests from OpenBSD; not yet hooked up to build.
2014-05-15 15:17:15 +10:00
Damien Miller 167685756f - logan@cvs.openbsd.org 2014/05/04 10:40:59
[connect-privsep.sh]
     Remove the Z flag from the list of malloc options as it
     was removed from malloc.c 10 days ago.

     OK from miod@
2014-05-15 15:08:40 +10:00
Damien Miller d0b69fe904 - dtucker@cvs.openbsd.org 2014/05/03 18:46:14
[proxy-connect.sh]
     Add tests for with and without compression, with and without privsep.
2014-05-15 15:08:19 +10:00
Damien Miller edb1af5044 - djm@cvs.openbsd.org 2014/04/21 22:15:37
[dhgex.sh integrity.sh kextype.sh rekey.sh try-ciphers.sh]
     repair regress tests broken by server-side default cipher/kex/mac changes
     by ensuring that the option under test is included in the server's
     algorithm list
2014-05-15 15:07:53 +10:00
Damien Miller 54343e95c7 - djm@cvs.openbsd.org 2014/03/13 20:44:49
[login-timeout.sh]
     this test is a sorry mess of race conditions; add another sleep
     to avoid a failure on slow machines (at least until I find a
     better way)
2014-05-15 15:07:33 +10:00
Damien Miller 2476c31b96 - (djm) [regress/Makefile] Disable dhgex regress test; it breaks when
no moduli file exists at the expected location.
2014-03-02 04:01:00 +11:00
Damien Miller c83fdf30e9 - (djm) [regress/host-expand.sh] Add RCS Id 2014-02-28 10:34:03 +11:00
Damien Miller 834aeac355 - djm@cvs.openbsd.org 2014/02/27 21:21:25
[agent-ptrace.sh agent.sh]
     keep return values that are printed in error messages;
     from portable
     (Id sync only)
2014-02-28 10:25:16 +11:00
Damien Miller 4f7f1a9a0d - djm@cvs.openbsd.org 2014/02/27 20:04:16
[login-timeout.sh]
     remove any existing LoginGraceTime from sshd_config before adding
     a specific one for the test back in
2014-02-28 10:24:11 +11:00
Damien Miller d705d987c2 - djm@cvs.openbsd.org 2014/01/26 10:49:17
[scp-ssh-wrapper.sh scp.sh]
     make sure $SCP is tested on the remote end rather than whichever one
     happens to be in $PATH; from portable
     (Id sync only)
2014-02-28 10:23:26 +11:00
Damien Miller 624a3ca376 - djm@cvs.openbsd.org 2014/01/26 10:22:10
[regress/cert-hostkey.sh]
     automatically generate revoked keys from listed keys rather than
     manually specifying each type; from portable
     (Id sync only)
2014-02-28 10:22:37 +11:00
Damien Miller b843923284 - dtucker@cvs.openbsd.org 2014/01/25 04:35:32
[regress/Makefile regress/dhgex.sh]
     Add a test for DH GEX sizes
2014-02-28 10:21:26 +11:00
Damien Miller 1e2aa3d904 - dtucker@cvs.openbsd.org 2014/01/20 00:00:30
[sftp-chroot.sh]
     append to rather than truncating the log file
2014-02-28 10:19:51 +11:00
Damien Miller f483cc16fe - dtucker@cvs.openbsd.org 2014/01/19 23:43:02
[regress/sftp-chroot.sh]
     Don't use -q on sftp as it suppresses logging, instead redirect the
     output to the regress logfile.
2014-02-28 10:19:11 +11:00
Damien Miller 9c449bc183 - (djm) [regress/setuid-allowed.c] Missing string.h for strerror() 2014-02-04 11:38:28 +11:00
Damien Miller 0ba85d696a ignore a few more regress droppings 2014-02-04 11:08:38 +11:00
Tim Rice 6f917ad376 - (tim) [regress/agent.sh regress/agent-ptrace.sh] Assign $? to a variable
when used as an error message inside an if statement so we display the
   correct into. agent.sh patch from Petr Lautrbach.
2014-01-28 10:26:25 -08:00
Damien Miller b0e0f760b8 - (djm) [Makefile.in regress/scp-ssh-wrapper.sh regress/scp.sh] Make
the scp regress test actually test the built scp rather than the one
   in $PATH. ok dtucker@
2014-01-24 14:27:04 +11:00
Damien Miller f9df7f6f47 - (djm) [regress/cert-hostkey.sh] Fix regress failure on platforms that
skip one or more key types (e.g. RHEL/CentOS 6.5); ok dtucker@
2014-01-20 20:07:15 +11:00
Damien Miller a9c1e500ef - (djm) [regress/.cvsignore] Ignore regress test droppings; ok dtucker@ 2014-01-08 16:13:12 +11:00
Damien Miller 9f4c8e797e - (djm) [regress/Makefile] Add some generated files for cleaning 2013-12-29 17:57:46 +11:00
Darren Tucker 77244afe3b 20131221
- (dtucker) [regress/keytype.sh] Actually test ecdsa key types.
2013-12-21 17:02:39 +11:00
Damien Miller 6d6fcd14e2 - (djm) [Makefile.in regress/Makefile regress/agent-ptrace.sh]
[regress/setuid-allowed.c] Check that ssh-agent is not on a no-setuid
   filesystem before running agent-ptrace.sh; ok dtucker
2013-12-08 15:53:28 +11:00
Damien Miller eb401585bb - (djm) [regress/cert-hostkey.sh] Fix merge botch 2013-12-07 17:07:15 +11:00
Damien Miller f54542af3a - markus@cvs.openbsd.org 2013/12/06 13:52:46
[regress/Makefile regress/agent.sh regress/cert-hostkey.sh]
     [regress/cert-userkey.sh regress/keytype.sh]
     test ed25519 support; from djm@
2013-12-07 16:32:44 +11:00
Damien Miller 8a073cf579 - djm@cvs.openbsd.org 2013/11/21 03:18:51
[regress/cipher-speed.sh regress/integrity.sh regress/rekey.sh]
     [regress/try-ciphers.sh]
     use new "ssh -Q cipher-auth" query to obtain lists of authenticated
     encryption ciphers instead of specifying them manually; ensures that
     the new chacha20poly1305@openssh.com mode is tested;

     ok markus@ and naddy@ as part of the diff to add
     chacha20poly1305@openssh.com
2013-11-21 14:26:18 +11:00
Damien Miller ea61b2179f - djm@cvs.openbsd.org 2013/11/21 03:16:47
[regress/modpipe.c]
     use unsigned long long instead of u_int64_t here to avoid warnings
     on some systems portable OpenSSH is built on.
2013-11-21 14:25:15 +11:00
Damien Miller 36aba25b04 - djm@cvs.openbsd.org 2013/11/21 03:15:46
[regress/krl.sh]
     add some reminders for additional tests that I'd like to implement
2013-11-21 14:24:42 +11:00
Damien Miller fa7a20bc28 - naddy@cvs.openbsd.org 2013/11/18 05:09:32
[regress/forward-control.sh]
     bump timeout to 10 seconds to allow slow machines (e.g. Alpha PC164)
     to successfully run this; ok djm@
     (ID sync only; our timeouts are already longer)
2013-11-21 14:24:08 +11:00
Darren Tucker b6a75b0b93 - (dtucker) [regress/keytype.sh] Populate ECDSA key types to be tested by
querying the ones that are compiled in.
2013-11-10 20:25:22 +11: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 08998c5fb9 - dtucker@cvs.openbsd.org 2013/11/08 01:06:14
[regress/rekey.sh]
      Rekey less frequently during tests to speed them up
2013-11-08 12:11:46 +11:00
Darren Tucker 6e9d6f4112 - dtucker@cvs.openbsd.org 2013/11/07 04:26:56
[regress/kextype.sh]
     trailing space
2013-11-07 15:32:37 +11:00
Darren Tucker 74cbc22529 - dtucker@cvs.openbsd.org 2013/11/07 03:55:41
[regress/kextype.sh]
     Use ssh -Q to get kex types instead of a static list.
2013-11-07 15:26:12 +11:00
Darren Tucker a955041c93 - dtucker@cvs.openbsd.org 2013/11/07 02:48:38
[regress/integrity.sh regress/cipher-speed.sh regress/try-ciphers.sh]
     Use ssh -Q instead of hardcoding lists of ciphers or MACs.
2013-11-07 15:21:19 +11:00
Darren Tucker 06595d6395 - dtucker@cvs.openbsd.org 2013/11/07 01:12:51
[regress/rekey.sh]
     Factor out the data transfer rekey tests
2013-11-07 15:08:02 +11:00
Darren Tucker 651dc8b259 - dtucker@cvs.openbsd.org 2013/11/07 00:12:05
[regress/rekey.sh]
     Test rekeying for every Cipher, MAC and KEX, plus test every KEX with
     the GCM ciphers.
2013-11-07 15:04:44 +11:00
Darren Tucker 234557762b - dtucker@cvs.openbsd.org 2013/11/04 12:27:42
[regress/rekey.sh]
     Test rekeying with all KexAlgorithms.
2013-11-07 15:00:51 +11:00
Darren Tucker bbfb9b0f38 - markus@cvs.openbsd.org 2013/11/02 22:39:53
[regress/kextype.sh]
     add curve25519-sha256@libssh.org
2013-11-07 14:56:43 +11:00
Darren Tucker aa19548a98 - djm@cvs.openbsd.org 2013/10/09 23:44:14
[regress/Makefile] (ID sync only)
     regression test for sftp request white/blacklisting and readonly mode.
2013-11-07 14:50:09 +11:00
Damien Miller a6fd1d3c38 - (djm) [regress/modpipe.c regress/rekey.sh] Never intended to commit these 2013-11-07 12:03:26 +11:00
Damien Miller c98319750b - (djm) [Makefile.in monitor.c] Missed chunks of curve25519 KEX diff 2013-11-07 12:00:23 +11:00
Tim Rice bd43e88723 - (tim) [regress/sftp-perm.sh] We need a shell that understands "! somecmd" 2013-10-24 12:22:49 -07:00
Damien Miller a176e18230 - djm@cvs.openbsd.org 2013/10/09 23:44:14
[regress/Makefile regress/sftp-perm.sh]
     regression test for sftp request white/blacklisting and readonly mode.
2013-10-18 09:05:41 +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
Tim Rice 0553ad76ff - (tim) [regress/forwarding.sh] Fix for building outside read only source tree. 2013-07-25 16:03:16 -07: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 78d47b7c5b - dtucker@cvs.openbsd.org 2013/06/10 21:56:43
[regress/forwarding.sh]
     Add test for forward config parsing
2013-07-25 12:08:46 +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 2a22873cd8 - (dtucker) [regress/forwarding.sh] For (as yet unknown) reason, the
forwarding test is extremely slow copying data on some machines so switch
   back to copying the much smaller ls binary until we can figure out why
   this is.
2013-06-06 01:59:13 +10:00
Tim Rice 3f3064c822 - (tim) [regress/sftp-chroot.sh] skip if no sudo. ok dtucker 2013-06-02 15:13:09 -07:00
Tim Rice 5ab9b63468 - (tim) [configure.ac regress/Makefile] With rev 1.47 of test-exec.sh we
need a shell that can handle "[ file1 -nt file2 ]". Rather than keep
   dealing with shell portability issues in regression tests, we let
   configure find us a capable shell on those platforms with an old /bin/sh.
2013-06-02 14:05:48 -07:00
Darren Tucker 9b42d32738 - dtucker@cvs.openbsd.org 2013/05/17 10:35:43
[regress/scp.sh]
     use a file extention that's not special on some platforms.  from portable
     (id sync only)
2013-05-17 20:48:59 +10:00
Darren Tucker 0a404b0ed7 - dtucker@cvs.openbsd.org 2013/05/17 10:34:30
[regress/portnum.sh]
     use a more portable negated if structure.  from portable (id sync only)
2013-05-17 20:47:29 +10:00
Darren Tucker 62ee222e6f - dtucker@cvs.openbsd.org 2013/05/17 10:33:09
[regress/agent-getpeereid.sh]
     don't redirect stdout from sudo.  from portable (id sync only)
2013-05-17 20:46:00 +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 98989eb95e - dtucker@cvs.openbsd.org 2013/05/17 10:28:11
[regress/sftp.sh]
     only compare copied data if sftp succeeds.  from portable (id sync only)
2013-05-17 20:44:09 +10:00
Darren Tucker 438f60eb9a - dtucker@cvs.openbsd.org 2013/05/17 10:26:26
[regress/sftp-badcmds.sh]
     remove unused BATCH variable. (id sync only)
2013-05-17 20:43:13 +10:00
Darren Tucker 1466bd25a8 - dtucker@cvs.openbsd.org 2013/05/17 10:24:48
[localcommand.sh]
     use backticks for portability. (id sync only)
2013-05-17 20:42:05 +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 dd669173f9 - dtucker@cvs.openbsd.org 2013/05/17 10:16:26
[regress/try-ciphers.sh]
     use expr for math to keep diffs vs portable down
     (id sync only)
2013-05-17 20:39:57 +10:00
Darren Tucker 044f32f4c6 - (dtucker) [regress/cfgmatch.sh] Remove unneeded sleep renderd obsolete by
rev 1.6 which calls wait.
2013-05-17 20:12:57 +10:00
Darren Tucker 9cc8ff7b63 - (dtucker) [regress/runtests.sh] Remove obsolete test driver script. 2013-05-17 20:01:52 +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 96457a54d0 - (dtucker) [regress/agent-getpeereid.sh] Resync spaces with openbsd. 2013-05-17 19:03:38 +10:00
Darren Tucker 7f19323659 - (dtucker) [regress/cfgmatch.sh] Resync config file setup with openbsd. 2013-05-17 19:02:28 +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 34035be27b - dtucker@cvs.openbsd.org 2013/05/17 01:32:11
[regress/integrity.sh]
     don't print output from ssh before getting it (it's available in ssh.log)
2013-05-17 14:47:51 +10:00
Darren Tucker b8b96b0aa6 - dtucker@cvs.openbsd.org 2013/05/17 01:16:09
[regress/agent-timeout.sh]
     Pull back some portability changes from -portable:
      - TIMEOUT is a read-only variable in some shells
      - not all greps have -q so redirect to /dev/null instead.
     (ID sync only)
2013-05-17 14:46:20 +10:00
Darren Tucker a40d97ff46 sync missing ID 2013-05-17 14:44:53 +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 91af05c516 - (dtucker) [regress/integrity.sh]. Force fixed Diffie-Hellman key exchange
methods.  When the openssl version doesn't support ECDH then next one on
   the list is DH group exchange, but that causes a bit more traffic which can
   mean that the tests flip bits in the initial exchange rather than the MACed
   traffic and we get different errors to what the tests look for.
2013-05-17 13:16:59 +10:00
Darren Tucker 6e1e60c3c2 - (dtucker) [regress/bsd.regress.mk] Remove unused file. We've never used it
in portable and it's long gone in openbsd.
2013-05-17 11:23:41 +10:00
Darren Tucker 982b0cbc4c - dtucker@cvs.openbsd.org 2013/05/16 05:48:31
[regress/rekey.sh]
     add tests for RekeyLimit parsing
2013-05-17 09:45:12 +10:00
Darren Tucker 14490fe7b0 - dtucker@cvs.openbsd.org 2013/05/16 04:26:10
[regress/rekey.sh]
     add server-side rekey test
2013-05-17 09:44:20 +10:00
Darren Tucker c31c8729c1 - dtucker@cvs.openbsd.org 2013/05/16 03:33:30
[regress/rekey.sh]
     test rekeying when there's no data being transferred
2013-05-17 09:43:33 +10:00
Darren Tucker a8a62fcc46 - dtucker@cvs.openbsd.org 2013/05/16 02:10:35
[rekey.sh]
     Add test for time-based rekeying
2013-05-17 09:42:34 +10:00
Darren Tucker 5e95173715 - djm@cvs.openbsd.org 2013/05/10 03:46:14
[modpipe.c]
     sync some portability changes from portable OpenSSH (id sync only)
2013-05-17 09:41:33 +10:00
Darren Tucker a4df65b9fc - dtucker@cvs.openbsd.org 2013/04/22 07:28:53
[multiplex.sh]
     Add tests for -Oforward and -Ocancel for local and remote forwards
2013-05-17 09:37:31 +10:00
Darren Tucker 40aaff7e4b - dtucker@cvs.openbsd.org 2013/04/22 07:23:08
[multiplex.sh]
     Write mux master logs to regress.log instead of ssh.log to keep separate
2013-05-17 09:36:20 +10:00