Commit Graph

8569 Commits

Author SHA1 Message Date
Manoj Ampalam 3508cdc624 Fixed Issue: Invalid ECDSA key length for valid key length (https://github.com/PowerShell/Win32-OpenSSH/issues/413)
https://github.com/PowerShell/Win32-OpenSSH/issues/413
2017-01-10 22:02:46 -08:00
Yanbing 654c18f960 SCP issue fix: backslashs in username (https://github.com/PowerShell/Win32-OpenSSH/issues/471) 2017-01-10 20:21:40 -08:00
Yanbing 6c049683d7 Cleaned up win32_log.c 2017-01-10 20:18:44 -08:00
Yanbing 6608961bb0 SCP issue fixes: setting the timestamp of directory and enable run_err to report error back to client (#42)
* SCP bug fixes
https://github.com/PowerShell/Win32-OpenSSH/issues/465
https://github.com/PowerShell/Win32-OpenSSH/issues/464

* remove one comment

* remove redundent code for mode update.

* update the mode setting when mkdir per the info from main page

* change to follow the BSD coding style

* change naming convention

* add static
2017-01-09 19:07:51 -08:00
Manoj Ampalam f122ab210a Merge branch 'latestw' into latestw_all 2017-01-06 23:15:00 -08:00
Manoj Ampalam 99dce690c3 Merge remote-tracking branch 'openssh/master' into latestw 2017-01-06 23:12:23 -08:00
Manoj Ampalam 9b8902443e Fix to https://github.com/PowerShell/Win32-OpenSSH/issues/421 (#43) 2017-01-06 23:00:27 -08:00
Yanbing cfd88df671 Fix the hanging issue when file already exists and -p is used. (#41) 2017-01-06 10:03:06 -08:00
bagajjal 144ece5347 SFTP fixes
1.Fixed df command that shows the disk space utilization.
2.Fixed the realpath to take care of edge cases where path size is less than 2.
3.Fixed the "dir " bug
4.Fixed the "dir e:\test" bug
5.Fixed the memory leak in wmain_sshd.c
2017-01-05 15:01:36 -08:00
djm@openbsd.org b108ce92aa upstream commit
relax PKCS#11 whitelist a bit to allow libexec as well as
lib directories.

Upstream-ID: cf5617958e2e2d39f8285fd3bc63b557da484702
2017-01-04 13:23:04 +11:00
djm@openbsd.org c7995f296b upstream commit
check number of entries in SSH2_FXP_NAME response; avoids
unreachable overflow later. Reported by Jann Horn

Upstream-ID: b6b2b434a6d6035b1644ca44f24cd8104057420f
2017-01-04 13:23:04 +11:00
Manoj Ampalam 743a94da26 cranked version (#40) 2017-01-03 14:14:52 -08:00
djm@openbsd.org ddd3d34e5c upstream commit
fix deadlock when keys/principals command produces a lot of
output and a key is matched early; bz#2655, patch from jboning AT gmail.com

Upstream-ID: e19456429bf99087ea994432c16d00a642060afe
2017-01-03 15:24:42 +11:00
Manoj Ampalam f207a12b78 Fixed openssl=no build issues (#38) 2016-12-27 13:47:09 -08:00
Yanbing 15a99f6142 Fixed Scp local copy
* scp fix

* revert the changes in SCP.Tests.ps1

* add deployment of sshd_config

* update the SCP tests

* revert the change to deploy the sshd_config
2016-12-22 15:21:42 -08:00
Manoj Ampalam d67c7e7c85 :Missed earlier fix to spawn_child 2016-12-21 21:39:43 -08:00
Manoj Ampalam 9333a08637 SCP Fixes (from Yanbing), realpath_win cleanup and spawn_child fix (that broke progfiles installation) 2016-12-21 21:17:14 -08:00
bagajjal c957488af2 removing private changes in sftp.c 2016-12-21 19:53:10 -08:00
bagajjal 0c98fdf059 Merge branch 'latestw_all' of https://github.com/PowerShell/openssh-portable into latestw_all 2016-12-21 19:51:34 -08:00
bagajjal 79e00ae7de realpath fix 2016-12-21 19:51:27 -08:00
Yanbing 5cdec2bc35 Enablebuildlatestw_all (#35)
Update build script to download OpenSSL libs from win32_openssh
2016-12-21 17:34:20 -08:00
Manoj Ampalam 0efb6c3bf2 Fix to SFTP issue failing to pass in the correct commandline 2016-12-21 14:16:21 -08:00
bagajjal 07a658c2b7 Making forwardslash/backslash converter methods available in posix layer 2016-12-21 11:51:37 -08:00
Manoj Ampalam 50ddd23474 Added credits to install-sshd.ps1 2016-12-20 13:50:02 -08:00
Manoj Ampalam 4adde42f61 Fix to SDDL issue in install-sshd.ps1 2016-12-20 10:16:50 -08:00
Darren Tucker 30eee7d1b2 Re-add missing "Prerequisites" header and fix typo
Patch from HARUYAMA Seigo <haruyama at unixuser org>.
2016-12-20 12:16:11 +11:00
Manoj Ampalam 36ba5d15bf Merge branch 'latestw' into latestw_all 2016-12-19 15:03:23 -08:00
Manoj Ampalam dbd2ab3587 Merge branch 'master' of https://github.com/openssh/openssh-portable into latestw 2016-12-19 15:02:12 -08:00
Manoj Ampalam 6aa5b815c2 To be cleaned sources from Win32 Fork 2016-12-19 14:48:14 -08:00
Manoj Ampalam 5ad8a2c358 Sources Merged from Win32 Fork 2016-12-19 14:46:28 -08:00
djm@openbsd.org c8c60f3663 upstream commit
use standard /bin/sh equality test; from Mike Frysinger

Upstream-Regress-ID: 7b6f0b63525f399844c8ac211003acb8e4b0bec2
2016-12-20 09:35:51 +11:00
Damien Miller 4a354fc231 crank version numbers for release 2016-12-19 15:59:41 +11:00
djm@openbsd.org 5f8d0bb841 upstream commit
openssh-7.4

Upstream-ID: 1ee404adba6bbe10ae9277cbae3a94abe2867b79
2016-12-19 15:59:40 +11:00
djm@openbsd.org 3a8213ea0e upstream commit
remove testcase that depends on exact output and
behaviour of snprintf(..., "%s", NULL)

Upstream-Regress-ID: cab4288531766bd9593cb556613b91a2eeefb56f
2016-12-19 15:59:40 +11:00
dtucker@openbsd.org eae735a82d upstream commit
Use LOGNAME to get current user and fall back to whoami if
not set. Mainly to benefit -portable since some platforms don't have whoami.

Upstream-Regress-ID: e3a16b7836a3ae24dc8f8a4e43fdf8127a60bdfa
2016-12-19 15:01:10 +11:00
dtucker@openbsd.org 0d2f884284 upstream commit
Add regression test for AllowUsers and DenyUsers.  Patch from
Zev Weiss <zev at bewilderbeest.net>

Upstream-Regress-ID: 8f1aac24d52728398871dac14ad26ea38b533fb9
2016-12-17 09:11:41 +11:00
Darren Tucker 3bc8180a00 Add missing monitor.h include.
Fixes warning pointed out by Zev Weiss <zev at bewilderbeest.net>
2016-12-16 15:02:24 +11:00
djm@openbsd.org 410681f901 upstream commit
revert to rev1.2; the new bits in this test depend on changes
to ssh that aren't yet committed

Upstream-Regress-ID: 828ffc2c7afcf65d50ff2cf3dfc47a073ad39123
2016-12-16 13:49:40 +11:00
dtucker@openbsd.org 2f2ffa4fbe upstream commit
Move the "stop sshd" code into its own helper function.
Patch from Zev Weiss <zev at bewilderbeest.net>, ok djm@

Upstream-Regress-ID: a113dea77df5bd97fb4633ea31f3d72dbe356329
2016-12-16 13:16:34 +11:00
djm@openbsd.org e15e715233 upstream commit
regression test for certificates along with private key
with no public half. bz#2617, mostly from Adam Eijdenberg

Upstream-Regress-ID: 2e74dc2c726f4dc839609b3ce045466b69f01115
2016-12-16 13:16:13 +11:00
dtucker@openbsd.org 9a70ec085f upstream commit
Use $SUDO to read pidfile in case root's umask is
restricted.  From portable.

Upstream-Regress-ID: f6b1c7ffbc5a0dfb7d430adb2883344899174a98
2016-12-16 13:16:13 +11:00
dtucker@openbsd.org fe06b68f82 upstream commit
Add missing braces in DenyUsers code.  Patch from zev at
bewilderbeest.net, ok deraadt@

Upstream-ID: d747ace338dcf943b077925f90f85f789714b54e
2016-12-16 13:12:18 +11:00
dtucker@openbsd.org dcc7d74242 upstream commit
Fix text in error message.  Patch from zev at
bewilderbeest.net.

Upstream-ID: deb0486e175e7282f98f9a15035d76c55c84f7f6
2016-12-16 13:12:18 +11:00
djm@openbsd.org b737e4d743 upstream commit
disable Unix-domain socket forwarding when privsep is
disabled

Upstream-ID: ab61516ae0faadad407857808517efa900a0d6d0
2016-12-14 11:51:52 +11:00
djm@openbsd.org 08a1e7014d upstream commit
log connections dropped in excess of MaxStartups at
verbose LogLevel; bz#2613 based on diff from Tomas Kuthan; ok dtucker@

Upstream-ID: 703ae690dbf9b56620a6018f8a3b2389ce76d92b
2016-12-14 11:51:52 +11:00
Darren Tucker 10e290ec00 Get default of TEST_SSH_UTF8 from environment. 2016-12-13 13:51:32 +11:00
Darren Tucker b9b8ba3f9e Remove commented-out includes.
These commented-out includes have "Still needed?" comments.  Since
they've been commented out for ~13 years I assert that they're not.
2016-12-13 12:56:40 +11:00
Darren Tucker 25275f1c9d Add prototype for strcasestr in compat library. 2016-12-13 12:54:23 +11:00
Darren Tucker afec07732a Add strcasestr to compat library.
Fixes build on (at least) Solaris 10.
2016-12-13 10:23:03 +11:00
Damien Miller dda78a03af Force Turkish locales back to C/POSIX; bz#2643
Turkish locales are unique in their handling of the letters 'i' and
'I' (yes, they are different letters) and OpenSSH isn't remotely
prepared to deal with that. For now, the best we can do is to force
OpenSSH to use the C/POSIX locale and try to preserve the UTF-8
encoding if possible.

ok dtucker@
2016-12-12 13:58:59 +11:00