RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
openssh/.skipped-commit-ids

66 lines
3.7 KiB
Plaintext
Raw Normal View History

upstream: clean sshd random relinking kit; ok miod@ OpenBSD-Commit-ID: 509bb19bb9762a4b3b589af98bac2e730541b6d4
2024-02-10 11:28:52 +00:00
509bb19bb9762a4b3b589af98bac2e730541b6d4 clean sshd random relinking kit
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-10 19:37:57 +00:00
5317f294d63a876bfc861e19773b1575f96f027d remove libssh from makefiles
upstream commit only ssh-keygen needs uuencode.o; only scp/sftp use progressmeter.o OpenBSD-Commit-ID: a337e886a49f96701ccbc4832bed086a68abfa85
2018-01-08 15:15:17 +00:00
a337e886a49f96701ccbc4832bed086a68abfa85 Makefile changes
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-08 15:15:36 +00:00
f2c9feb26963615c4fece921906cf72e248b61ee more Makefile
upstream commit group shared source files (e.g. SRCS_KEX) and allow compilation w/o OPENSSL ok djm@ OpenBSD-Commit-ID: fa728823ba21c4b45212750e1d3a4b2086fd1a62
2018-01-08 15:37:21 +00:00
fa728823ba21c4b45212750e1d3a4b2086fd1a62 more Makefile refactoring
upstream: Import regenerated moduli file. OpenBSD-Commit-ID: 1de0e85522051eb2ffa00437e1885e9d7b3e0c2e
2018-04-03 02:14:08 +00:00
1de0e85522051eb2ffa00437e1885e9d7b3e0c2e moduli update
upstream: Don't redefine Makefile choices which come correct from bsd.*.mk ok markus OpenBSD-Commit-ID: 814b2f670df75759e1581ecef530980b2b3d7e0f
2018-07-25 17:12:35 +00:00
814b2f670df75759e1581ecef530980b2b3d7e0f remove redundant make defs
upstream: Import updated moduli. OpenBSD-Commit-ID: 04431e8e7872f49a2129bf080a6b73c19d576d40
2018-09-20 08:07:03 +00:00
04431e8e7872f49a2129bf080a6b73c19d576d40 moduli update
upstream: Import new moduli. OpenBSD-Commit-ID: c07772f58028fda683ee6abd41c73da3ff70d403
2018-10-31 11:20:05 +00:00
c07772f58028fda683ee6abd41c73da3ff70d403 moduli update
upstream: Import regenerated moduli. OpenBSD-Commit-ID: db6375fc302e3bdf07d96430c63c991b2c2bd3ff
2019-04-26 08:37:17 +00:00
db6375fc302e3bdf07d96430c63c991b2c2bd3ff moduli update
upstream: still compile uuencode.c, unbreaks build OpenBSD-Commit-ID: 5ea3d63ab972691f43e9087ab5fd8376d48e898f
2019-07-05 12:35:40 +00:00
5ea3d63ab972691f43e9087ab5fd8376d48e898f uuencode.c Makefile accident
upstream: include sshbuf-misc.c in SRCS_BASE OpenBSD-Commit-ID: 99dd10e72c04e93849981d43d64c946619efa474
2019-08-16 06:35:27 +00:00
99dd10e72c04e93849981d43d64c946619efa474 include sshbuf-misc.c
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-22 21:47:27 +00:00
9e1c23476bb845f3cf3d15d9032da3ed0cb2fcf5 sshbuf-misc.c in regress
upstream: avoid compiling certain files that deeply depend on libcrypto when WITH_OPENSSL isn't set OpenBSD-Commit-ID: 569f08445c27124ec7c7f6c0268d844ec56ac061
2019-09-06 05:59:41 +00:00
569f08445c27124ec7c7f6c0268d844ec56ac061 Makefile tweaks for !openssl
upstream: Import regenerated moduli file. OpenBSD-Commit-ID: 58ec755be4e51978ecfee73539090eb68652a987
2019-10-22 07:06:35 +00:00
58ec755be4e51978ecfee73539090eb68652a987 moduli update
upstream: undo debugging bits that shouldn't have been committed OpenBSD-Commit-ID: 4bd5551b306df55379afe17d841207990eb773bf
2019-10-31 21:37:33 +00:00
4bd5551b306df55379afe17d841207990eb773bf Makefile.inc
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-11 19:53:37 +00:00
14806a59353152f843eb349e618abbf6f4dd3ada Makefile.inc
upstream: remove debugging goop that snuck in to last commit OpenBSD-Commit-ID: 8ea4455a2d9364a0a04f9e4a2cbfa4c9fcefe77e
2019-11-14 21:56:52 +00:00
8ea4455a2d9364a0a04f9e4a2cbfa4c9fcefe77e Makefile.inc
upstream: only clang understands those new -W options OpenBSD-Commit-ID: d9b910e412d139141b072a905e66714870c38ac0
2019-11-15 05:25:52 +00:00
d9b910e412d139141b072a905e66714870c38ac0 Makefile.inc
upstream: Import regenerated moduli. OpenBSD-Commit-ID: 7b7b619c1452a459310b0cf4391c5757c6bdbc0f
2020-02-20 05:41:51 +00:00
7b7b619c1452a459310b0cf4391c5757c6bdbc0f moduli update
upstream: Update moduli generation script to new ssh-keygen generation and screening command line flags. OpenBSD-Commit-ID: 5010ff08f7ad92082e87dde098b20f5c24921a8f
2020-02-20 05:58:08 +00:00
5010ff08f7ad92082e87dde098b20f5c24921a8f moduli regen script update
upstream: Drop leading space from line count that was confusing ssh-keygen's screen mode. OpenBSD-Commit-ID: 3bcae7a754db3fc5ad3cab63dd46774edb35b8ae
2020-02-27 02:32:37 +00:00
3bcae7a754db3fc5ad3cab63dd46774edb35b8ae moduli regen script update
upstream: Import regenerated moduli file. OpenBSD-Commit-ID: 52ff0e3205036147b2499889353ac082e505ea54
2020-06-03 08:23:18 +00:00
52ff0e3205036147b2499889353ac082e505ea54 moduli update
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 02:42:49 +00:00
07b5031e9f49f2b69ac5e85b8da4fc9e393992a0 Makefile.inc
upstream: Add a comment documenting the source of the moduli group sizes. OpenBSD-Commit-ID: aec0725ce607630caaa62682624c6763b350391c
2020-11-08 12:10:20 +00:00
cc12a9029833d222043aecd252d654965c351a69 moduli-gen Makefile
upstream: Import regenerated moduli file. OpenBSD-Commit-ID: 7ac6c252d2a5be8fbad4c66d9d35db507c9dac5b
2021-03-10 06:32:27 +00:00
7ac6c252d2a5be8fbad4c66d9d35db507c9dac5b moduli update
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-19 22:11:06 +00:00
6b52cd2b637f3d29ef543f0ce532a2bce6d86af5 makefile change
upstream: Import regenerated moduli OpenBSD-Commit-ID: f9a0726d957cf10692a231996a1f34e7f9cdfeb0
2022-04-20 01:13:47 +00:00
f9a0726d957cf10692a231996a1f34e7f9cdfeb0 moduli update
upstream: Create and install sshd random relink kit. ../Makefile.inc and Makfile are concatenated for reuse, which hopefully won't be too fragile, we'll see if we need a different approach. The resulting sshd binary is tested with the new sshd -V option before installation. As the binary layout is now semi-unknown (meaning relative, fixed, and gadget offsets are not precisely known), change the filesystem permissions to 511 to prevent what I call "logged in BROP". I have ideas for improving this further but this is a first step ok djm OpenBSD-Commit-ID: 1e0a2692b7e20b126dda60bf04999d1d30d959d8
2023-01-18 20:43:15 +00:00
1e0a2692b7e20b126dda60bf04999d1d30d959d8 sshd relinking makefile changes
upstream: delete useless dependency OpenBSD-Commit-ID: e1dc11143f83082e3154d6094f9136d0dc2637ad
2023-01-18 20:56:36 +00:00
e1dc11143f83082e3154d6094f9136d0dc2637ad more relinking makefile tweaks
upstream: Import regenerated moduli. OpenBSD-Commit-ID: 5a636f6ca7f25bfe775df4952f7aac90a7fcbbee
2024-01-04 09:51:49 +00:00
5a636f6ca7f25bfe775df4952f7aac90a7fcbbee moduli update
upstream: new-style relink kit for sshd. The old scheme created a Makefile by concatenating two Makefiles and was incredibly fragile. In the new way a narrow-purposed install.sh script is created and shipped with the objects. A recently commited /etc/rc script understands these files. OpenBSD-Commit-ID: ef9341d5a50f0d33e3a6fbe995e92964bc7ef2d3
2024-04-01 15:48:16 +00:00
ef9341d5a50f0d33e3a6fbe995e92964bc7ef2d3 Makefile relinking changes
upstream: also create a relink kit for ssh-agent, since it is a long-running setgid program carrying keys with some (not very powerful) communication channels. solution for testing the binary from dtucker. agreement from djm. Will add it into /etc/rc in a few days. OpenBSD-Commit-ID: 2fe8d707ae35ba23c7916adcb818bb5b66837ba0
2024-04-01 15:50:17 +00:00
2fe8d707ae35ba23c7916adcb818bb5b66837ba0 ssh-agent relink kit
upstream: set right mode on ssh-agent at boot-time which sthen@ ok deraadt@ OpenBSD-Commit-ID: 662b5056a2c6171563e1626f9c69f27862b5e7af
2024-04-04 16:00:51 +00:00
866cfcc1955aef8f3fc32da0b70c353a1b859f2e ssh-agent relink changes
upstream: construct and install a relink-kit for sshd-session ok djm OpenBSD-Commit-ID: 8b3820adb4da4e139c4b3cffbcc0bde9f08bf0c6
2024-05-17 00:33:25 +00:00
8b3820adb4da4e139c4b3cffbcc0bde9f08bf0c6 sshd-session relink kit
upstream: remove duplicate copy of relink kit for sshd-session OpenBSD-Commit-ID: 6d2ded4cd91d4d727c2b26e099b91ea935bed504
2024-05-17 14:42:00 +00:00
6d2ded4cd91d4d727c2b26e099b91ea935bed504 relink kit
upstream: Do not pass -Werror if building with gcc 3, for asn1.h and bio.h cause (admittedly bogus) warnings with gcc 3. OpenBSD-Commit-ID: fb39324748824cb0387e9d67c41d1bef945c54ea
2024-05-22 11:49:36 +00:00
fb39324748824cb0387e9d67c41d1bef945c54ea Makefile change
upstream: Do not pass -Werror twice when building with clang. OpenBSD-Commit-ID: 5f378c38ad8976d507786dc4db9283a879ec8cd0
2024-05-22 15:24:55 +00:00
5f378c38ad8976d507786dc4db9283a879ec8cd0 Makefile change
upstream: enable -fret-clean on amd64, for libc libcrypto ld.so kernel, and all the ssh tools. The dynamic objects are entirely ret-clean, static binaries will contain a blend of cleaning and non-cleaning callers. OpenBSD-Commit-ID: 112aacedd3b61cc5c34b1fa6d9fb759214179172
2024-06-04 15:14:45 +00:00
112aacedd3b61cc5c34b1fa6d9fb759214179172 Makefile change
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-30 13:46:29 +00:00
Old upstream tree:
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 03:55:12 +00:00
321065a95a7ccebdd5fd08482a1e19afbf524e35 Update DH groups
d4f699a421504df35254cf1c6f1a7c304fb907ca Remove 1k bit groups
aafe246655b53b52bc32c8a24002bc262f4230f7 Remove intermediate moduli
8fa9cd1dee3c3339ae329cf20fb591db6d605120 put back SSH1 for 6.9
f31327a48dd4103333cc53315ec53fe65ed8a17a Generate new moduli
edbfde98c40007b7752a4ac106095e060c25c1ef Regen moduli
052fd565e3ff2d8cec3bc957d1788f50c827f8e2 Switch to tame-based sandbox
7cf73737f357492776223da1c09179fa6ba74660 Remove moduli <2k
180d84674be1344e45a63990d60349988187c1ae Update moduli
f6ae971186ba68d066cd102e57d5b0b2c211a5ee systrace is dead.
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-04 18:01:44 +00:00
96c5054e3e1f170c6276902d5bc65bb3b87a2603 remove DEBUGLIBS from Makefile
upstream commit Update moduli file. Upstream-ID: 6da9a37f74aef9f9cc639004345ad893cad582d8
2016-08-11 01:42:11 +00:00
6da9a37f74aef9f9cc639004345ad893cad582d8 Update moduli file
upstream commit In ssh tests set REGRESS_FAIL_EARLY with ?= so that the environment can change it. OK djm@ Upstream-Regress-ID: 77bcb50e47b68c7209c7f0a5a020d73761e5143b
2016-09-30 11:55:20 +00:00
77bcb50e47b68c7209c7f0a5a020d73761e5143b unset REGRESS_FAIL_EARLY
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-17 11:02:31 +00:00
38c2133817cbcae75c88c63599ac54228f0fa384 Change COMPILER_VERSION tests
Add 2 regress commits I applied by hand. Upstream-Regress-ID: 30c20180c87cbc99fa1020489fe7fd8245b6420c Upstream-Regress-ID: 1e6b51ddf767cbad0a4e63eb08026c127e654308
2017-04-28 04:41:17 +00:00
30c20180c87cbc99fa1020489fe7fd8245b6420c resync integrity.sh shell
Typo. Upstream-Regress-ID: 1e6b51ddf767cbad0a4e63eb08026c127e654308
2017-04-28 04:44:28 +00:00
1e6b51ddf767cbad0a4e63eb08026c127e654308 integrity.sh reliability
upstream commit undo some local debugging stuff that I committed by accident Upstream-ID: fe5b31f69a60d47171836911f144acff77810217
2017-04-30 23:25:03 +00:00
fe5b31f69a60d47171836911f144acff77810217 Makefile.inc bits
upstream commit this one I did forget to "cvs rm" Upstream-ID: 5781670c0578fe89663c9085ed3ba477cf7e7913
2017-05-01 14:08:26 +00:00
5781670c0578fe89663c9085ed3ba477cf7e7913 Delete sshconnect1.c
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-02 06:06:10 +00:00
ea80f445e819719ccdcb237022cacfac990fdc5c Makefile.inc warning flags
upstream commit Run the screen twice so we end up with more candidate groups. ok djm@ Upstream-ID: b92c93266d8234d493857bb822260dacf4366157
2017-06-23 03:25:53 +00:00
b92c93266d8234d493857bb822260dacf4366157 moduli-gen.sh tweak
upstream commit Import regenerated moduli. Upstream-ID: b25bf747544265b39af74fe0716dc8d9f5b63b95
2017-06-23 03:30:42 +00:00
b25bf747544265b39af74fe0716dc8d9f5b63b95 Updated moduli
upstream commit actually remove these files Upstream-ID: 1bd41cba06a7752de4df304305a8153ebfb6b0ac
2017-07-01 22:55:44 +00:00
1bd41cba06a7752de4df304305a8153ebfb6b0ac rsa.[ch] already removed
upstream commit zap redundant Makefile variables. okay djm@ Upstream-ID: e39b3902fe1d6c4a7ba6a3c58e072219f3c1e604
2017-07-10 14:09:59 +00:00
e39b3902fe1d6c4a7ba6a3c58e072219f3c1e604 Makefile changes