summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-07-17upstream: Add tests for expansions on UserKnownHostsFile.dtucker@openbsd.org
OpenBSD-Regress-ID: bccf8060306c841bbcceb1392644f906a4d6ca51
2020-07-17upstream: log error message for process_write() write failuresdjm@openbsd.org
OpenBSD-Commit-ID: f733d7b3b05e3c68967dc18dfe39b9e8fad29851
2020-07-17upstream: Add a '%k' TOKEN that expands to the effective HostKey ofdtucker@openbsd.org
the destination. This allows, eg, keeping host keys in individual files using "UserKnownHostsFile ~/.ssh/known_hosts.d/%k". bz#1654, ok djm@, jmc@ (man page bits) OpenBSD-Commit-ID: 7084d723c9cc987a5c47194219efd099af5beadc
2020-07-17upstream: Add %-TOKEN, environment variable and tilde expansion todtucker@openbsd.org
UserKnownHostsFile, allowing the file to be automagically split up in the configuration (eg bz#1654). ok djm@, man page parts jmc@ OpenBSD-Commit-ID: 7e1b406caf147638bb51558836a72d6cc0bd1b18
2020-07-17upstream: - Add [-a rounds] in ssh-keygen man page and usage() -solene@openbsd.org
Reorder parameters list in the first usage() case - Sentence rewording ok dtucker@ jmc@ noticed usage() missed -a flag too OpenBSD-Commit-ID: f06b9afe91cc96f260b929a56e9930caecbde246
2020-07-17upstream: start sentence with capital letter;jmc@openbsd.org
OpenBSD-Commit-ID: ab06581d51b2b4cc1b4aab781f7f3cfa56cad973
2020-07-17detect Linux/X32 systemsDamien Miller
This is a frankenstein monster of AMD64 instructions/calling conventions but with a 4GB address space. Allegedly deprecated but people still run into it causing weird sandbox failures, e.g. bz#3085
2020-07-15upstream: Fix previous by calling the correct function.dtucker@openbsd.org
OpenBSD-Regress-ID: 821cdd1dff9c502cceff4518b6afcb81767cad5a
2020-07-15upstream: Update test to match recent change in match.cdtucker@openbsd.org
OpenBSD-Regress-ID: 965bda1f95f09a765050707340c73ad755f41167
2020-07-15Adjust portable code to match changes in 939d787d,Darren Tucker
2020-07-15upstream: Add default for number of rounds (-a). ok djm@dtucker@openbsd.org
OpenBSD-Commit-ID: cb7e9aa04ace01a98e63e4bd77f34a42ab169b15
2020-07-15upstream: allow some additional control over the use of ssh-askpassdjm@openbsd.org
via $SSH_ASKPASS_REQUIRE, including force-enable/disable. bz#69 ok markus@ OpenBSD-Commit-ID: 3a1e6cbbf6241ddc4405c4246caa2c249f149eb2
2020-07-15upstream: correct recently broken commentsderaadt@openbsd.org
OpenBSD-Commit-ID: 964d9a88f7de1d0eedd3f8070b43fb6e426351f1
2020-07-15upstream: some language improvements; ok markusdjm@openbsd.org
OpenBSD-Commit-ID: 939d787d571b4d5da50b3b721fd0b2ac236acaa8
2020-07-15upstream: update setproctitle after re-exec; ok djmmarkus@openbsd.org
OpenBSD-Commit-ID: bc92d122f9184ec2a9471ade754b80edd034ce8b
2020-07-15upstream: keep ignoring HUP after fork+exec; ok djmmarkus@openbsd.org
OpenBSD-Commit-ID: 7679985a84ee5ceb09839905bb6f3ddd568749a2
2020-07-15upstream: don't exit the listener on send_rexec_state errors; okmarkus@openbsd.org
djm OpenBSD-Commit-ID: 57cbd757d130d3f45b7d41310b3a15eeec137d5c
2020-07-15upstream: Use $OBJ to find key files. Fixes test when run on an objdtucker@openbsd.org
directory (on OpenBSD) or out of tree (in Portable). OpenBSD-Regress-ID: 938fa8ac86adaa527d64a305bd2135cfbb1c0a17
2020-07-04Wrap stdint.h in ifdef HAVE_STDINT_H.Darren Tucker
2020-07-03upstream: put back the mux_ctx memleak fix, but only for channels ofdjm@openbsd.org
type SSH_CHANNEL_MUX_LISTENER; Specifically SSH_CHANNEL_MUX_PROXY channels should not have this structure freed. OpenBSD-Commit-ID: f3b213ae60405f77439e2b06262f054760c9d325
2020-07-03upstream: revert r1.399 - the lifetime of c->mux_ctx is more complex;djm@openbsd.org
simply freeing it here causes other problems OpenBSD-Commit-ID: c6fee8ca94e2485faa783839541962be2834c5ed
2020-07-03upstream: avoid tilde_expand_filename() in expanding ~/.ssh/rc - ifdjm@openbsd.org
sshd is in chroot mode, the likely absence of a password database will cause tilde_expand_filename() to fatal; ok dtucker@ OpenBSD-Commit-ID: e20aee6159e8b79190d18dba1513fc1b7c8b7ee1
2020-07-03upstream: when redirecting sshd's log output to a file, undo thisdjm@openbsd.org
redirection after the session child process is forked(); ok dtucker@ OpenBSD-Commit-ID: 6df86dd653c91f5bc8ac1916e7680d9d24690865
2020-07-03upstream: start ClientAliveInterval bookkeeping before first passdjm@openbsd.org
through select() loop; fixed theoretical case where busy sshd may ignore timeouts from client; inspired by and ok dtucker OpenBSD-Commit-ID: 96bfc4b1f86c7da313882a84755b2b47eb31957f
2020-07-03add check for fido_cred_set_prot() to configureDamien Miller
2020-07-03upstream: Only reset the serveralive check when we receive traffic fromdtucker@openbsd.org
the server and ignore traffic from a port forwarding client, preventing a client from keeping a connection alive when it should be terminated. Based on a patch from jxraynor at gmail.com via openssh-unix-dev and bz#2265, ok djm@ OpenBSD-Commit-ID: a941a575a5cbc244c0ef5d7abd0422bbf02c2dcd
2020-07-03sync sys-queue.h with OpenBSD upstreamDamien Miller
needed for TAILQ_CONCAT
2020-07-03upstream: fix memory leak of mux_ctx; patch from Sergiy Lozovskydjm@openbsd.org
via bz3189 ok dtucker OpenBSD-Commit-ID: db249bd4526fd42d0f4f43f72f7b8b7705253bde
2020-07-03upstream: free kex in ssh_packet_close; ok djm semariemarkus@openbsd.org
OpenBSD-Commit-ID: dbc181e90d3d32fd97b10d75e68e374270e070a2
2020-07-03upstream: Replace TAILQ concatenation loops with TAILQ_CONCATbket@openbsd.org
OK djm@ OpenBSD-Commit-ID: 454b40e09a117ddb833794358970a65b14c431ef
2020-06-27upstream: backout 1.293 fix kex mem-leak in ssh_packet_close at markussemarie@openbsd.org
request the change introduced a NULL deref in sshpkt_vfatal() (uses of ssh->kex after calling ssh_packet_clear_keys()) OpenBSD-Commit-ID: 9c9a6721411461b0b1c28dc00930d7251a798484
2020-06-26document a PAM spec problem in a frustrated commentDamien Miller
2020-06-26upstream: avoid spurious error message when ssh-keygen creates filesdjm@openbsd.org
outside ~/.ssh; with dtucker@ OpenBSD-Commit-ID: ac0c662d44607e00ec78c266ee60752beb1c7e08
2020-06-26missing ifdef SELINUX; spotted by dtuckerDamien Miller
2020-06-26upstream: regress test for ssh-add -d; ok dtucker@djm@openbsd.org
OpenBSD-Regress-ID: 3a2e044be616afc7dd4f56c100179e83b33d8abf
2020-06-26upstream: add test for mux w/-Oproxy; ok djmmarkus@openbsd.org
OpenBSD-Regress-ID: 764d5c696e2a259f1316a056e225e50023abb027
2020-06-26upstream: handle EINTR in waitfd() and timeout_connect() helpers;djm@openbsd.org
bz#3071; ok dtucker@ OpenBSD-Commit-ID: 08fa87be50070bd8b754d9b1ebb1138d7bc9d8ee
2020-06-26upstream: allow "ssh-add -d -" to read keys to be deleted fromdjm@openbsd.org
stdin bz#3180; ok dtucker@ OpenBSD-Commit-ID: 15c7f10289511eb19fce7905c9cae8954e3857ff
2020-06-26upstream: constify a few things; ok dtucker (as part of anotherdjm@openbsd.org
diff) OpenBSD-Commit-ID: 7c17fc987085994d752304bd20b1ae267a9bcdf6
2020-06-26upstream: Defer creation of ~/.ssh by ssh(1) until we attempt todtucker@openbsd.org
write to it so we don't leave an empty .ssh directory when it's not needed. Use the same function to replace the code in ssh-keygen that does the same thing. bz#3156, ok djm@ OpenBSD-Commit-ID: 59c073b569be1a60f4de36f491a4339bc4ae870f
2020-06-26upstream: Expand path to ~/.ssh/rc rather than relying on itdtucker@openbsd.org
being relative to the current directory, so that it'll still be found if the shell startup changes its directory. Since the path is potentially longer, make the cmd buffer that uses it dynamically sized. bz#3185, with & ok djm@ OpenBSD-Commit-ID: 36e33ff01497af3dc8226d0c4c1526fc3a1e46bf
2020-06-26upstream: fix kex mem-leak in ssh_packet_close; ok djmmarkus@openbsd.org
OpenBSD-Commit-ID: e2e9533f393620383afd0b68ef435de8d5e8abe4
2020-06-26upstream: fix ssh -O proxy w/mux which got broken by no longermarkus@openbsd.org
making ssh->kex optional in packet.c revision 1.278 ok djm@ OpenBSD-Commit-ID: 2b65df04a064c2c6277359921d2320c90ab7d917
2020-06-26upstream: support loading big sshd_config files w/o realloc; okmarkus@openbsd.org
djm OpenBSD-Commit-ID: ba9238e810074ac907f0cf8cee1737ac04983171
2020-06-26upstream: allow sshd_config longer than 256k; ok djmmarkus@openbsd.org
OpenBSD-Commit-ID: 83f40dd5457a64c1d3928eb4364461b22766beb3
2020-06-26upstream: only call sshkey_xmss_init() once for KEY_XMSS_CERT; okmarkus@openbsd.org
djm OpenBSD-Commit-ID: d0002ffb7f20f538b014d1d0735facd5a81ff096
2020-06-26upstream: some clarifying commentsdjm@openbsd.org
OpenBSD-Commit-ID: 5268479000fd97bfa30ab819f3517139daa054a2
2020-06-26upstream: updated argument name for -P in first synopsis wasjmc@openbsd.org
missed in previous; OpenBSD-Commit-ID: 8d84dc3050469884ea91e29ee06a371713f2d0b7
2020-06-26upstream: supply word missing in previous;jmc@openbsd.org
OpenBSD-Commit-ID: 16a38b049f216108f66c8b699aa046063381bd23
2020-06-22missing files for webauthn/sshsig unit testDamien Miller