Commit Graph

42 Commits

Author SHA1 Message Date
dtucker@openbsd.org e68154b0d4 upstream: Import regenerated moduli
OpenBSD-Commit-ID: f9a0726d957cf10692a231996a1f34e7f9cdfeb0
2022-04-20 15:08:54 +10:00
djm@openbsd.org ce943912df upstream: ssh-add side of destination constraints
Have ssh-add accept a list of "destination constraints" that allow
restricting where keys may be used in conjunction with a ssh-agent/ssh
that supports session ID/hostkey binding.

Constraints are specified as either "[user@]host-pattern" or
"host-pattern>[user@]host-pattern".

The first form permits a key to be used to authenticate as the
specified user to the specified host.

The second form permits a key that has previously been permitted
for use at a host to be available via a forwarded agent to an
additional host.

For example, constraining a key with "user1@host_a" and
"host_a>host_b". Would permit authentication as "user1" at
"host_a", and allow the key to be available on an agent forwarded
to "host_a" only for authentication to "host_b". The key would not
be visible on agent forwarded to other hosts or usable for
authentication there.

Internally, destination constraints use host keys to identify hosts.
The host patterns are used to obtain lists of host keys for that
destination that are communicated to the agent. The user/hostkeys are
encoded using a new restrict-destination-v00@openssh.com key
constraint.

host keys are looked up in the default client user/system known_hosts
files. It is possible to override this set on the command-line.

feedback Jann Horn & markus@
ok markus@

OpenBSD-Commit-ID: 6b52cd2b637f3d29ef543f0ce532a2bce6d86af5
2021-12-20 09:27:06 +11:00
dtucker@openbsd.org 69d6d4b0c8 upstream: Import regenerated moduli file.
OpenBSD-Commit-ID: 7ac6c252d2a5be8fbad4c66d9d35db507c9dac5b
2021-03-13 13:09:28 +11:00
dtucker@openbsd.org 71693251b7 upstream: Add a comment documenting the source of the moduli group
sizes.

OpenBSD-Commit-ID: aec0725ce607630caaa62682624c6763b350391c
2020-11-09 00:02:27 +11:00
deraadt@openbsd.org ab9105470a upstream: clang -Wimplicit-fallthrough does not recognise /*
FALLTHROUGH */ comments, which is the style we currently use, and gives too
many boring warnings. ok djm

OpenBSD-Commit-ID: 07b5031e9f49f2b69ac5e85b8da4fc9e393992a0
2020-08-03 14:27:50 +10:00
dtucker@openbsd.org 56548e4efc upstream: Import regenerated moduli file.
OpenBSD-Commit-ID: 52ff0e3205036147b2499889353ac082e505ea54
2020-06-05 13:28:29 +10:00
dtucker@openbsd.org b81e66dbe0 upstream: Drop leading space from line count that was confusing
ssh-keygen's screen mode.

OpenBSD-Commit-ID: 3bcae7a754db3fc5ad3cab63dd46774edb35b8ae
2020-02-28 12:27:41 +11:00
dtucker@openbsd.org 99ff8fefe4 upstream: Update moduli generation script to new ssh-keygen
generation and screening command line flags.

OpenBSD-Commit-ID: 5010ff08f7ad92082e87dde098b20f5c24921a8f
2020-02-21 11:11:08 +11:00
dtucker@openbsd.org 700d16f5e5 upstream: Import regenerated moduli.
OpenBSD-Commit-ID: 7b7b619c1452a459310b0cf4391c5757c6bdbc0f
2020-02-21 11:10:25 +11:00
deraadt@openbsd.org 03e06dd0e6 upstream: only clang understands those new -W options
OpenBSD-Commit-ID: d9b910e412d139141b072a905e66714870c38ac0
2019-11-15 16:39:31 +11:00
djm@openbsd.org 575d0042a9 upstream: remove debugging goop that snuck in to last commit
OpenBSD-Commit-ID: 8ea4455a2d9364a0a04f9e4a2cbfa4c9fcefe77e
2019-11-15 13:41:40 +11:00
deraadt@openbsd.org 78c9649894 upstream: skip demanding -fstack-protector-all on hppa. we never
wrote a stack protector for reverse-stack architectures, and i don't think
anyone else did either. a warning per compiled file is just annoying.

OpenBSD-Commit-ID: 14806a59353152f843eb349e618abbf6f4dd3ada
2019-11-13 08:47:31 +11:00
djm@openbsd.org 2aae149a34 upstream: undo debugging bits that shouldn't have been committed
OpenBSD-Commit-ID: 4bd5551b306df55379afe17d841207990eb773bf
2019-11-01 13:05:48 +11:00
dtucker@openbsd.org 702368aa43 upstream: Import regenerated moduli file.
OpenBSD-Commit-ID: 58ec755be4e51978ecfee73539090eb68652a987
2019-10-29 20:47:25 +11:00
djm@openbsd.org 105e1c9218 upstream: avoid compiling certain files that deeply depend on
libcrypto when WITH_OPENSSL isn't set

