RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2025-01-02 15:52:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,440 Commits 69 Branches 157 Tags 27 MiB
f96f17f920
Commit Graph

10440 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damien Miller
f96f17f920 sys/sysctl.h is only used on OpenBSD 
so change the preprocessor test used to include it to check
__OpenBSD__, matching the code that uses the symbols it declares.
 2020-04-17 14:07:15 +10:00
djm@openbsd.org
54688e937a upstream: fix reversed test that caused IdentitiesOnly=yes to not 
apply to keys loaded from a PKCS11Provider; bz3141, ok dtucker@

OpenBSD-Commit-ID: e3dd6424b94685671fe84c9b9dbe352fb659f677
 2020-04-17 14:03:36 +10:00
djm@openbsd.org
267cbc87b5 upstream: mention that /etc/hosts.equiv and /etc/shosts.equiv are 
not considered for HostbasedAuthentication when the target user is root;
bz3148

OpenBSD-Commit-ID: fe4c1256929e53f23af17068fbef47852f4bd752
 2020-04-17 14:03:36 +10:00
djm@openbsd.org
c90f72d29e upstream: make IgnoreRhosts a tri-state option: "yes" ignore 
rhosts/shosts, "no" allow rhosts/shosts or (new) "shosts-only" to allow
.shosts files but not .rhosts. ok dtucker@

OpenBSD-Commit-ID: d08d6930ed06377a80cf53923c1955e9589342e9
 2020-04-17 14:03:36 +10:00
djm@openbsd.org
321c714707 upstream: allow the IgnoreRhosts directive to appear anywhere in a 
sshd_config, not just before any Match blocks; bz3148, ok dtucker@

OpenBSD-Commit-ID: e042467d703bce640b1f42c5d1a62bf3825736e8
 2020-04-17 14:03:36 +10:00
jmc@openbsd.org
ca5403b085 upstream: add space between macro arg and punctuation; 
OpenBSD-Commit-ID: e579e4d95eef13059c30931ea1f09ed8296b819c
 2020-04-17 14:03:16 +10:00
Darren Tucker
8af0244d7b Add sys/syscall.h for syscall numbers. 
In some architecture/libc configurations we need to explicitly include
sys/syscall.h for the syscall number (__NR_xxx) definitions.  bz#3085,
patch from blowfist at xroutine.net.
 2020-04-15 10:58:02 +10:00
djm@openbsd.org
3779b50ee9 upstream: Refactor private key parsing. Eliminates a fair bit of 
duplicated code and fixes oss-fuzz#20074 (NULL deref) caused by a missing key
type check in the ECDSA_CERT parsing path.

feedback and ok markus@

OpenBSD-Commit-ID: 4711981d88afb7196d228f7baad9be1d3b20f9c9
 2020-04-11 20:20:58 +10:00
dtucker@openbsd.org
b6a4013647 upstream: Add tests for TOKEN expansion of LocalForward and 
RemoteForward.

OpenBSD-Regress-ID: 90fcbc60d510eb114a2b6eaf4a06ff87ecd80a89
 2020-04-10 11:47:40 +10:00
dtucker@openbsd.org
abc3e0a517 upstream: Add utf8.c for asmprintf used by krl.c 
OpenBSD-Regress-ID: 433708d11165afdb189fe635151d21659dd37a37
 2020-04-10 11:47:40 +10:00
dtucker@openbsd.org
990687a033 upstream: Add TOKEN percent expansion to LocalFoward and RemoteForward 
when used for Unix domain socket forwarding.  Factor out the code for the
config keywords that use the most common subset of TOKENS into its own
function. bz#3014, ok jmc@ (man page bits) djm@

OpenBSD-Commit-ID: bffc9f7e7b5cf420309a057408bef55171fd0b97
 2020-04-10 11:47:19 +10:00
djm@openbsd.org
2b13d3934d upstream: let sshkey_try_load_public() load public keys from the 
unencrypted envelope of private key files if not sidecar public key file is
present.

