summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/readconf.h
AgeCommit message (Collapse)Author
2014-10-08Tweak config reparsing with host canonicalisationDamien Miller
Make the second pass through the config files always run when hostname canonicalisation is enabled. Add a "Match canonical" criteria that allows ssh_config Match blocks to trigger only in the second config pass. Add a -G option to ssh that causes it to parse its configuration and dump the result to stdout, similar to "sshd -T" Allow ssh_config Port options set in the second config parse phase to be applied (they were being ignored). bz#2267 bz#2286; ok markus
2014-07-15Add support for Unix domain socket forwarding. A remote TCP portTodd C. Miller
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-02-23reparse ssh_config and ~/.ssh/config if hostname canonicalisation changesDamien Miller
the hostname. This allows users to write configurations that always refer to canonical hostnames, e.g. CanonicalizeHostname yes CanonicalDomains int.example.org example.org CanonicalizeFallbackLocal no Host *.int.example.org Compression off Host *.example.org User djm ok markus@
2014-01-29remove experimental, never-enabled JPAKE code; ok markus@Damien Miller
2013-10-16s/canonicalise/canonicalize/ for consistency with existing spelling,Damien Miller
e.g. authorized_keys; pointed out by naddy@
2013-10-16Implement client-side hostname canonicalisation to allow an explicitDamien Miller
search path of domain suffixes to use to convert unqualified host names to fully-qualified ones for host key matching. This is particularly useful for host certificates, which would otherwise need to list unqualified names alongside fully-qualified ones (and this causes a number of problems). "looks fine" markus@
2013-10-14add a "Match" keyword to ssh_config that allows matching on hostname,Damien Miller
user and result of arbitrary commands. "nice work" markus@
2013-08-20Add a ssh_config ProxyUseFDPass option that supports the use ofDamien Miller
ProxyCommands that establish a connection and then pass a connected file descriptor back to ssh(1). This allows the ProxyCommand to exit rather than have to shuffle data back and forth and enables ssh to use getpeername, etc. to obtain address information just like it does with regular directly-connected sockets. ok markus@
2013-05-16add the ability to ignore specific unrecognised ssh_config options;Damien Miller
bz#866; ok markus@
2013-05-16Add an optional second argument to RekeyLimit in the client to allowDarren Tucker
rekeying based on elapsed time in addition to amount of traffic. with djm@ jmc@, ok djm
2013-02-22Don't complain if IdentityFiles specified in system-wide configs are missing.Darren Tucker
ok djm, deraadt.
2013-02-17Keep track of which IndentityFile options were manually supplied and whichDarren Tucker
were default options, and don't warn if the latter are missing. ok markus@
2011-09-23unbreak remote portforwarding with dynamic allocated listen ports:Markus Friedl
1) send the actual listen port in the open message (instead of 0). this allows multiple forwardings with a dynamic listen port 2) update the matching permit-open entry, so we can identify where to connect to report: den at skbkontur.ru and P. Szczygielski feedback and ok djm@
2011-05-24Remove undocumented legacy options UserKnownHostsFile2 andDamien Miller
GlobalKnownHostsFile2 by making UserKnownHostsFile/GlobalKnownHostsFile accept multiple paths per line and making their defaults include known_hosts2; ok markus
2011-05-06Add a RequestTTY ssh_config option to allow configuration-basedDamien Miller
control over tty allocation (like -t/-T); ok markus@
2010-11-13allow ssh and sshd to set arbitrary TOS/DSCP/QoS values instead ofDamien Miller
hardcoding lowdelay/throughput. bz#1733 patch from philipp AT redfish-solutions.com; ok markus@ deraadt@
2010-09-22add a KexAlgorithms knob to the client and server configuration to allowDamien Miller
selection of which key exchange methods are used by ssh(1) and sshd(8) and their order of preference. ok markus@
2010-07-19add a "ControlPersist" option that automatically starts a backgroundDamien Miller
ssh(1) multiplex master when connecting. This connection can stay alive indefinitely, or can be set to automatically close after a user-specified duration of inactivity. bz#1330 - patch by dwmw2 AT infradead.org, but further hacked on by wmertens AT cisco.com, apb AT cequrux.com, martin-mindrot-bugzilla AT earth.li and myself; "looks ok" markus@
2010-06-25Add X11ForwardTimeout option to specify timeout for untrusted X11Damien Miller
authentication cookies to avoid fallback in X11 code to fully-trusted implicit authentication using SO_PEERCRED described at: http://lists.x.org/archives/xorg-devel/2010-May/008636.html After the X11ForwardTimeout has expired the client will now refuse incoming X11 channel opens. based on patch from Tavis Ormandy; "nice" markus@
2010-06-25bz#1327: remove hardcoded limit of 100 permitopen clauses and portDamien Miller
forwards per direction; ok markus@ stevesk@
2010-05-16mux support for remote forwarding with dynamic port allocation,Markus Friedl
use with LPORT=`ssh -S muxsocket -R0:localhost:25 -O forward somehost` feedback and ok djm@
2010-02-08replace our obsolete smartcard code with PKCS#11.Markus Friedl
ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-11/v2-20/pkcs-11v2-20.pdf ssh(1) and ssh-keygen(1) use dlopen(3) directly to talk to a PKCS#11 provider (shared library) while ssh-agent(1) delegates PKCS#11 to a forked a ssh-pkcs11-helper process. PKCS#11 is currently a compile time option. feedback and ok djm@; inspired by patches from Alon Bar-Lev
2010-01-09Remove RoutingDomain from ssh since it's now not needed. It can be replacedDarren Tucker
with "route exec" or "nc -V" as a proxycommand. "route exec" also ensures that trafic such as DNS lookups stays withing the specified routingdomain. For example (from reyk): # route -T 2 exec /usr/sbin/sshd or inherited from the parent process $ route -T 2 exec sh $ ssh 10.1.2.3 ok deraadt@ markus@ stevesk@ reyk@
2009-10-28Allow to set the rdomain in ssh/sftp/scp/sshd and ssh-keyscan.Reyk Floeter
ok markus@
2009-06-27Add client option UseRoaming. It doesn't do anything yet but willAndreas Gunnarsson
control whether the client tries to use roaming if enabled on the server. From Martin Forssen. ok markus@
2009-02-12support remote port forwarding with a zero listen port (-R0:...) toDamien Miller
dyamically allocate a listen port at runtime (this is actually specified in rfc4254); bz#1003 ok markus@
2009-01-22make a2port() return -1 when it encounters an invalid port numberDamien Miller
rather than 0, which it will now treat as valid (needed for future work) adjust current consumers of a2port() to check its return value is <= 0, which in turn required some things to be converted from u_short => int make use of int vs. u_short consistent in some other places too feedback & ok markus@
2008-11-04Add support for an experimental zero-knowledge password authenticationDamien Miller
method using the J-PAKE protocol described in F. Hao, P. Ryan, "Password Authenticated Key Exchange by Juggling", 16th Workshop on Security Protocols, Cambridge, April 2008. This method allows password-based authentication without exposing the password to the server. Instead, the client and server exchange cryptographic proofs to demonstrate of knowledge of the password while revealing nothing useful to an attacker or compromised endpoint. This is experimental, work-in-progress code and is presently compiled-time disabled (turn on -DJPAKE in Makefile.inc). "just commit it. It isn't too intrusive." deraadt@
2008-11-01merge dynamic forward parsing into parse_forward(); 'i think this is OK' djm@Kevin Steves
2008-06-26Move SSH Fingerprint Visualization away from sharing the config optionAlexander von Gernler
CheckHostIP to an own config option named VisualHostKey. While there, fix the behaviour that ssh would draw a random art picture on every newly seen host even when the option was not enabled. prodded by deraadt@, discussions, help and ok markus@ djm@ dtucker@
2008-06-11Introduce SSH Fingerprint ASCII Visualization, a technique inspired by theAlexander von Gernler
graphical hash visualization schemes known as "random art", and by Dan Kaminsky's musings on the subject during a BlackOp talk at the 23C3 in Berlin. Scientific publication (original paper): "Hash Visualization: a New Technique to improve Real-World Security", Perrig A. and Song D., 1999, International Workshop on Cryptographic Techniques and E-Commerce (CrypTEC '99) http://sparrow.ece.cmu.edu/~adrian/projects/validation/validation.pdf The algorithm used here is a worm crawling over a discrete plane, leaving a trace (augmenting the field) everywhere it goes. Movement is taken from dgst_raw 2bit-wise. Bumping into walls makes the respective movement vector be ignored for this turn, thus switching to the other color of the chessboard. Graphs are not unambiguous for now, because circles in graphs can be walked in either direction. discussions with several people, help, corrections and ok markus@ djm@
2008-01-19promote rekeylimit to a int64 so it can hold the maximum useful limitDamien Miller
of 2^32; report and patch from Jan.Pechanec AT Sun.COM, ok dtucker@
2006-08-03almost entirely get rid of the culture of ".h files that include .h files"Theo de Raadt
ok djm, sort of ok stevesk makes the pain stop in one easy step
2006-07-11add ExitOnForwardFailure: terminate the connection if ssh(1)Markus Friedl
cannot set up all requested dynamic, local, and remote port forwardings. ok djm, dtucker, stevesk, jmc
2006-03-25standardise spacing in $OpenBSD$ tags; requested by deraadt@Damien Miller
2005-12-06Add support for tun(4) forwarding over OpenSSH, based on an idea andReyk Floeter
initial channel code bits by markus@. This is a simple and easy way to use OpenSSH for ad hoc virtual private network connections, e.g. administrative tunnels or secure wireless access. It's based on a new ssh channel and works similar to the existing TCP forwarding support, except that it depends on the tun(4) network interface on both ends of the connection for layer 2 or layer 3 tunneling. This diff also adds support for LocalCommand in the ssh(1) client. ok djm@, markus@, jmc@ (manpages), tested and discussed with others
2005-06-08add ControlMaster=auto/autoask options to support opportunistic multiplexing;Damien Miller
tested avsm@ and jakob@, ok markus@
2005-03-01add support for hashing host names and addresses added to known_hosts files,Damien Miller
to improve privacy of which hosts user have been visiting; ok markus@ deraadt@
2005-03-01bz#413: allow optional specification of bind address for port forwardings.Damien Miller
Patch originally by Dan Astorian, but worked on by several people Adds GatewayPorts=clientspecified option on server to allow remote forwards to bind to client-specified ports. ok markus@
2004-07-11spacesTheo de Raadt
2004-06-13implement session multiplexing in the client (the server has supported thisDamien Miller
since 2.0); ok markus@
2004-04-27bz #815: implement ability to pass specified environment variables from theDamien Miller
client to the server; ok markus@
2004-04-18perform strict ownership and modes checks for ~/.ssh/config files, as theseDamien Miller
can be used to execute arbitrary programs; ok markus@ NB. ssh will now exit when it detects a config with poor permissions
2004-03-05add IdentitiesOnly; ok djm@, pb@Markus Friedl
2003-12-16application layer keep alive (ServerAliveInterval ServerAliveCountMax)Markus Friedl
for ssh(1), similar to the sshd(8) option; ok beck@; with help from jmc and dtucker@
2003-12-09rename keepalive to tcpkeepalive; the old name causes too muchMarkus Friedl
confusion; ok djm, dtucker; with help from jmc@
2003-11-21unexpand and delete whitespace at EOL; ok markus@Damien Miller
2003-10-11remote x11 clients are now untrusted by default, uses xauth(8) to generateMarkus Friedl
untrusted cookies; ForwardX11Trusted=yes restores old behaviour. ok deraadt; feedback and ok djm/fries
2003-09-01remove unused kerberos code; ok henning@Markus Friedl
2003-08-22support GSS API user authentication; patches from Simon Wilkinson,Markus Friedl
stripped down and tested by Jakob and myself.