OpenBSD-Commit-ID: 569f08445c27124ec7c7f6c0268d844ec56ac061
2019-09-06 17:54:21 +10:00
bluhm@openbsd.org 5e4796c47d upstream: Test did not compile due to missing symbols. Add source
sshbuf-misc.c to regress as it was done in ssh make file. from Moritz Buhl

OpenBSD-Regress-ID: 9e1c23476bb845f3cf3d15d9032da3ed0cb2fcf5
2019-08-30 15:56:42 +10:00
djm@openbsd.org c4736f39e6 upstream: include sshbuf-misc.c in SRCS_BASE
OpenBSD-Commit-ID: 99dd10e72c04e93849981d43d64c946619efa474
2019-08-29 19:21:42 +10:00
deraadt@openbsd.org 156e9e85e9 upstream: still compile uuencode.c, unbreaks build
OpenBSD-Commit-ID: 5ea3d63ab972691f43e9087ab5fd8376d48e898f
2019-07-08 11:45:51 +10:00
dtucker@openbsd.org 8fcfb7789c upstream: Import regenerated moduli.
OpenBSD-Commit-ID: db6375fc302e3bdf07d96430c63c991b2c2bd3ff
2019-05-08 18:42:34 +10:00
dtucker@openbsd.org 1293740e80 upstream: Import new moduli.
OpenBSD-Commit-ID: c07772f58028fda683ee6abd41c73da3ff70d403
2018-11-16 13:51:12 +11:00
dtucker@openbsd.org 62528870c0 upstream: Import updated moduli.
OpenBSD-Commit-ID: 04431e8e7872f49a2129bf080a6b73c19d576d40
2018-09-21 09:41:59 +10:00
deraadt@openbsd.org 6728f31bdf upstream: Don't redefine Makefile choices which come correct from
bsd.*.mk ok markus

OpenBSD-Commit-ID: 814b2f670df75759e1581ecef530980b2b3d7e0f
2018-07-26 13:55:50 +10:00
dtucker@openbsd.org 424b544fbd upstream: Import regenerated moduli file.
OpenBSD-Commit-ID: 1de0e85522051eb2ffa00437e1885e9d7b3e0c2e
2018-04-06 14:20:33 +10:00
markus@openbsd.org 04214b30be upstream commit
group shared source files (e.g. SRCS_KEX) and allow
compilation w/o OPENSSL ok djm@

OpenBSD-Commit-ID: fa728823ba21c4b45212750e1d3a4b2086fd1a62
2018-01-23 16:34:53 +11:00
markus@openbsd.org ec4a983118 upstream commit
split client/server kex; only ssh-keygen needs
uuencode.o; only scp/sftp use progressmeter.o; ok djm@

OpenBSD-Commit-ID: f2c9feb26963615c4fece921906cf72e248b61ee
2018-01-23 16:30:39 +11:00
markus@openbsd.org ec77efeea0 upstream commit
only ssh-keygen needs uuencode.o; only scp/sftp use
progressmeter.o

OpenBSD-Commit-ID: a337e886a49f96701ccbc4832bed086a68abfa85
2018-01-23 16:29:59 +11:00
deraadt@openbsd.org ac4987a55e upstream commit
ssh/lib hasn't worked towards our code-sharing goals for
a quit while, perhaps it is too verbose?  Change each */Makefile to
specifying exactly what sources that program requires, compiling it seperate.
 Maybe we'll iterate by sorting those into seperatable chunks, splitting up
files which contain common code + server/client specific code, or whatnot.
But this isn't one step, or we'd have done it a long time ago.. ok dtucker
markus djm

OpenBSD-Commit-ID: 5317f294d63a876bfc861e19773b1575f96f027d
2017-12-12 10:32:30 +11:00
Damien Miller eb9c582b71 Switch upstream git repository.
Previously portable OpenSSH has synced against a conversion of OpenBSD's
CVS repository made using the git cvsimport tool, but this has become
increasingly unreliable.

As of this commit, portable OpenSSH now tracks a conversion of the
OpenBSD CVS upstream made using the excellent cvs2gitdump tool from
YASUOKA Masahiko: https://github.com/yasuoka/cvs2gitdump

cvs2gitdump is considerably more reliable than gitcvsimport and the old
version of cvsps that it uses under the hood, and is the same tool used
to export the entire OpenBSD repository to git (so we know it can cope
with future growth).

These new conversions are mirrored at github, so interested parties can
match portable OpenSSH commits to their upstream counterparts.

https://github.com/djmdjm/openbsd-openssh-src
https://github.com/djmdjm/openbsd-openssh-regress

An unfortunate side effect of switching upstreams is that we must have
a flag day, across which the upstream commit IDs will be inconsistent.
The old commit IDs are recorded with the tags "Upstream-ID" for main
directory commits and "Upstream-Regress-ID" for regress commits.

To make it clear that the commit IDs do not refer to the same
things, the new repository will instead use "OpenBSD-ID" and
"OpenBSD-Regress-ID" tags instead.

Apart from being a longwinded explanation of what is going on, this
commit message also serves to synchronise our tools with the state of
the tree, which happens to be:

