summaryrefslogtreecommitdiffstats
path: root/openbsd-compat/freezero.c (unfollow)
Commit message (Collapse)AuthorFilesLines
2021-07-03Remove duplicate error on error path.Darren Tucker1-1/+0
There's an extra error() call on the listen error path, it looks like its removal was missed during an upstream sync.
2021-07-03Remove some whitespace not in upstream.Darren Tucker3-3/+1
Reduces diff vs OpenBSD by a small amount.
2021-07-03Replace remaining references to ChallengeResponse.Darren Tucker2-6/+6
Portable had a few additional references to ChallengeResponse related to UsePAM, replaces these with equivalent keyboard-interactive ones.
2021-07-03Sync remaining ChallengeResponse removal.Darren Tucker11-47/+23
These were omitted from commit 88868fd131.
2021-07-03Disable rocky84 to figure out why agent test failsDarren Tucker1-2/+2
2021-07-02Remove now-unused SSHv1 enums.Darren Tucker1-1/+0
sRhostsRSAAuthentication and sRSAAuthentication are protocol 1 options and are no longer used.
2021-07-02upstream: Remove references to ChallengeResponseAuthentication indtucker@openbsd.org4-40/+19
favour of KbdInteractiveAuthentication. The former is what was in SSHv1, the latter is what is in SSHv2 (RFC4256) and they were treated as somewhat but not entirely equivalent. We retain the old name as deprecated alias so config files continue to work and a reference in the man page for people looking for it. Prompted by bz#3303 which pointed out the discrepancy between the two when used with Match. Man page help & ok jmc@, with & ok djm@ OpenBSD-Commit-ID: 2c1bff8e5c9852cfcdab1f3ea94dfef5a22f3b7e
2021-07-02Fix ifdefs around get_random_bytes_prngd.Darren Tucker1-2/+2
get_random_bytes_prngd() is used if either of PRNGD_PORT or PRNGD_SOCKET are defined, so adjust ifdef accordingly.
2021-07-02wrap get_random_bytes_prngd() in ifdefDamien Miller1-0/+2
avoid unused static function warning
2021-06-28Add rocky84 test target.Darren Tucker1-0/+2
2021-06-25upstream: fix decoding of X.509 subject name; from Leif Thuressondjm@openbsd.org1-2/+2
via bz3327 ok markus@ OpenBSD-Commit-ID: 0ea2e28f39750dd388b7e317bc43dd997a217ae8
2021-06-25upstream: Use better language to refer to the user. From l1vingdtucker@openbsd.org2-7/+7
via github PR#250, ok jmc@ OpenBSD-Commit-ID: 07ca3526626996613e128aeddf7748c93c4d6bbf
2021-06-25upstream: Replace SIGCHLD/notify_pipe kludge with pselect.dtucker@openbsd.org1-80/+28
Previously sshd's SIGCHLD handler would wake up select() by writing a byte to notify_pipe. We can remove this by blocking SIGCHLD, checking for child terminations then passing the original signal mask through to pselect. This ensures that the pselect will immediately wake up if a child terminates between wait()ing on them and the pselect. In -portable, for platforms that do not have pselect the kludge is still there but is hidden behind a pselect interface. Based on other changes for bz#2158, ok djm@ OpenBSD-Commit-ID: 202c85de0b3bdf1744fe53529a05404c5480d813
2021-06-25Move closefrom() to before first malloc.Darren Tucker1-6/+6
When built against tcmalloc, tcmalloc allocates a descriptor for its internal use, so calling closefrom() afterward causes the descriptor number to be reused resulting in a corrupted connection. Moving the closefrom a little earlier should resolve this. From kircherlike at outlook.com via bz#3321, ok djm@
2021-06-18Put second -lssh in link line for sftp-server.Darren Tucker1-1/+1
When building --without-openssl the recent port-prngd.c change adds a dependency on atomicio, but since nothing else in sftp-server uses it, the linker may not find it. Add a second -lssh similar to other binaries.
2021-06-18Try EGD/PRNGD if random device fails.Darren Tucker1-3/+9
When built --without-openssl, try EGD/PRGGD (if configured) as a last resort before failing.
2021-06-18Split EGD/PRNGD interface into its own file.Darren Tucker4-123/+164
This will allow us to use it when building --without-openssl.
2021-06-17Handle GIDs > 2^31 in getgrouplist.Darren Tucker1-4/+4
When compiled in 32bit mode, the getgrouplist implementation may fail for GIDs greater than LONG_MAX. Analysis and change from ralf.winkel at tui.com.
2021-06-10upstream: Use $SUDO when reading sshd's pidfile here too.dtucker@openbsd.org1-2/+2
OpenBSD-Regress-ID: 6bfb0d455d493f24839034a629c5306f84dbd409
2021-06-10upstream: Use $SUDO when reading sshd's pidfile in case it wasdtucker@openbsd.org1-1/+1
created with a very restrictive umask. This resyncs with -portable. OpenBSD-Regress-ID: 07fd2af06df759d4f64b82c59094accca1076a5d
2021-06-10upstream: Set umask when creating hostkeys to prevent excessivedtucker@openbsd.org1-2/+2
permissions warning. OpenBSD-Regress-ID: 382841db0ee28dfef7f7bffbd511803e1b8ab0ef
2021-06-10upstream: Add regress test for SIGHUP restartdtucker@openbsd.org1-1/+23
while handling active and unauthenticated clients. Should catch anything similar to the pselect bug just fixed in sshd.c. OpenBSD-Regress-ID: 3b3c19b5e75e43af1ebcb9586875b3ae3a4cac73
2021-06-10upstream: Continue accept loop when pselectdtucker@openbsd.org1-2/+2
returns -1, eg if it was interrupted by a signal. This should prevent the hang discovered by sthen@ wherein sshd receives a SIGHUP while it has an unauthenticated child and goes on to a blocking read on a notify_pipe. feedback deraadt@, ok djm@ OpenBSD-Commit-ID: 0243c1c5544fca0974dae92cd4079543a3fceaa0
2021-06-09upstream: test that UserKnownHostsFile correctly accepts multipledjm@openbsd.org1-3/+9
arguments; would have caught readconf.c r1.356 regression OpenBSD-Regress-ID: 71ca54e66c2a0211b04999263e56390b1f323a6a
2021-06-09upstream: fix regression in r1.356: for ssh_config options thatdjm@openbsd.org1-2/+3
accepted multiple string arguments, ssh was only recording the first. Reported by Lucas via bugs@ OpenBSD-Commit-ID: 7cbf182f7449bf1cb7c5b4452667dc2b41170d6d
2021-06-08upstream: test argv_split() optional termination on commentsdjm@openbsd.org1-29/+69
OpenBSD-Regress-ID: 9fd1c4a27a409897437c010cfd79c54b639a059c
2021-06-08upstream: Add testcases from bz#3319 for IPQoS and TunnelDevicedtucker@openbsd.org1-1/+12
being overridden on the command line. OpenBSD-Regress-ID: 801674d5d2d02abd58274a78cab2711f11de14a8
2021-06-08upstream: sprinkle some "# comment" at end of configuration linesdjm@openbsd.org3-20/+20
to test comment handling OpenBSD-Regress-ID: cb82fbf40bda5c257a9f742c63b1798e5a8fdda7
2021-06-08upstream: more descriptive failure messagedjm@openbsd.org1-2/+2
OpenBSD-Regress-ID: 5300f6faf1d9e99c0cd10827b51756c5510e3509
2021-06-08upstream: test AuthenticationMethods inside a Match block as welldjm@openbsd.org1-5/+14
as in the main config section OpenBSD-Regress-ID: ebe0a686621b7cb8bb003ac520975279c28747f7
2021-06-08upstream: prepare for stricter sshd_config parsing that will refusedjm@openbsd.org1-5/+3
a config that has {Allow,Deny}{Users,Groups} on a line with no subsequent arguments. Such lines are permitted but are nonsensical noops ATM OpenBSD-Regress-ID: ef65463fcbc0bd044e27f3fe400ea56eb4b8f650
2021-06-08upstream: switch sshd_config parsing to argv_split()djm@openbsd.org1-283/+331
similar to the previous commit, this switches sshd_config parsing to the newer tokeniser. Config parsing will be a little stricter wrt quote correctness and directives appearing without arguments. feedback and ok markus@ tested in snaps for the last five or so days - thanks Theo and those who caught bugs OpenBSD-Commit-ID: 9c4305631d20c2d194661504ce11e1f68b20d93e
2021-06-08upstream: Switch ssh_config parsing to use argv_split()djm@openbsd.org2-152/+273
This fixes a couple of problems with the previous tokeniser, strdelim() 1. strdelim() is permissive wrt accepting '=' characters. This is intended to allow it to tokenise "Option=value" but because it cannot keep state, it will incorrectly split "Opt=val=val2". 2. strdelim() has rudimentry handling of quoted strings, but it is incomplete and inconsistent. E.g. it doesn't handle escaped quotes inside a quoted string. 3. It has no support for stopping on a (unquoted) comment. Because of this readconf.c r1.343 added chopping of lines at '#', but this caused a regression because these characters may legitimately appear inside quoted strings. The new tokeniser is stricter is a number of cases, including #1 above but previously it was also possible for some directives to appear without arguments. AFAIK these were nonsensical in all cases, and the new tokeniser refuses to accept them. The new code handles quotes much better, permitting quoted space as well as escaped closing quotes. Finally, comment handling should be fixed - the tokeniser will terminate only on unquoted # characters. feedback & ok markus@ tested in snaps for the last five or so days - thanks Theo and those who caught bugs OpenBSD-Commit-ID: dc72fd12af9d5398f4d9e159d671f9269c5b14d5
2021-06-08upstream: Check if IPQoS or TunnelDevice are already set beforedtucker@openbsd.org1-3/+3
overriding. Prevents values in config files from overriding values supplied on the command line. bz#3319, ok markus. OpenBSD-Commit-ID: f3b08b898c324debb9195e6865d8999406938f74
2021-06-08upstream: Allow argv_split() to optionally terminate tokenisationdjm@openbsd.org4-12/+63
when it encounters an unquoted comment. Add some additional utility function for working with argument vectors, since we'll be switching to using them to parse ssh/sshd_config shortly. ok markus@ as part of a larger diff; tested in snaps OpenBSD-Commit-ID: fd9c108cef2f713f24e3bc5848861d221bb3a1ac
2021-06-07Save logs on failure for upstream testDarren Tucker1-0/+7
2021-06-07Add obsdsnap-i386 upstream test target.Darren Tucker1-1/+1
2021-06-07upstream: fix debug message when finding a private key to match adjm@openbsd.org1-3/+3
certificate being attempted for user authentication. Previously it would print the certificate's path, whereas it was supposed to be showing the private key's path. Patch from Alex Sherwin via GHPR247 OpenBSD-Commit-ID: d5af3be66d0f22c371dc1fe6195e774a18b2327b
2021-06-06upstream: Match host certificates against host public keys, not privatedjm@openbsd.org1-2/+2
keys. Allows use of certificates with private keys held in a ssh-agent. Reported by Miles Zhou in bz3524; ok dtucker@ OpenBSD-Commit-ID: 25f5bf70003126d19162862d9eb380bf34bac22a
2021-06-06upstream: Client-side workaround for a bug in OpenSSH 7.4: this releasedjm@openbsd.org3-5/+16
allows RSA/SHA2 signatures for public key authentication but fails to advertise this correctly via SSH2_MSG_EXT_INFO. This causes clients of these server to incorrectly match PubkeyAcceptedAlgorithms and potentially refuse to offer valid keys. Reported by and based on patch from Gordon Messmer via bz3213, thanks also for additional analysis by Jakub Jelen. ok dtucker OpenBSD-Commit-ID: d6d0b7351d5d44c45f3daaa26efac65847a564f7
2021-06-06upstream: degrade gracefully if a sftp-server offers thedjm@openbsd.org1-2/+6
limits@openssh.com extension but fails when the client tries to invoke it. Reported by Hector Martin via bz3318 OpenBSD-Commit-ID: bd9d1839c41811616ede4da467e25746fcd9b967
2021-06-06upstream: the limits@openssh.com extension was incorrectly markeddjm@openbsd.org1-2/+2
as an operation that writes to the filesystem, which made it unavailable in sftp-server read-only mode. Spotted by Hector Martin via bz3318 OpenBSD-Commit-ID: f054465230787e37516c4b57098fc7975e00f067
2021-06-06upstream: PROTOCOL.certkeys: update reference from IETF draft tonaddy@openbsd.org1-12/+11
RFC Also fix some typos. ok djm@ OpenBSD-Commit-ID: 5e855b6c5a22b5b13f8ffa3897a868e40d349b44
2021-06-04Clear notify_pipe from readset if present.Darren Tucker1-1/+3
Prevents leaking an implementation detail to the caller.
2021-06-04space->tabs.Darren Tucker1-83/+83
2021-06-04Add pselect implementation for platforms without.Darren Tucker4-1/+196
This is basically the existing notify_pipe kludge from serverloop.c moved behind a pselect interface. It works by installing a signal handler that writes to a pipe that the select is watching, then calls the original handler. The select call in serverloop will become pselect soon, at which point the kludge will be removed from thereand will only exist in the compat layer. Original code by markus, help from djm.
2021-06-04auth_log: dont log partial successes as failuresVincent Brillault1-13/+16
By design, 'partial' logins are successful logins, so initially with authenticated set to 1, for which another authentication is required. As a result, authenticated is always reset to 0 when partial is set to 1. However, even if authenticated is 0, those are not failed login attempts, similarly to attempts with authctxt->postponed set to 1.
2021-06-04upstream: The RB_GENERATE_STATIC(3) macro expands to a series ofdjm@openbsd.org1-4/+4
function definitions and not a statement, so there should be no semicolon following them. Patch from Michael Forney OpenBSD-Commit-ID: c975dd180580f0bdc0a4d5b7d41ab1f5e9b7bedd
2021-06-04upstream: rework authorized_keys example section, removing irrelevantdjm@openbsd.org1-20/+21
stuff, de-wrapping the example lines and better aligning the examples with common usage and FAQs; ok jmc OpenBSD-Commit-ID: d59f1c9281f828148e2a2e49eb9629266803b75c
2021-06-04upstream: adjust SetEnv description to clarify $TERM handlingdjm@openbsd.org1-3/+5
OpenBSD-Commit-ID: 8b8cc0124856bc1094949d55615e5c44390bcb22
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-21 09:27:47 +0100