summaryrefslogtreecommitdiff
path: root/usr.bin/ssh
AgeCommit message (Collapse)Author
2019-06-23fix mismatch proto/decl from key shielding change; spotted via oss-fuzzDamien Miller
2019-06-21Add protection for private keys at rest in RAM against speculationDamien Miller
and memory sidechannel attacks like Spectre, Meltdown, Rowhammer and Rambleed. This change encrypts private keys when they are not in use with a symmetic key that is derived from a relatively large "prekey" consisting of random data (currently 16KB). Attackers must recover the entire prekey with high accuracy before they can attempt to decrypt the shielded private key, but the current generation of attacks have bit error rates that, when applied cumulatively to the entire prekey, make this unlikely. Implementation-wise, keys are encrypted "shielded" when loaded and then automatically and transparently unshielded when used for signatures or when being saved/serialised. Hopefully we can remove this in a few years time when computer architecture has become less unsafe. been in snaps for a bit already; thanks deraadt@ ok dtucker@ deraadt@
2019-06-21print the correct AuthorizedPrincipalsCommand rather than anDamien Miller
uninitialised variable; spotted by dtucker@
2019-06-19from tim:Jason McIntyre
- for reput, it is remote-path which is optional, not local-path - sync help from deraadt: - prefer -R and undocument -r (but add a comment for future editors) from schwarze: - prefer -p and undocument -P (as above. the comment was schwarze's too) more: - add the -f flag to reput and reget - sort help (i can;t remember who suggested this originally) djm and deraadt were ok with earlier versions of this; tim and schwarze ok
2019-06-14slightly more instructive error message when the user specifies multipleDamien Miller
-J options on the commandline. bz3015 ok dtucker@
2019-06-14process agent requests for RSA certificate private keys using correctDamien Miller
signature algorithm when requested. Patch from Jakub Jelen in bz3016 ok dtucker markus
2019-06-14for public key authentication, check AuthorizedKeysFiles files beforeDamien Miller
consulting AuthorizedKeysCommand; ok dtucker markus
2019-06-14if passed a bad fd, log what it wasDamien Miller
2019-06-12Hostname->HostName cleanup; from lauri tirkkonenJason McIntyre
ok dtucker
2019-06-12deraadt noticed some inconsistency in the way we denote the "Hostname" andJason McIntyre
"X11UseLocalhost" keywords; this makes things consistent (effectively reversing my commit of yesterday); ok deraadt markus djm
2019-06-11consistent lettering for "HostName" keyword; from lauri tirkkonenJason McIntyre
2019-06-07Typo and spelling fixes in comments and error messages. Patch fromDarren Tucker
knweiss at gmail.com via -portable.
2019-06-07Check for user@host when parsing sftp target. This allows user@[1.2.3.4]Darren Tucker
to work without a path in addition to with one. bz#2999, ok djm@
2019-06-06Replace calls to ssh_malloc_init() by a static init of malloc_options.Otto Moerbeek
Prepares for changes in the way malloc is initialized. ok guenther@ dtucker@
2019-05-31fix ssh-keysign fd handling problem introduced in r1.304 caused by a typoDamien Miller
(STDIN_FILENO vs STDERR_FILENO)
2019-05-29Make the standard output messages of both methods of changing a keyMark Lumsden
pair's comments (using -c and -C) more applicable to both methods. ok and suggestions djm@ dtucker@
2019-05-20tweak previous;Jason McIntyre
2019-05-20embiggen format buffer size for certificate serial number soDamien Miller
that it will fit a full 64 bit integer. bz#3012 from Manoel Domingues Junior
2019-05-20When signing certificates with an RSA key, default to using theDamien Miller
rsa-sha2-512 signature algorithm. Certificates signed by RSA keys will therefore be incompatible with OpenSSH < 7.2 unless the default is overridden. Document the ability of the ssh-keygen -t flag to override the signature algorithm when signing certificates, and the new default. ok deraadt@
2019-05-16Move a variable declaration to the block where it's used to make thingsDarren Tucker
a little tidier for -portable.
2019-05-15When doing the fork+exec'ing for ssh-keysign, rearrange the socketTheo de Raadt
into fd3, so as to not mistakenly leak other fd forward accidentally. ok djm
2019-05-14Delete some .Sx macros that were used in a wrong way.Ingo Schwarze
Part of a patch from Stephen Gregoratto <dev at sgregoratto dot me>.
2019-05-10For PermitOpen violations add the remote host and port toFlorian Obser
be able to find out from where the request was comming. Add the same logging for PermitListen violations which where not logged at all. Pointed out by Robert Kisteleki (robert AT ripe.net) input markus OK deraadt
2019-05-03Use the correct (according to POSIX) format for left-justificationDarren Tucker
in snmprintf. bz#3002, patch from velemas at gmail.com, ok markus@.
2019-05-03Free channel objects on exit path. Patch from markus at blueflash.cc,Darren Tucker
ok deraadt
2019-05-03Free host on exit path. Patch from markus at blueflash.cc, ok djm@Darren Tucker
2019-05-03Wrap XMSS including in ifdef. Patch from markus at blueflash.cc, ok djmDarren Tucker
2019-04-26Import regenerated moduli.Darren Tucker
2019-04-23Use the LogLevel typdef instead of int where appropriate. Patch fromDarren Tucker
Markus Schmidt via openssh-unix-dev, ok markus@
2019-04-19Document new default RSA key size. From sebastiaanlokhorst at gmail.comDarren Tucker
via bz#2997.
2019-04-18When running sshd -T, assume any attibute not provided by -C does not match,Darren Tucker
which allows it to work when sshd_config contains a Match directive with or without -C. bz#2858, ok djm@
2019-04-18Remove crc32.{c,h} which were only used by the now-gone SSH1 protocol.Darren Tucker
Patch from yumkam at gmail.com, ok deraadt.
2019-04-03openssh-8.0Damien Miller
2019-03-29when logging/fataling on error, include a bit more detail than just theDamien Miller
function name and the error message
2019-03-27fix interaction between ClientAliveInterval and RekeyLimit that couldDamien Miller
cause connection to close incorrectly; Report and patch from Jakub Jelen in bz#2757; ok dtucker@ markus@
2019-03-25Fix authentication failures when "AuthenticationMethods any" in aDamien Miller
Match block overrides a more restrictive global default. Spotted by jmc@, ok markus@
2019-03-25whitespaceDamien Miller
2019-03-25Expand comment to document rationale for default key sizes.Darren Tucker
"seems worthwhile" deraadt.
2019-03-25Increase the default RSA key size to 3072 bits. Based on the estimatesDarren Tucker
from NIST Special Publication 800-57, 3k bits provides security equivalent to 128 bits which is the smallest symmetric cipher we enable by default. ok markus@ deraadt@
2019-03-22full stop in the wrong place;Jason McIntyre
2019-03-16benno helped me clean up the tcp forwarding section;Jason McIntyre
2019-03-08fix use-after-free in ssh-pkcs11; found by hshoexer w/AFLMarkus Friedl
2019-03-06Move checks for lists of users or groups into their own function.Darren Tucker
This is a no-op on OpenBSD but will make things easier in -portable, eg on systems where these checks should be case-insensitive. ok djm@
2019-03-06Reset last-seen time when sending a keepalive. Prevents sending twoDarren Tucker
keepalives successively and prematurely terminating connection when ClientAliveCount=1. While there, collapse two similar tests into one. ok markus@
2019-03-05PKCS#11 support is no longer limited to RSA; ok benno@ kn@Christian Weisgerber
2019-03-01in ssh_set_newkeys(), mention the direction that we're keying in debugDamien Miller
messages. Previously it would be difficult to tell which direction it was talking about
2019-03-01Fix two race conditions in sshd relating to SIGHUP:Damien Miller
1. Recently-forked child processes will briefly remain listening to listen_socks. If the main server sshd process completes its restart via execv() before these sockets are closed by the child processes then it can fail to listen at the desired addresses/ports and/or fail to restart. 2. When a SIGHUP is received, there may be forked child processes that are awaiting their reexecution state. If the main server sshd process restarts before passing this state, these child processes will yield errors and use a fallback path of reading the current sshd_config from the filesystem rather than use the one that sshd was started with. To fix both of these cases, we reuse the startup_pipes that are shared between the main server sshd and forked children. Previously this was used solely to implement tracking of pre-auth child processes for MaxStartups, but this extends the messaging over these pipes to include a child->parent message that the parent process is safe to restart. This message is sent from the child after it has completed its preliminaries: closing listen_socks and receiving its reexec state. bz#2953, reported by Michal Koutný; ok markus@ dtucker@
2019-03-01mention PKCS11Provide=none, reword a little and remove mention ofDamien Miller
RSA keys only (since we support ECDSA now and might support others in the future). Inspired by Jakub Jelen via bz#2974
2019-03-01let PKCS11Provider=none do what users expectDamien Miller
print PKCS11Provider instead of obsolete SmartcardDevice in config dump. bz#2974 ok dtucker@
2019-02-27dup stdout/in for proxycommand=-, otherwise stdout might beMarkus Friedl
redirected to /dev/null; ok djm@