Age | Commit message (Collapse) | Author |
|
Replace remaining calls to index(3) with strchr(3). OK
jca@ krw@
Upstream-ID: 33837d767a0cf1db1489b96055f9e330bc0bab6d
|
|
Allow fingerprinting from standard input "ssh-keygen -lf
-"
Support fingerprinting multiple plain keys in a file and authorized_keys
files too (bz#1319)
ok markus@
Upstream-ID: 903f8b4502929d6ccf53509e4e07eae084574b77
|
|
always call privsep_preauth_child() regardless of whether
sshd was started by root; it does important priming before sandboxing and
failing to call it could result in sandbox violations later; ok markus@
Upstream-ID: c8a6d0d56c42f3faab38460dc917ca0d1705d383
|
|
improve sshkey_read() semantics; only update *cpp when a
key is successfully read; ok markus@
Upstream-ID: f371e78e8f4fab366cf69a42bdecedaed5d1b089
|
|
1) Use xcalloc() instead of xmalloc() to check for
potential overflow. (Feedback from both mmcc@ and djm@) 2) move set_size
just before the for loop. (suggested by djm@)
OK djm@
Upstream-ID: 013534c308187284756c3141f11d2c0f33c47213
|
|
Add a new authorized_keys option "restrict" that
includes all current and future key restrictions (no-*-forwarding, etc). Also
add permissive versions of the existing restrictions, e.g. "no-pty" -> "pty".
This simplifies the task of setting up restricted keys and ensures they are
maximally-restricted, regardless of any permissions we might implement in the
future.
Example:
restrict,pty,command="nethack" ssh-ed25519 AAAAC3NzaC1lZDI1...
Idea from Jann Horn; ok markus@
Upstream-ID: 04ceb9d448e46e67e13887a7ae5ea45b4f1719d0
|
|
correct section number for ssh-agent;
Upstream-ID: 44be72fd8bcc167635c49b357b1beea8d5674bd6
|
|
do not confuse mandoc by presenting "Dd";
Upstream-ID: 1470fce171c47b60bbc7ecd0fc717a442c2cfe65
|
|
Add an AddKeysToAgent client option which can be set to
'yes', 'no', 'ask', or 'confirm', and defaults to 'no'. When enabled, a
private key that is used during authentication will be added to ssh-agent if
it is running (with confirmation enabled if set to 'confirm').
Initial version from Joachim Schipper many years ago.
ok markus@
Upstream-ID: a680db2248e8064ec55f8be72d539458c987d5f4
|
|
send SSH2_MSG_UNIMPLEMENTED replies to unexpected
messages during KEX; bz#2949, ok dtucker@
Upstream-ID: 2b3abdff344d53c8d505f45c83a7b12e84935786
|
|
Support "none" as an argument for sshd_config
ForceCommand and ChrootDirectory. Useful inside Match blocks to override a
global default. bz#2486 ok dtucker@
Upstream-ID: 7ef478d6592bc7db5c7376fc33b4443e63dccfa5
|
|
support multiple certificates (one per line) and
reading from standard input (using "-f -") for "ssh-keygen -L"; ok dtucker@
Upstream-ID: ecbadeeef3926e5be6281689b7250a32a80e88db
|
|
list a couple more options usable in Match blocks;
bz#2489
Upstream-ID: e4d03f39d254db4c0cc54101921bb89fbda19879
|
|
improve PEEK/POKE macros: better casts, don't multiply
evaluate arguments; ok deraadt@
Upstream-ID: 9a1889e19647615ededbbabab89064843ba92d3e
|
|
remove prototypes for long-gone s/key support; ok
dtucker@
Upstream-ID: db5bed3c57118af986490ab23d399df807359a79
|
|
makes certain libcrypto implementations cache a /dev/urandom fd
in preparation of sandboxing. Based on patch by Greg Hartman.
|
|
Noted by Austin English.
|
|
-c before -H, in SYNOPSIS and usage();
Upstream-ID: 25e8c58a69e1f37fcd54ac2cd1699370acb5e404
|
|
Add "ssh-keyscan -c ..." flag to allow fetching
certificates instead of plain keys; ok markus@
Upstream-ID: 0947e2177dba92339eced9e49d3c5bf7dda69f82
|
|
remove slogin links; ok deraadt markus djm
Upstream-ID: 39ba08548acde4c54f2d4520c202c2a863a3c730
|
|
fix OOB read in packet code caused by missing return
statement found by Ben Hawkes; ok markus@ deraadt@
Upstream-ID: a3e3a85434ebfa0690d4879091959591f30efc62
|
|
1. rlogin and rsh are long gone 2. protocol version isn't
of core relevance here, and v1 is going away
ok markus@, deraadt@
Upstream-ID: 8b46bc94cf1ca7c8c1a75b1c958b2bb38d7579c8
|
|
"commandline" -> "command line", since there are so few
examples of the former in the pages, so many of the latter, and in some of
these pages we had multiple spellings;
prompted by tj
Upstream-ID: 78459d59bff74223f8139d9001ccd56fc4310659
|
|
Replace ifdef that went missing in commit
c61b42f2678f21f05653ac2d3d241b48ab5d59ac. Fixes build on older
OpenBSDs.
|
|
regress test for "PubkeyAcceptedKeyTypes +..." inside a
Match block
Upstream-Regress-ID: 246c37ed64a2e5704d4c158ccdca1ff700e10647
|
|
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
|
|
Fix "PubkeyAcceptedKeyTypes +..." inside a Match block;
ok dtucker@
Upstream-ID: 853662c4036730b966aab77684390c47b9738c69
|
|
fix execv arguments in a way less likely to cause grief
for -portable; ok dtucker@
Upstream-ID: 5902bf0ea0371f39f1300698dc3b8e4105fc0fc5
|
|
log certificate serial in verbose() messages to match the
main auth success/fail message; ok dtucker@
Upstream-ID: dfc48b417c320b97c36ff351d303c142f2186288
|
|
avoid de-const warning & shrink; ok dtucker@
Upstream-ID: 69a85ef94832378952a22c172009cbf52aaa11db
|
|
Expand tildes in filenames passed to -i before checking
whether or not the identity file exists. This means that if the shell
doesn't do the expansion (eg because the option and filename were given as a
single argument) then we'll still add the key. bz#2481, ok markus@
Upstream-ID: db1757178a14ac519e9a3e1a2dbd21113cb3bfc6
|
|
Do not prepend "exec" to the shell command run by "Match
exec" in a config file. It's an unnecessary optimization from repurposed
ProxyCommand code and prevents some things working with some shells.
bz#2471, pointed out by res at qoxp.net. ok markus@
Upstream-ID: a1ead25ae336bfa15fb58d8c6b5589f85b4c33a3
|
|
Move glob.h from includes.h to the only caller (sftp) and override the
names for the symbols. This prevents name collisions with the system glob
in the case where something other than ssh uses it (eg kerberos). With
jjelen at redhat.com, ok djm@
|
|
Update expected group sizes to match recent code changes.
Upstream-Regress-ID: 0004f0ea93428969fe75bcfff0d521c553977794
|
|
fix keyscan output for multiple hosts/addrs on one line
when host hashing or a non standard port is in use; bz#2479 ok dtucker@
Upstream-ID: 5321dabfaeceba343da3c8a8b5754c6f4a0a307b
|
|
skip "Could not chdir to home directory" message when
chrooted
patch from Christian Hesse in bz#2485 ok dtucker@
Upstream-ID: 86783c1953da426dff5b03b03ce46e699d9e5431
|
|
Handle the split of tun(4) "link0" into tap(4) in ssh
tun-forwarding. Adapted from portable (using separate devices for this is the
normal case in most OS). ok djm@
Upstream-ID: 90facf4c59ce73d6741db1bc926e578ef465cd39
|
|
fix memory leak in error path ok djm@
Upstream-ID: dd2f402b0a0029b755df029fc7f0679e1365ce35
|
|
Compare pointers to NULL rather than 0.
ok djm@
Upstream-ID: 21616cfea27eda65a06e772cc887530b9a1a27f8
|
|
Replace a function-local allocation with stack memory.
ok djm@
Upstream-ID: c09fbbab637053a2ab9f33ca142b4e20a4c5a17e
|
|
bz#2278 from Brent Paulson
|
|
increase the minimum modulus that we will send or accept in
diffie-hellman-group-exchange to 2048 bits; ok markus@
Upstream-ID: 06dce7a24c17b999a0f5fadfe95de1ed6a1a9b6a
|
|
better handle anchored FQDNs (e.g. 'cvs.openbsd.org.') in
hostname canonicalisation - treat them as already canonical and remove the
trailing '.' before matching ssh_config; ok markus@
Upstream-ID: f7619652e074ac3febe8363f19622aa4853b679a
|
|
0 -> NULL when comparing with a char*.
ok dtucker@, djm@.
Upstream-ID: a928e9c21c0a9020727d99738ff64027c1272300
|
|
fix some signed/unsigned integer type mismatches in
format strings; reported by Nicholas Lemonias
Upstream-ID: 78cd55420a0eef68c4095bdfddd1af84afe5f95c
|
|
argument to sshkey_from_private() and sshkey_demote()
can't be NULL
Upstream-ID: 0111245b1641d387977a9b38da15916820a5fd1f
|
|
reported by Nicholas Lemonias
|
|
|
|
|
|
revision 1.20
date: 2015/10/13 20:55:37; author: millert; state: Exp; lines: +2 -2; commitid: X39sl5ay1czgFIgp;
In rev 1.15 the sizeof argument was fixed in a strlcat() call but
the truncation check immediately following it was not updated to
match. Not an issue in practice since the buffers are the same
size. OK deraadt@
|