tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ported v8.1 changes

This commit is contained in:
Manoj Ampalam 2019-11-01 12:20:04 -07:00
parent 66b040a11e
commit 754f7b4885
10 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
appveyor.yml
View File

@ -1,4 +1,4 @@
version: 8.0.0.0.{build} version: 8.1.0.0.{build}
image: Visual Studio 2015 image: Visual Studio 2015
branches: branches:

6
contrib/win32/openssh/config.h.vs
View File

@ -359,6 +359,12 @@
/* Define to 1 if you have the `EVP_sha256' function. */ /* Define to 1 if you have the `EVP_sha256' function. */
#define HAVE_EVP_SHA256 1 #define HAVE_EVP_SHA256 1
/* Define to 1 if you have the `EVP_sha384' function. */
#define HAVE_EVP_SHA384 1
/* Define to 1 if you have the `EVP_sha512' function. */
#define HAVE_EVP_SHA512 1
/* Define if you have ut_exit in utmp.h */ /* Define if you have ut_exit in utmp.h */
/* #undef HAVE_EXIT_IN_UTMP */ /* #undef HAVE_EXIT_IN_UTMP */

1
contrib/win32/openssh/keygen.vcxproj
View File

@ -375,6 +375,7 @@
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="$(OpenSSH-Src-Path)ssh-keygen.c" /> <ClCompile Include="$(OpenSSH-Src-Path)ssh-keygen.c" />
<ClCompile Include="$(OpenSSH-Src-Path)sshsig.c" />
<ClCompile Include="$(OpenSSH-Src-Path)contrib\win32\win32compat\wmain_common.c" /> <ClCompile Include="$(OpenSSH-Src-Path)contrib\win32\win32compat\wmain_common.c" />
<ClCompile Include="$(OpenSSH-Src-Path)contrib\win32\win32compat\win32-utf8.c" /> <ClCompile Include="$(OpenSSH-Src-Path)contrib\win32\win32compat\win32-utf8.c" />
</ItemGroup> </ItemGroup>

2
contrib/win32/openssh/libssh.vcxproj
View File

@ -359,7 +359,6 @@
<ClCompile Include="$(OpenSSH-Src-Path)cipher.c" /> <ClCompile Include="$(OpenSSH-Src-Path)cipher.c" />
<ClCompile Include="$(OpenSSH-Src-Path)cleanup.c" /> <ClCompile Include="$(OpenSSH-Src-Path)cleanup.c" />
<ClCompile Include="$(OpenSSH-Src-Path)compat.c" /> <ClCompile Include="$(OpenSSH-Src-Path)compat.c" />
<ClCompile Include="$(OpenSSH-Src-Path)crc32.c" />
<ClCompile Include="$(OpenSSH-Src-Path)dh.c"> <ClCompile Include="$(OpenSSH-Src-Path)dh.c">
<ExcludedFromBuild Condition="$(UseOpenSSL)==false">true</ExcludedFromBuild> <ExcludedFromBuild Condition="$(UseOpenSSL)==false">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
@ -429,7 +428,6 @@
<ClCompile Include="$(OpenSSH-Src-Path)sshkey.c" /> <ClCompile Include="$(OpenSSH-Src-Path)sshkey.c" />
<ClCompile Include="$(OpenSSH-Src-Path)ssh_api.c" /> <ClCompile Include="$(OpenSSH-Src-Path)ssh_api.c" />
<ClCompile Include="$(OpenSSH-Src-Path)umac.c" /> <ClCompile Include="$(OpenSSH-Src-Path)umac.c" />
<ClCompile Include="$(OpenSSH-Src-Path)uuencode.c" />
<ClCompile Include="$(OpenSSH-Src-Path)verify.c" /> <ClCompile Include="$(OpenSSH-Src-Path)verify.c" />
<ClCompile Include="$(OpenSSH-Src-Path)xmalloc.c" /> <ClCompile Include="$(OpenSSH-Src-Path)xmalloc.c" />
<ClCompile Include="$(OpenSSH-Src-Path)platform-misc.c" /> <ClCompile Include="$(OpenSSH-Src-Path)platform-misc.c" />

