ignore SIGPIPE here; some downstreams have had this for years...

ssh-keyscan doesn't need it's own sshfatal() definition, it can
use the shared one from fatal.c

based on GHPR401 from lengyijun

unreachable POLLERR case; from ya0guang via GHPR485

remove unneeded semicolons; checked by millert@

pull post-quantum ML-KEM/x25519 key exchange out from compile-time
flag now than an IANA codepoint has been assigned for the algorithm.

Add mlkem768x25519-sha256 in 2nd KexAlgorithms preference slot

pull post-quantum ML-KEM/x25519 key exchange out from compile-time
flag now than an IANA codepoint has been assigned for the algorithm.

Add mlkem768x25519-sha256 in 2nd KexAlgorithms preference slot.

ok markus@

show more ...

be more strict in parsing key type names. Only allow shortnames (e.g
"rsa") in user-interface code and require full SSH protocol names (e.g.
"ssh-rsa") everywhere else.

Prompted by bz3725; ok markus@

Add experimental support for hybrid post-quantum key exchange
ML-KEM768 with ECDH/X25519 from the Internet-draft:
https://datatracker.ietf.org/doc/html/draft-kampanakis-curdle-ssh-pq-ke-03

This is b

Add experimental support for hybrid post-quantum key exchange
ML-KEM768 with ECDH/X25519 from the Internet-draft:
https://datatracker.ietf.org/doc/html/draft-kampanakis-curdle-ssh-pq-ke-03

This is based on previous patches from markus@ but adapted to use the
final FIPS203 standard ML-KEM using a formally-verified implementation
from libcrux.

Note this key exchange method is still a draft and thus subject to
change. It is therefore disabled by default; set MLKEM=yes to build it.
We're making it available now to make it easy for other SSH
implementations to test against it.

ok markus@ deraadt@

show more ...

make host/banner comments go to stderr instead of stdout, so they
are useful as comments without extra shell redirection and so they
don't clutter actual errors on stderr.

Add a -q flag to shut them

make host/banner comments go to stderr instead of stdout, so they
are useful as comments without extra shell redirection and so they
don't clutter actual errors on stderr.

Add a -q flag to shut them up.

ok dtucker@

show more ...

remove SSH1 leftovers

Authored with Space Meyer <git at the-space dot agency>

ok djm

never close stdin

The sanitise_stdfd call makes sure that standard file descriptors are
open (if they were closed, they are connected with /dev/null).

Do not close stdin in any case to prevent erro

never close stdin

The sanitise_stdfd call makes sure that standard file descriptors are
open (if they were closed, they are connected with /dev/null).

Do not close stdin in any case to prevent error messages when stdin is
read multiple times and to prevent later usage of fd 0 for connections,
e.g.

echo localhost | ssh-keyscan -f - -f -

While at it, make stdin-related error messages nicer.

Authored with Max Kunzelmann <maxdev at posteo dot de>

ok djm

show more ...

make DSA key support compile-time optional, defaulting to on

ok markus@

spelling; ok markus@

handle rlimits > INT_MAX (rlim_t is u64); ok dtucker
bz3581

don't print key if printing hostname failed; with/ok dtucker@

space between macro and punctuation;
sort usage();

let ssh-keygen and ssh-keyscan accept -Ohashalg=sha1|sha256 when
outputting SSHFP fingerprints to allow algorithm selection.
bz3493 ok dtucker@

spelling fixes; from paul tagliamonte
amendments to his diff are noted on tech

userspace: remove vestigial '?' cases from top-level getopt(3) loops

getopt(3) returns '?' when it encounters a flag not present in the in
the optstring or if a flag is missing its option argument.

userspace: remove vestigial '?' cases from top-level getopt(3) loops

getopt(3) returns '?' when it encounters a flag not present in the in
the optstring or if a flag is missing its option argument. We can
handle this case with the "default" failure case with no loss of
legibility. Hence, remove all the redundant "case '?':" lines.

Prompted by dlg@. With help from dlg@ and millert@.

Link: https://marc.info/?l=openbsd-tech&m=167011979726449&w=2

ok naddy@ millert@ dlg@

show more ...

allow ssh-keyscan(1) to accept CIDR address ranges, e.g.
ssh-keyscan 192.168.0.0/24

If a CIDR range is passed, then it will be expanded to all possible
addresses in the range including the all-0s an

allow ssh-keyscan(1) to accept CIDR address ranges, e.g.
ssh-keyscan 192.168.0.0/24

If a CIDR range is passed, then it will be expanded to all possible
addresses in the range including the all-0s and all-1s addresses.

bz#976 feedback/ok markus@

show more ...

Strictly enforce the maximum allowed SSH2 banner size in ssh-keyscan
and prevent a one-byte buffer overflow. Patch from Qualys, ok djm@

When poll(2) returns -1, for some error conditions pfd[].revents is
not cleared. There are subtle errors in various programs.
In this particular case, the program should error out.
ok djm millert

hash full host:port when asked to hash output, fixes hashes for non-
default ports. bz3367 ok dtucker@

check for POLLHUP wherever we check for POLLIN

aggressively pre-fill the pollfd array with fd=-1

Convert from select() to ppoll(). Along the way, I observed that the
select() code was using exceptfds incorrectly..
ok millert