ok markus@

OpenBSD-Commit-ID: 252a0a580e10b9a6311632530d63b5ac76592040
 2020-04-08 10:14:21 +10:00
djm@openbsd.org
d01f39304e upstream: simplify sshkey_try_load_public() 
ok markus@

OpenBSD-Commit-ID: 05a5d46562aafcd70736c792208b1856064f40ad
 2020-04-08 10:14:21 +10:00
djm@openbsd.org
f290ab0833 upstream: add sshkey_parse_pubkey_from_private_fileblob_type() 
Extracts a public key from the unencrypted envelope of a new-style
OpenSSH private key.

ok markus@

OpenBSD-Commit-ID: 44d7ab446e5e8c686aee96d5897b26b3939939aa
 2020-04-08 10:14:21 +10:00
djm@openbsd.org
8d514eea4a upstream: simplify sshkey_parse_private_fileblob_type() 
Try new format parser for all key types first, fall back to PEM
parser only for invalid format errors.

ok markus@

OpenBSD-Commit-ID: 0173bbb3a5cface77b0679d4dca0e15eb5600b77
 2020-04-08 10:14:21 +10:00
djm@openbsd.org
421169d0e7 upstream: check private key type against requested key type in 
new-style private decoding; ok markus@

OpenBSD-Commit-ID: 04d44b3a34ce12ce5187fb6f6e441a88c8c51662
 2020-04-08 10:14:21 +10:00
djm@openbsd.org
6aabfb6d22 upstream: check that pubkey in private key envelope matches actual 
private key

(this public key is currently unusued)

ok markus@

OpenBSD-Commit-ID: 634a60b5e135d75f48249ccdf042f3555112049c
 2020-04-08 10:14:21 +10:00
djm@openbsd.org
c0f5b22947 upstream: refactor private key parsing a little 
Split out the base64 decoding and private section decryption steps in
to separate functions. This will make the decryption step easier to fuzz
as well as making it easier to write a "load public key from new-format
private key" function.

ok markus@

OpenBSD-Commit-ID: 7de31d80fb9062aa01901ddf040c286b64ff904e
 2020-04-08 10:14:21 +10:00
Darren Tucker
8461a5b3db Include openssl-compat.h before checking ifdefs. 
Fixes problem where unsuitable chacha20 code in libressl would be used
unintentionally.
 2020-04-06 20:54:34 +10:00
Damien Miller
931c50c588 fix inverted test for LibreSSL version 2020-04-06 10:04:56 +10:00
dtucker@openbsd.org
d1d5f72851 upstream: Indicate if we're using a cached key in trace output. 
OpenBSD-Regress-ID: 409a7b0e59d1272890fda507651c0c3d2d3c0d89
 2020-04-05 10:58:53 +10:00
Darren Tucker
a398251a46 Use /usr/bin/xp4g/id if necessary. 
Solaris' native "id" doesn't support the options we use but the one
in /usr/bin/xp4g does, so use that instead.
 2020-04-05 08:43:57 +10:00
dtucker@openbsd.org
db0fdd4833 upstream: Some platforms don't have "hostname -s", so use cut to trim 
short hostname instead.

OpenBSD-Regress-ID: ebcf36a6fdf287c9336b0d4f6fc9f793c05307a7
 2020-04-05 08:40:46 +10:00
dtucker@openbsd.org
e7e59a9cc8 upstream: Compute hash locally and re-enable %C tests. 
OpenBSD-Regress-ID: 94d1366e8105274858b88a1f9ad2e62801e49770
 2020-04-05 08:15:46 +10:00
Damien Miller
abe2b245b3 prefer libcrypto chacha20-poly1305 where possible 2020-04-03 17:26:29 +11:00
dtucker@openbsd.org
bc5c5d01ad upstream: Temporarily remove tests for '%C' since the hash contains the 
local hostname and it doesn't work on any machine except mine... spotted by
djm@