OpenBSD-ID: 9c43a9968c7929613284ea18e9fb92e4e2a8e4c1
OpenBSD-Regress-ID: b33b385719420bf3bc57d664feda6f699c147fef
2017-10-31 09:05:16 +11:00
espie@openbsd.org 7f13a4827f upstream commit
zap redundant Makefile variables. okay djm@

Upstream-ID: e39b3902fe1d6c4a7ba6a3c58e072219f3c1e604
2017-07-21 14:17:33 +10:00
djm@openbsd.org 43616876ba upstream commit
actually remove these files

Upstream-ID: 1bd41cba06a7752de4df304305a8153ebfb6b0ac
2017-07-21 14:17:32 +10:00
dtucker@openbsd.org 5abbb31c4e upstream commit
Import regenerated moduli.

Upstream-ID: b25bf747544265b39af74fe0716dc8d9f5b63b95
2017-06-24 16:48:39 +10:00
dtucker@openbsd.org 849c5468b6 upstream commit
Run the screen twice so we end up with more candidate
groups.  ok djm@

Upstream-ID: b92c93266d8234d493857bb822260dacf4366157
2017-06-24 16:47:43 +10:00
djm@openbsd.org 55d06c6e72 upstream commit
rationalise the long list of manual CDIAGFLAGS that we
add; most of these were redundant to -Wall -Wextra

Upstream-ID: ea80f445e819719ccdcb237022cacfac990fdc5c
2017-06-07 11:31:15 +10:00
djm@openbsd.org 0f16398301 upstream commit
this one I did forget to "cvs rm"

Upstream-ID: 5781670c0578fe89663c9085ed3ba477cf7e7913
2017-05-02 13:39:36 +10:00
djm@openbsd.org e5d3bd36ef upstream commit
undo some local debugging stuff that I committed by
accident

Upstream-ID: fe5b31f69a60d47171836911f144acff77810217
2017-05-01 10:05:03 +10:00
Darren Tucker 36465a76a7 Typo.
Upstream-Regress-ID: 1e6b51ddf767cbad0a4e63eb08026c127e654308
2017-04-28 14:44:28 +10:00
Darren Tucker 9d18cb7bde Add 2 regress commits I applied by hand.
Upstream-Regress-ID: 30c20180c87cbc99fa1020489fe7fd8245b6420c
Upstream-Regress-ID: 1e6b51ddf767cbad0a4e63eb08026c127e654308
2017-04-28 14:41:17 +10:00
jsg@openbsd.org 7480dfedf8 upstream commit
Change COMPILER_VERSION tests which limited additional
warnings to gcc4 to instead skip them on gcc3 as clang can handle
-Wpointer-sign and -Wold-style-definition.

Upstream-ID: 5cbe348aa76dc1adf55be6c0e388fafaa945439a
2017-04-18 10:16:50 +10:00
bluhm@openbsd.org 3049a012c4 upstream commit
In ssh tests set REGRESS_FAIL_EARLY with ?= so that the
environment can change it. OK djm@

Upstream-Regress-ID: 77bcb50e47b68c7209c7f0a5a020d73761e5143b
2016-10-13 18:55:25 +11:00
dtucker@openbsd.org b61f53c0c3 upstream commit
Update moduli file.

Upstream-ID: 6da9a37f74aef9f9cc639004345ad893cad582d8
2016-08-14 11:19:14 +10:00
guenther@openbsd.org 71f5598f06 upstream commit
DEBUGLIBS has been broken since the gcc4 switch, so
delete it.  CFLAGS contains -g by default anyway

problem noted by Edgar Pettijohn (edgar (at) pettijohn-web.com)
ok millert@ kettenis@ deraadt@

Upstream-ID: 96c5054e3e1f170c6276902d5bc65bb3b87a2603
2016-07-08 13:50:03 +10:00
Darren Tucker 78dc8e3724 Track skipped upstream commit IDs.
There are a small number of "upstream" commits that do not correspond to
a file in -portable.  This file tracks those so that we can reconcile
OpenBSD and Portable to ensure that no commits are accidentally missed.

If you add something to .skipped-commit-ids please also add an upstream
ID line in the following format when you commit it.

    Upstream-ID: 321065a95a7ccebdd5fd08482a1e19afbf524e35
    Upstream-ID: d4f699a421504df35254cf1c6f1a7c304fb907ca
    Upstream-ID: aafe246655b53b52bc32c8a24002bc262f4230f7
    Upstream-ID: 8fa9cd1dee3c3339ae329cf20fb591db6d605120
    Upstream-ID: f31327a48dd4103333cc53315ec53fe65ed8a17a
    Upstream-ID: edbfde98c40007b7752a4ac106095e060c25c1ef
    Upstream-ID: 052fd565e3ff2d8cec3bc957d1788f50c827f8e2
    Upstream-ID: 7cf73737f357492776223da1c09179fa6ba74660
    Upstream-ID: 180d84674be1344e45a63990d60349988187c1ae
    Upstream-ID: f6ae971186ba68d066cd102e57d5b0b2c211a5ee
2016-06-14 13:55:12 +10:00