Commit Graph

961 Commits

Author SHA1 Message Date
Tess Gauthier d5d6a52338 fix win32 sshd and sshd-session 2024-08-02 14:21:01 -04:00
Tess Gauthier 7906ad4cda continue merge - not compiling 2024-08-02 14:20:51 -04:00
Tess Gauthier 0d44bc9b49 fix merge conflict 2024-03-11 11:46:39 -04:00
Damien Miller 282721418e
crank RPM spec versions 2024-03-11 16:20:08 +11:00
tgauth@bu.edu 9015aa2eca add WITH_DSA flag to compilation options 2024-01-22 14:16:56 -05:00
Tess Gauthier aeb3bbe81d resolve merge conflict 2023-12-19 20:33:17 -05:00
Tess Gauthier 59aba65cf2
add double-quotes around service paths for SSHD and SSH-Agent (#710) 2023-12-18 12:04:57 -05:00
Damien Miller 8241b9c052
crank versions 2023-12-19 01:59:50 +11:00
Tess Gauthier c1e15ab968
Crank versions (#707)
* bump-dependency-versions

* Update version.rc
2023-12-12 11:11:35 -05:00
Tess Gauthier 2745347ae0
Merge pull request #703 from tgauth/merge-9.5
Merge 9.5
2023-12-07 14:41:39 -05:00
Tess Gauthier 4cd3519fbf
Add telemetry event (#702)
* test sending new event from sshd after kex exchange

* rename telemetry event for clarity

* add comments

* remove else since if block has fatal call

* rename method for additional clarity
2023-12-07 14:35:34 -05:00
tgauth@bu.edu e6fa11e07e openssh-9.5p1
-----BEGIN SSH SIGNATURE-----
 U1NIU0lHAAAAAQAAAH8AAAAic2stZWNkc2Etc2hhMi1uaXN0cDI1NkBvcGVuc3NoLmNvbQ
 AAAAhuaXN0cDI1NgAAAEEEucmjdlUMQ1hkZebm472VTtvSIMWrmAelO7Uxoc9ZMR892/D4
 CMVBD+rliLO4wmRcawx1iZuUkQllgemb0hLtmQAAAARzc2g6AAAAA2dpdAAAAAAAAAAGc2
 hhNTEyAAAAeAAAACJzay1lY2RzYS1zaGEyLW5pc3RwMjU2QG9wZW5zc2guY29tAAAASQAA
 ACEA7WcEKKcqxpjfRRhVOznHOSsf6SlAWbpkBYA01cN3nl0AAAAgIlhw5EaLbGdhj9DaVi
 Mtgw72SsEKJdOA52IQKECVmAQAAAAEDw==
 -----END SSH SIGNATURE-----

resolve merge conflicts; scp and sftp fail to compile
2023-10-30 17:06:35 -04:00
Tess Gauthier cb23f0d9c0
revert enabling sdl check compiler option for debug builds (#700) 2023-10-16 09:57:03 -04:00
Fabio Pedretti c2003d0dbd
Update openssl-devel dependency in RPM spec.
Since openssh 9.4p1, openssl >= 1.1.1 is required, so
build with --without-openssl elsewhere.
According to https://repology.org/project/openssl/versions
openssl 1.1.1 is available on fedora >= 29 and rhel >= 8.
Successfully build tested, installed and run on rhel 6
2023-10-16 21:40:01 +11:00
Fabio Pedretti 064e09cd63
Remove reference of dropped sshd.pam.old file
The file was removed in openssh 8.8
2023-10-16 20:14:04 +11:00
Tess Gauthier f72324ffa1
disable adding pkcs11 providers to ssh-agent remotely unless overridden by cli arg (#699) 2023-10-11 16:39:05 -04:00
Tess Gauthier effdb65e40
Enable sdl check (#695)
* enable sdl checks during compilation

* fix sdl errors in Windows code

* fix sdl errors in common code without ifdefs, for now
2023-10-04 13:11:53 -04:00
Tess Gauthier 39bf3d4fce
Enable /CETCOMPAT in x86, x64 Linker Additional Options (#696)
* enable spectre mitigation in vcxproj

* add linker compat option and sdl compile checks where applicable

* add linker switch to x64 and x86 arch
2023-10-04 12:59:38 -04:00
Damien Miller 80a2f64b8c
crank version numbers 2023-10-04 15:34:10 +11:00
Tess Gauthier 4e5f11a82c
enable spectre mitigation in vcxproj (#694) 2023-10-02 15:16:33 -04:00
Tess Gauthier 96f8702f79
Crank versions (#693)
* Update version.rc

* Update libressl version in paths.targets
2023-09-28 16:39:39 -04:00
Sam Hocevar 1ab66dd3d4
Fix unreasonably small DefaultShellCommandOption size limit (#683) 2023-09-28 14:34:08 -04:00
Tess Gauthier 24449c64b7
Merge pull request #684 from tgauth/merge-9.4
Merge 9.4
2023-09-27 15:33:29 -04:00
Tess Gauthier f87f0c57a2
add check for program data folder permissions during sshd service startup (#686) 2023-09-05 12:59:28 -04:00
tgauth@bu.edu 7023264b09 Merge branch 'latestw_all' into merge-9.4 2023-08-31 14:22:13 -04:00
Tess Gauthier 3645eaa30e
Build tools version updates (#677)
* bump platform toolset to v143

* add updated proj files for testing

* add _CRT_DECLARE_NONSTDC_NAMES=0 to projects with posix functions

* revert onecore changes

* fix typo

* use latest sdk in build script

* update build toolset in config proj

* update build script to use latest toolsets

* update paths.targets

* update to win11 sdk in paths.targets

* make build script more robust with VSwhere

* change validity check from count check to null-check

* remove static keyword from auth_debug declaration

* change to ifndef for diff checking

* update string compare

* change msbuild tool search from manual check instead of using vswhere

* update wixproj to work with wix install on new build image

* update 2022 build image and zlib version
2023-08-31 14:19:37 -04:00
tgauth@bu.edu c769798653 remove dependencies files used for testing 2023-08-31 13:00:59 -04:00
Tess Gauthier a6229b9e7b fix hostkey tests 2023-08-28 14:51:40 -04:00
Tess Gauthier 22615453ef temp add x86 zlib built with vs 2022 for CI test 2023-08-23 15:17:17 -04:00
Tess Gauthier 4d42e70320 temporarily add zlib built with vs2022 build tools for CI 2023-08-23 14:53:01 -04:00
Tess Gauthier 6c59360e66 temporarily add dependencies built with VS2022 build tools for CI 2023-08-23 14:12:09 -04:00
Tess Gauthier 0db6f3e486 resolve merge conflicts 2023-08-21 16:35:13 -04:00
Tess Gauthier ad45b5c9a1
fix func declaration (#682) 2023-08-18 13:31:56 -04:00
Damien Miller 0fcb60bf83
update versions in RPM specs 2023-08-10 20:17:06 +10:00
Damien Miller 41bfb63f51
update versions in RPM specs 2023-08-10 11:05:42 +10:00
Philip Hands 2709809fd6
fixup! if -s & -p specified, mention 'sftp -P' on
success

SSH-Copy-ID-Upstream: 32686e7c65b4fa2846e474d3315102dfa0f043b0
2023-05-25 18:24:58 +10:00
Darren Tucker 204e0bf051
Make ssh-copy-id(1) consistent with OpenSSH.
This makes the ssh-copy-id man page more consistent with the rest of the
OpenSSH man pages:
- new sentence, new line
- no sentences >80
- N.B. -> NB
- zap unused .Pp
- zap trailing whitespace

Report from Debian via mindrot bz#3331, diff from jmc at openbsd.org.

SSH-Copy-ID-Upstream: d8974cfb6242316460ed22a1ccc662800a50c5d3
2023-05-25 18:24:55 +10:00
Philip Hands 9de79df66d
if -s & -p specified, mention 'sftp -P' on success
This was inspired by this:
 https://github.com/openssh/openssh-portable/pull/321
but I thought that it was better to not do the sed patching.

BTW the reason one can get away with using $SSH_OPTS throughout, despite
the lowercase -p in there, even if sftp is in use, is that the sftp call
is using the already-established ssh master connection, so the port was
passed to the earlier ssh.

SSH-Copy-ID-Upstream: 1c124d9bfafdbe28a00b683367ebf5750ce12eb2
2023-05-25 18:24:53 +10:00
Philip Hands 801cda54c0
drop whitespace
SSH-Copy-ID-Upstream: e604fae1cdee35c18055d35dcec530cf12ef00ad
2023-05-25 18:24:50 +10:00
Philip Hands 288482f536
make -x also apply to the target script
SSH-Copy-ID-Upstream: 3c4214704f427bd0654adf9b0fc079253db21cf4
2023-05-25 18:24:47 +10:00
Philip Hands b79e7b88ed
add -t option to specify the target path
Allow the default target path (.ssh/authorized_files) to be over-riden

This was inspired by this MR from Panagiotis Cheilaris <philaris@cs.ntua.gr>

 https://gitlab.com/phil_hands/ssh-copy-id/-/merge_requests/8

SSH-Copy-ID-Upstream: a942a0e076874adb6d8b2f0fb76d6c7918190fcd
2023-05-25 18:24:45 +10:00
Carlos Rodríguez Gili 914f4ad138
Fix test error for /bin/sh on Solaris 10 and older
On Solaris 10 and older targets /bin/sh is not POSIX-compliant.
Test -z `...` fails with error 'sh: test: argument expected'.
Using quotes around backticks fixes this and doesn't break
POSIX compatibility.

SSH-Copy-ID-Upstream: 98394072a3f985b2650c1e8eab2fef84e38cc065
2023-05-25 18:24:42 +10:00
Jakub Jelen bd382dca31
Remove outdated comment
The commit b068122 removed the code dropping the trailing colon, but the comment stayed leaving the code confusing for future readers

SSH-Copy-ID-Upstream: 930d39f238117cd53810240ec989d0356aa1c1f6
2023-05-25 18:24:39 +10:00
Darren Tucker bdcaf79390
Special case OpenWrt instead of Dropbear.
OpenWrt overrides the location of authorized_keys for root.  Currently we
assume that all Dropbear installations behave this way, which is not the
case.  Check for OpenWrt and root user before using that location instead
of assuming that for all Dropbear servers.  Prompted by Github PR#250.

SSH-Copy-ID-Upstream: 0e1f5d443a9967483c33945793107ae3f3e4af2d
2023-05-25 18:24:37 +10:00
Philip Hands cf84498f67
ssh-copy-id: add -x option (for debugging)
This option causes the ssh-copy-id to run with set -x

SSH-Copy-ID-Upstream: a0ee367ea8c0a29c8b4515245e408d2d349e7844
2023-05-25 18:24:32 +10:00
Philip Hands b4a1efdcb8
update copyright notices
SSH-Copy-ID-Upstream: c284ed33b361814ea48ff68cbd01ca525b2bf117
2023-05-25 18:24:25 +10:00
Tess Gauthier ce2fd04c3b update wixproj to work with wix install on new build image 2023-05-12 14:09:30 -04:00
Tess Gauthier 3687fcd2f2 change msbuild tool search from manual check instead of using vswhere 2023-05-11 17:22:19 -04:00
Tess Gauthier 2812433868 update string compare 2023-05-10 10:06:11 -04:00
Tess Gauthier 6d4b212261 merge latestw_all 2023-05-09 15:25:26 -04:00