OpenBSD-Regress-ID: 2d4c3585b9fcbbff14f4a5a5fde51dbd0d690401
 2020-04-03 17:24:42 +11:00
djm@openbsd.org
8162402698 upstream: r1.522 deleted one too many lines; repair 
OpenBSD-Commit-ID: 1af8851fd7a99e4a887b19aa8f4c41a6b3d25477
 2020-04-03 17:09:42 +11:00
jmc@openbsd.org
668cb3585c upstream: sort -N and add it to usage(); 
OpenBSD-Commit-ID: 5b00e8db37c2b0a54c7831fed9e5f4db53ada332
 2020-04-03 17:09:42 +11:00
djm@openbsd.org
338ccee1e7 upstream: avoid another compiler warning spotted in -portable 
OpenBSD-Commit-ID: 1d29c51ac844b287c4c8bcaf04c63c7d9ba3b8c7
 2020-04-03 16:53:50 +11:00
djm@openbsd.org
9f8a42340b upstream: this needs utf8.c too 
OpenBSD-Regress-ID: 445040036cec714d28069a20da25553a04a28451
 2020-04-03 15:46:13 +11:00
dtucker@openbsd.org
92115ea7c3 upstream: Add percent_expand test for 'Match Exec'. 
OpenBSD-Regress-ID: a41c14fd6a0b54d66aa1e9eebfb9ec962b41232f
 2020-04-03 15:46:13 +11:00
djm@openbsd.org
de34a44027 upstream: fix format string (use %llu for uint64, not %lld). spotted by 
Darren and his tinderbox tests

OpenBSD-Commit-ID: 3b4587c3d9d46a7be9bdf028704201943fba96c2
 2020-04-03 15:45:12 +11:00
djm@openbsd.org
9cd40b829a upstream: Add a flag to re-enable verbose output when in batch 
mode; requested in bz3135; ok dtucker

OpenBSD-Commit-ID: 5ad2ed0e6440562ba9c84b666a5bbddc1afe2e2b
 2020-04-03 15:41:28 +11:00
djm@openbsd.org
6ce51a5da5 upstream: chacha20-poly1305 AEAD using libcrypto EVP_chacha20 
Based on patch from Yuriy M. Kaminskiy. ok + lots of assistance along the
way at a2k20 tb@

OpenBSD-Commit-ID: 5e08754c13d31258bae6c5e318cc96219d6b10f0
 2020-04-03 15:41:27 +11:00
djm@openbsd.org
eba523f0a1 upstream: make Chacha20-POLY1305 context struct opaque; ok tb@ as 
part of a larger diff at a2k20

OpenBSD-Commit-ID: a4609b7263284f95c9417ef60ed7cdbb7bf52cfd
 2020-04-03 15:36:57 +11:00
djm@openbsd.org
ebd29e9012 upstream: fix debug statement 
OpenBSD-Commit-ID: 42c6edeeda5ce88b51a20d88c93be3729ce6b916
 2020-04-03 15:35:28 +11:00
djm@openbsd.org
7b4d8999f2 upstream: the tunnel-forwarding vs ExitOnForwardFailure fix that I 
committed earlier had an off-by-one. Fix this and add some debugging that
would have made it apparent sooner.

OpenBSD-Commit-ID: 082f8f72b1423bd81bbdad750925b906e5ac6910
 2020-04-03 15:35:28 +11:00
dtucker@openbsd.org
eece243666 upstream: %C expansion just added to Match Exec should include 
remote user not local user.

OpenBSD-Commit-ID: 80f1d976938f2a55ee350c11d8b796836c8397e2
 2020-04-03 15:35:28 +11:00
dtucker@openbsd.org
d5318a784d upstream: Add regression test for percent expansions where possible. 
OpenBSD-Regress-ID: 7283be8b2733ac1cbefea3048a23d02594485288
 2020-04-03 13:43:10 +11:00