1
contrib/win32/openssh/openbsd_compat.vcxproj
View File

@ -71,6 +71,7 @@
<ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\kludge-fd_set.c" /> <ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\kludge-fd_set.c" />
<ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\libressl-api-compat.c" /> <ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\libressl-api-compat.c" />
<ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\md5.c" /> <ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\md5.c" />
<ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\memmem.c" />
<ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\mktemp.c" /> <ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\mktemp.c" />
<ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\openssl-compat.c" /> <ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\openssl-compat.c" />
<ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\port-irix.c" /> <ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\port-irix.c" />

1
contrib/win32/openssh/sftp-server.vcxproj
View File

@ -37,6 +37,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="$(OpenSSH-Src-Path)sftp-common.c" /> <ClCompile Include="$(OpenSSH-Src-Path)sftp-common.c" />
<ClCompile Include="$(OpenSSH-Src-Path)sftp-realpath.c" />
<ClCompile Include="$(OpenSSH-Src-Path)sftp-server-main.c" /> <ClCompile Include="$(OpenSSH-Src-Path)sftp-server-main.c" />
<ClCompile Include="$(OpenSSH-Src-Path)sftp-server.c" /> <ClCompile Include="$(OpenSSH-Src-Path)sftp-server.c" />
<ClCompile Include="$(OpenSSH-Src-Path)contrib\win32\win32compat\wmain_common.c" /> <ClCompile Include="$(OpenSSH-Src-Path)contrib\win32\win32compat\wmain_common.c" />

8
contrib/win32/openssh/version.rc
View File

@ -51,8 +51,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 8,0,0,0 FILEVERSION 8,1,0,0
PRODUCTVERSION 8,0,0,0 PRODUCTVERSION 8,1,0,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -67,9 +67,9 @@ BEGIN
BEGIN BEGIN
BLOCK "040904b0" BLOCK "040904b0"
BEGIN BEGIN
VALUE "FileVersion", "8.0.0.0" VALUE "FileVersion", "8.1.0.0"
VALUE "ProductName", "OpenSSH for Windows" VALUE "ProductName", "OpenSSH for Windows"
VALUE "ProductVersion", "OpenSSH_8.0p1 for Windows" VALUE "ProductVersion", "OpenSSH_8.1p1 for Windows"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

1
contrib/win32/win32compat/inc/stdlib.h
View File

@ -6,3 +6,4 @@ void freezero(void *, size_t);
int setenv(const char *name, const char *value, int rewrite); int setenv(const char *name, const char *value, int rewrite);
#define system w32_system #define system w32_system
int w32_system(const char *command); int w32_system(const char *command);
char* realpath(const char *pathname, char *resolved);

3
readconf.c
View File

@ -486,7 +486,7 @@ execute_in_shell(const char *cmd)
#ifdef WINDOWS #ifdef WINDOWS
return system(cmd); return system(cmd);
#endif #else
if ((shell = getenv("SHELL")) == NULL) if ((shell = getenv("SHELL")) == NULL)
shell = _PATH_BSHELL; shell = _PATH_BSHELL;
@ -543,6 +543,7 @@ execute_in_shell(const char *cmd)
} }
debug3("command returned status %d", WEXITSTATUS(status)); debug3("command returned status %d", WEXITSTATUS(status));
return WEXITSTATUS(status); return WEXITSTATUS(status);
#endif
} }
/* /*

1
sshkey.c
View File

@ -61,6 +61,7 @@
#ifdef WITH_XMSS #ifdef WITH_XMSS
#include "sshkey-xmss.h" #include "sshkey-xmss.h"
#include "xmss_fast.h" #include "xmss_fast.h"
#endif
#ifdef WINDOWS #ifdef WINDOWS
#include <lmcons.h> #include <lmcons.h>
#endif #endif