djm@openbsd.org
663e84bb53 upstream: make failures when establishing "Tunnel" forwarding terminate 
the connection when ExitOnForwardFailure is enabled; bz3116; ok dtucker

OpenBSD-Commit-ID: ef4b4808de0a419c17579b1081da768625c1d735
 2020-04-03 13:42:33 +11:00
dtucker@openbsd.org
ed833da176 upstream: Make with config keywords support which 
percent_expansions more consistent.  - %C is moved into its own function and
added to Match Exec.  - move the common (global) options into a macro.  This
is ugly but it's    the least-ugly way I could come up with.  - move
IdentityAgent and ForwardAgent percent expansion to before the    config dump
to make it regression-testable.  - document all of the above

ok jmc@ for man page bits, "makes things less terrible" djm@ for the rest.

OpenBSD-Commit-ID: 4b65664bd6d8ae2a9afaf1a2438ddd1b614b1d75
 2020-04-03 13:33:37 +11:00
djm@openbsd.org
6ec7457171 upstream: give ssh-keygen the ability to dump the contents of a 
binary key revocation list: ssh-keygen -lQf /path bz#3132; ok dtucker

OpenBSD-Commit-ID: b76afc4e3b74ab735dbde4e5f0cfa1f02356033b
 2020-04-03 13:33:25 +11:00
djm@openbsd.org
af628b8a6c upstream: add allocating variant of the safe utf8 printer; ok 
dtucker as part of a larger diff

OpenBSD-Commit-ID: 037e2965bd50eacc2ffb49889ecae41552744fa0
 2020-04-03 13:32:50 +11:00
dtucker@openbsd.org
d8ac9af645 upstream: Cast lifetime to u_long for comparison to prevent unsigned 
comparison warning on 32bit arches.  Spotted by deraadt, ok djm.

OpenBSD-Commit-ID: 7a75b2540bff5ab4fa00b4d595db1df13bb0515a
 2020-03-17 09:48:36 +11:00
Darren Tucker
0eaca933ae Include fido.h when checking for fido/credman.h. 
It's required for fido_dev_t, otherwise configure fails with
when given --with-security-key-builtin.
 2020-03-14 20:58:46 +11:00
djm@openbsd.org
c7c099060f upstream: some more speeling mistakes from 
OpenBSD-Regress-ID: 02471c079805471c546b7a69d9ab1d34e9a57443
 2020-03-14 19:40:16 +11:00
djm@openbsd.org
1d89232a4a upstream: improve error messages for some common PKCS#11 C_Login 
failure cases; based on patch from Jacob Hoffman-Andrews in bz3130; ok
dtucker

OpenBSD-Commit-ID: b8b849621b4a98e468942efd0a1c519c12ce089e
 2020-03-14 19:39:30 +11:00
djm@openbsd.org
5becbec023 upstream: use sshpkt_fatal() for kex_exchange_identification() 
errors. This ensures that the logged errors are consistent with other
transport- layer errors and that the relevant IP addresses are logged. bz3129
ok dtucker@

OpenBSD-Commit-ID: 2c22891f0b9e1a6cd46771cedbb26ac96ec2e6ab
 2020-03-14 19:39:30 +11:00
dtucker@openbsd.org
eef88418f9 upstream: Don't clear alarm timers in listening sshd. Previously 
these timers were used for regenerating the SSH1 ephemeral host keys but
those are now gone so there's no need to clear the timers either.  ok
deraadt@

OpenBSD-Commit-ID: 280d2b885e4a1ce404632e8cc38fcb17be7dafc0
 2020-03-14 19:39:30 +11:00
djm@openbsd.org
d081f017c2 upstream: spelling errors in comments; no code change from 
OpenBSD-Commit-ID: 166ea64f6d84f7bac5636dbd38968592cb5eb924
 2020-03-14 19:39:09 +11:00