diff --git a/contrib/win32/openssh/config.h.vs b/contrib/win32/openssh/config.h.vs index 91ad3369e..9a883aac4 100644 --- a/contrib/win32/openssh/config.h.vs +++ b/contrib/win32/openssh/config.h.vs @@ -1679,7 +1679,7 @@ #endif #define HAVE_BZERO 1 -#define PATH_MAX MAX_PATH +#define PATH_MAX 32768 #define S_IFIFO 0x1000 #define HAVE_EXPLICIT_BZERO #define HAVE_MBTOWC 1 diff --git a/contrib/win32/openssh/keygen.vcxproj b/contrib/win32/openssh/keygen.vcxproj index 715f91e33..c3eae8414 100644 --- a/contrib/win32/openssh/keygen.vcxproj +++ b/contrib/win32/openssh/keygen.vcxproj @@ -195,6 +195,9 @@ wmainCRTStartup /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) + + targetos.manifest + @@ -218,6 +221,9 @@ wmainCRTStartup /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) + + targetos.manifest + @@ -264,6 +270,9 @@ wmainCRTStartup /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) + + targetos.manifest + @@ -291,6 +300,9 @@ true /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) + + targetos.manifest + @@ -318,6 +330,9 @@ true /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) + + targetos.manifest + @@ -372,6 +387,9 @@ true /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) + + targetos.manifest + diff --git a/contrib/win32/openssh/scp.vcxproj b/contrib/win32/openssh/scp.vcxproj index 01dea9a0a..4855c7b1d 100644 --- a/contrib/win32/openssh/scp.vcxproj +++ b/contrib/win32/openssh/scp.vcxproj @@ -1,387 +1,405 @@ - - - - - - Debug - ARM - - - Debug - ARM64 - - - Debug - Win32 - - - Release - ARM - - - Release - ARM64 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - - - - - - - - - {29B98ADF-1285-49CE-BF6C-AA92C5D2FB24} - Win32Proj - keygen - $(WindowsSDKVersion) - scp - - - - Application - true - v140 - MultiByte - - - Application - false - v140 - true - MultiByte - - - Application - true - v140 - MultiByte - - - Application - true - v141 - MultiByte - - - Application - true - v141 - MultiByte - - - Application - false - v140 - true - MultiByte - - - Application - false - v141 - true - MultiByte - - - Application - false - v141 - true - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - $(OpenSSH-Bin-Path)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\$(TargetName)\ - $(OpenSSH-Src-Path)contrib\win32\win32compat\inc;$(VC_IncludePath);$(WindowsSDK_IncludePath); - - - true - $(OpenSSH-Bin-Path)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\$(TargetName)\ - $(OpenSSH-Src-Path)contrib\win32\win32compat\inc;$(VC_IncludePath);$(WindowsSDK_IncludePath); - - - true - $(OpenSSH-Bin-Path)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\$(TargetName)\ - $(OpenSSH-Src-Path)contrib\win32\win32compat\inc;$(VC_IncludePath);$(WindowsSDK_IncludePath); - - - true - $(OpenSSH-Bin-Path)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\$(TargetName)\ - $(OpenSSH-Src-Path)contrib\win32\win32compat\inc;$(VC_IncludePath);$(WindowsSDK_IncludePath); - - - false - $(OpenSSH-Bin-Path)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\$(TargetName)\ - $(OpenSSH-Src-Path)contrib\win32\win32compat\inc;$(VC_IncludePath);$(WindowsSDK_IncludePath); - - - false - $(OpenSSH-Bin-Path)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\$(TargetName)\ - $(OpenSSH-Src-Path)contrib\win32\win32compat\inc;$(VC_IncludePath);$(WindowsSDK_IncludePath); - - - false - $(OpenSSH-Bin-Path)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\$(TargetName)\ - $(OpenSSH-Src-Path)contrib\win32\win32compat\inc;$(VC_IncludePath);$(WindowsSDK_IncludePath); - - - false - $(OpenSSH-Bin-Path)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\$(TargetName)\ - $(OpenSSH-Src-Path)contrib\win32\win32compat\inc;$(VC_IncludePath);$(WindowsSDK_IncludePath); - - - - - - Level1 - Disabled - _WIN32_WINNT=0x501;WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) - false - $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) - MultiThreadedDebug - Guard - ProgramDatabase - /Gy %(AdditionalOptions) - - - Console - true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) - $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-x86-Path);%(AdditionalLibraryDirectories) - wmainCRTStartup - /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) - - - - - - - Level1 - Disabled - _WIN32_WINNT=0x501;WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) - false - $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) - MultiThreadedDebug - Guard - ProgramDatabase - /Gy %(AdditionalOptions) - - - Console - true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) - $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-x64-Path);%(AdditionalLibraryDirectories) - wmainCRTStartup - /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) - - - - - - - Level1 - Disabled - _WIN32_WINNT=0x501;WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) - false - $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) - MultiThreadedDebug - Guard - ProgramDatabase - /Gy %(AdditionalOptions) - - - Console - true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) - $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-arm64-Path);%(AdditionalLibraryDirectories) - wmainCRTStartup - /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) - - - - - - - Level1 - Disabled - _WIN32_WINNT=0x501;WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) - false - $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) - MultiThreadedDebug - Guard - ProgramDatabase - /Gy %(AdditionalOptions) - - - Console - true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) - $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-arm-Path);%(AdditionalLibraryDirectories) - wmainCRTStartup - /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) - - - - - Level1 - - - MaxSpeed - true - true - _WIN32_WINNT=0x501;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - false - $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) - MultiThreaded - Guard - /Gy %(AdditionalOptions) - - - Console - true - true - true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) - $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-x86-Path);%(AdditionalLibraryDirectories) - wmainCRTStartup - true - /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) - - - - - Level1 - - - MaxSpeed - true - true - _WIN32_WINNT=0x501;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - false - $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) - MultiThreaded - Guard - /Gy %(AdditionalOptions) - - - Console - true - true - true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) - $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-x64-Path);%(AdditionalLibraryDirectories) - wmainCRTStartup - true - /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) - - - - - Level1 - - - MaxSpeed - true - true - _WIN32_WINNT=0x501;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - false - $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) - MultiThreaded - Guard - /Gy %(AdditionalOptions) - - - Console - true - true - true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) - $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-arm64-Path);%(AdditionalLibraryDirectories) - wmainCRTStartup - true - /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) - - - - - Level1 - - - MaxSpeed - true - true - _WIN32_WINNT=0x501;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - false - $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) - MultiThreaded - Guard - /Gy %(AdditionalOptions) - - - Console - true - true - true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) - $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-arm-Path);%(AdditionalLibraryDirectories) - wmainCRTStartup - true - /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) - - - - - - + + + + + + Debug + ARM + + + Debug + ARM64 + + + Debug + Win32 + + + Release + ARM + + + Release + ARM64 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + + + + + + + + + {29B98ADF-1285-49CE-BF6C-AA92C5D2FB24} + Win32Proj + keygen + $(WindowsSDKVersion) + scp + + + + Application + true + v140 + MultiByte + + + Application + false + v140 + true + MultiByte + + + Application + true + v140 + MultiByte + + + Application + true + v141 + MultiByte + + + Application + true + v141 + MultiByte + + + Application + false + v140 + true + MultiByte + + + Application + false + v141 + true + MultiByte + + + Application + false + v141 + true + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + $(OpenSSH-Bin-Path)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\$(TargetName)\ + $(OpenSSH-Src-Path)contrib\win32\win32compat\inc;$(VC_IncludePath);$(WindowsSDK_IncludePath); + + + true + $(OpenSSH-Bin-Path)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\$(TargetName)\ + $(OpenSSH-Src-Path)contrib\win32\win32compat\inc;$(VC_IncludePath);$(WindowsSDK_IncludePath); + + + true + $(OpenSSH-Bin-Path)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\$(TargetName)\ + $(OpenSSH-Src-Path)contrib\win32\win32compat\inc;$(VC_IncludePath);$(WindowsSDK_IncludePath); + + + true + $(OpenSSH-Bin-Path)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\$(TargetName)\ + $(OpenSSH-Src-Path)contrib\win32\win32compat\inc;$(VC_IncludePath);$(WindowsSDK_IncludePath); + + + false + $(OpenSSH-Bin-Path)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\$(TargetName)\ + $(OpenSSH-Src-Path)contrib\win32\win32compat\inc;$(VC_IncludePath);$(WindowsSDK_IncludePath); + + + false + $(OpenSSH-Bin-Path)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\$(TargetName)\ + $(OpenSSH-Src-Path)contrib\win32\win32compat\inc;$(VC_IncludePath);$(WindowsSDK_IncludePath); + + + false + $(OpenSSH-Bin-Path)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\$(TargetName)\ + $(OpenSSH-Src-Path)contrib\win32\win32compat\inc;$(VC_IncludePath);$(WindowsSDK_IncludePath); + + + false + $(OpenSSH-Bin-Path)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\$(TargetName)\ + $(OpenSSH-Src-Path)contrib\win32\win32compat\inc;$(VC_IncludePath);$(WindowsSDK_IncludePath); + + + + + + Level1 + Disabled + _WIN32_WINNT=0x501;WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) + false + $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) + MultiThreadedDebug + Guard + ProgramDatabase + /Gy %(AdditionalOptions) + + + Console + true + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-x86-Path);%(AdditionalLibraryDirectories) + wmainCRTStartup + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) + + + targetos.manifest + + + + + + + Level1 + Disabled + _WIN32_WINNT=0x501;WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) + false + $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) + MultiThreadedDebug + Guard + ProgramDatabase + /Gy %(AdditionalOptions) + + + Console + true + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-x64-Path);%(AdditionalLibraryDirectories) + wmainCRTStartup + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) + + + targetos.manifest + + + + + + + Level1 + Disabled + _WIN32_WINNT=0x501;WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) + false + $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) + MultiThreadedDebug + Guard + ProgramDatabase + /Gy %(AdditionalOptions) + + + Console + true + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-arm64-Path);%(AdditionalLibraryDirectories) + wmainCRTStartup + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) + + + + + + + Level1 + Disabled + _WIN32_WINNT=0x501;WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) + false + $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) + MultiThreadedDebug + Guard + ProgramDatabase + /Gy %(AdditionalOptions) + + + Console + true + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-arm-Path);%(AdditionalLibraryDirectories) + wmainCRTStartup + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) + + + targetos.manifest + + + + + Level1 + + + MaxSpeed + true + true + _WIN32_WINNT=0x501;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + false + $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) + MultiThreaded + Guard + /Gy %(AdditionalOptions) + + + Console + true + true + true + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-x86-Path);%(AdditionalLibraryDirectories) + wmainCRTStartup + true + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) + + + targetos.manifest + + + + + Level1 + + + MaxSpeed + true + true + _WIN32_WINNT=0x501;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + false + $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) + MultiThreaded + Guard + /Gy %(AdditionalOptions) + + + Console + true + true + true + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-x64-Path);%(AdditionalLibraryDirectories) + wmainCRTStartup + true + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) + + + targetos.manifest + + + + + Level1 + + + MaxSpeed + true + true + _WIN32_WINNT=0x501;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + false + $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) + MultiThreaded + Guard + /Gy %(AdditionalOptions) + + + Console + true + true + true + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-arm64-Path);%(AdditionalLibraryDirectories) + wmainCRTStartup + true + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) + + + + + Level1 + + + MaxSpeed + true + true + _WIN32_WINNT=0x501;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + false + $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) + MultiThreaded + Guard + /Gy %(AdditionalOptions) + + + Console + true + true + true + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-arm-Path);%(AdditionalLibraryDirectories) + wmainCRTStartup + true + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) + + + targetos.manifest + + + + + + \ No newline at end of file diff --git a/contrib/win32/openssh/sftp-server.vcxproj b/contrib/win32/openssh/sftp-server.vcxproj index 92bf06c9c..27c03c5a2 100644 --- a/contrib/win32/openssh/sftp-server.vcxproj +++ b/contrib/win32/openssh/sftp-server.vcxproj @@ -205,6 +205,9 @@ wmainCRTStartup /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) + + targetos.manifest + @@ -228,6 +231,9 @@ wmainCRTStartup /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) + + targetos.manifest + @@ -274,6 +280,9 @@ wmainCRTStartup /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) + + targetos.manifest + @@ -301,6 +310,9 @@ true /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) + + targetos.manifest + @@ -328,6 +340,9 @@ true /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) + + targetos.manifest + @@ -382,8 +397,11 @@ true /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) + + targetos.manifest + - + \ No newline at end of file diff --git a/contrib/win32/openssh/sftp.vcxproj b/contrib/win32/openssh/sftp.vcxproj index 1a7715fb3..2a85b24b8 100644 --- a/contrib/win32/openssh/sftp.vcxproj +++ b/contrib/win32/openssh/sftp.vcxproj @@ -1,391 +1,409 @@ - - - - - - Debug - ARM - - - Debug - ARM64 - - - Debug - Win32 - - - Release - ARM - - - Release - ARM64 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - - - - - - - - - - - - - {BBEFF9D7-0BC3-41D1-908B-8052158B5052} - Win32Proj - keygen - $(WindowsSDKVersion) - sftp - - - - Application - true - v140 - MultiByte - - - Application - false - v140 - true - MultiByte - - - Application - true - v140 - MultiByte - - - Application - true - v141 - MultiByte - - - Application - true - v141 - MultiByte - - - Application - false - v140 - true - MultiByte - - - Application - false - v141 - true - MultiByte - - - Application - false - v141 - true - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - $(OpenSSH-Bin-Path)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\$(TargetName)\ - $(OpenSSH-Src-Path)contrib\win32\win32compat\inc;$(VC_IncludePath);$(WindowsSDK_IncludePath); - - - true - $(OpenSSH-Bin-Path)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\$(TargetName)\ - $(OpenSSH-Src-Path)contrib\win32\win32compat\inc;$(VC_IncludePath);$(WindowsSDK_IncludePath); - - - true - $(OpenSSH-Bin-Path)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\$(TargetName)\ - $(OpenSSH-Src-Path)contrib\win32\win32compat\inc;$(VC_IncludePath);$(WindowsSDK_IncludePath); - - - true - $(OpenSSH-Bin-Path)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\$(TargetName)\ - $(OpenSSH-Src-Path)contrib\win32\win32compat\inc;$(VC_IncludePath);$(WindowsSDK_IncludePath); - - - false - $(OpenSSH-Bin-Path)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\$(TargetName)\ - $(OpenSSH-Src-Path)contrib\win32\win32compat\inc;$(VC_IncludePath);$(WindowsSDK_IncludePath); - - - false - $(OpenSSH-Bin-Path)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\$(TargetName)\ - $(OpenSSH-Src-Path)contrib\win32\win32compat\inc;$(VC_IncludePath);$(WindowsSDK_IncludePath); - - - false - $(OpenSSH-Bin-Path)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\$(TargetName)\ - $(OpenSSH-Src-Path)contrib\win32\win32compat\inc;$(VC_IncludePath);$(WindowsSDK_IncludePath); - - - false - $(OpenSSH-Bin-Path)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\$(TargetName)\ - $(OpenSSH-Src-Path)contrib\win32\win32compat\inc;$(VC_IncludePath);$(WindowsSDK_IncludePath); - - - - - - Level1 - Disabled - _WIN32_WINNT=0x600;WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) - false - $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) - MultiThreadedDebug - ProgramDatabase - Guard - /Gy %(AdditionalOptions) - - - Console - true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) - $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-x86-Path);%(AdditionalLibraryDirectories) - wmainCRTStartup - /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) - - - - - - - Level1 - Disabled - _WIN32_WINNT=0x600;WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) - false - $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) - MultiThreadedDebug - ProgramDatabase - Guard - /Gy %(AdditionalOptions) - - - Console - true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) - $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-x64-Path);%(AdditionalLibraryDirectories) - wmainCRTStartup - /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) - - - - - - - Level1 - Disabled - _WIN32_WINNT=0x600;WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) - false - $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) - MultiThreadedDebug - ProgramDatabase - Guard - /Gy %(AdditionalOptions) - - - Console - true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) - $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-arm64-Path);%(AdditionalLibraryDirectories) - wmainCRTStartup - /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) - - - - - - - Level1 - Disabled - _WIN32_WINNT=0x600;WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) - false - $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) - MultiThreadedDebug - ProgramDatabase - Guard - /Gy %(AdditionalOptions) - - - Console - true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) - $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-arm-Path);%(AdditionalLibraryDirectories) - wmainCRTStartup - /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) - - - - - Level1 - - - MaxSpeed - true - true - _WIN32_WINNT=0x600;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - false - $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) - MultiThreaded - Guard - /Gy %(AdditionalOptions) - - - Console - true - true - true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) - $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-x86-Path);%(AdditionalLibraryDirectories) - wmainCRTStartup - true - /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) - - - - - Level1 - - - MaxSpeed - true - true - _WIN32_WINNT=0x600;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - false - $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) - MultiThreaded - Guard - /Gy %(AdditionalOptions) - - - Console - true - true - true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) - $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-x64-Path);%(AdditionalLibraryDirectories) - wmainCRTStartup - true - /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) - - - - - Level1 - - - MaxSpeed - true - true - _WIN32_WINNT=0x600;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - false - $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) - MultiThreaded - Guard - /Gy %(AdditionalOptions) - - - Console - true - true - true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) - $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-arm64-Path);%(AdditionalLibraryDirectories) - wmainCRTStartup - true - /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) - - - - - Level1 - - - MaxSpeed - true - true - _WIN32_WINNT=0x600;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - false - $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) - MultiThreaded - Guard - /Gy %(AdditionalOptions) - - - Console - true - true - true - posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) - $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-arm-Path);%(AdditionalLibraryDirectories) - wmainCRTStartup - true - /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) - - - - - - + + + + + + Debug + ARM + + + Debug + ARM64 + + + Debug + Win32 + + + Release + ARM + + + Release + ARM64 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + + + + + + + + + + + + + {BBEFF9D7-0BC3-41D1-908B-8052158B5052} + Win32Proj + keygen + $(WindowsSDKVersion) + sftp + + + + Application + true + v140 + MultiByte + + + Application + false + v140 + true + MultiByte + + + Application + true + v140 + MultiByte + + + Application + true + v141 + MultiByte + + + Application + true + v141 + MultiByte + + + Application + false + v140 + true + MultiByte + + + Application + false + v141 + true + MultiByte + + + Application + false + v141 + true + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + $(OpenSSH-Bin-Path)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\$(TargetName)\ + $(OpenSSH-Src-Path)contrib\win32\win32compat\inc;$(VC_IncludePath);$(WindowsSDK_IncludePath); + + + true + $(OpenSSH-Bin-Path)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\$(TargetName)\ + $(OpenSSH-Src-Path)contrib\win32\win32compat\inc;$(VC_IncludePath);$(WindowsSDK_IncludePath); + + + true + $(OpenSSH-Bin-Path)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\$(TargetName)\ + $(OpenSSH-Src-Path)contrib\win32\win32compat\inc;$(VC_IncludePath);$(WindowsSDK_IncludePath); + + + true + $(OpenSSH-Bin-Path)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\$(TargetName)\ + $(OpenSSH-Src-Path)contrib\win32\win32compat\inc;$(VC_IncludePath);$(WindowsSDK_IncludePath); + + + false + $(OpenSSH-Bin-Path)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\$(TargetName)\ + $(OpenSSH-Src-Path)contrib\win32\win32compat\inc;$(VC_IncludePath);$(WindowsSDK_IncludePath); + + + false + $(OpenSSH-Bin-Path)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\$(TargetName)\ + $(OpenSSH-Src-Path)contrib\win32\win32compat\inc;$(VC_IncludePath);$(WindowsSDK_IncludePath); + + + false + $(OpenSSH-Bin-Path)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\$(TargetName)\ + $(OpenSSH-Src-Path)contrib\win32\win32compat\inc;$(VC_IncludePath);$(WindowsSDK_IncludePath); + + + false + $(OpenSSH-Bin-Path)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\$(TargetName)\ + $(OpenSSH-Src-Path)contrib\win32\win32compat\inc;$(VC_IncludePath);$(WindowsSDK_IncludePath); + + + + + + Level1 + Disabled + _WIN32_WINNT=0x600;WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) + false + $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) + MultiThreadedDebug + ProgramDatabase + Guard + /Gy %(AdditionalOptions) + + + Console + true + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-x86-Path);%(AdditionalLibraryDirectories) + wmainCRTStartup + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) + + + targetos.manifest + + + + + + + Level1 + Disabled + _WIN32_WINNT=0x600;WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) + false + $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) + MultiThreadedDebug + ProgramDatabase + Guard + /Gy %(AdditionalOptions) + + + Console + true + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-x64-Path);%(AdditionalLibraryDirectories) + wmainCRTStartup + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) + + + targetos.manifest + + + + + + + Level1 + Disabled + _WIN32_WINNT=0x600;WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) + false + $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) + MultiThreadedDebug + ProgramDatabase + Guard + /Gy %(AdditionalOptions) + + + Console + true + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-arm64-Path);%(AdditionalLibraryDirectories) + wmainCRTStartup + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) + + + + + + + Level1 + Disabled + _WIN32_WINNT=0x600;WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) + false + $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) + MultiThreadedDebug + ProgramDatabase + Guard + /Gy %(AdditionalOptions) + + + Console + true + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-arm-Path);%(AdditionalLibraryDirectories) + wmainCRTStartup + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) + + + targetos.manifest + + + + + Level1 + + + MaxSpeed + true + true + _WIN32_WINNT=0x600;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + false + $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) + MultiThreaded + Guard + /Gy %(AdditionalOptions) + + + Console + true + true + true + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-x86-Path);%(AdditionalLibraryDirectories) + wmainCRTStartup + true + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) + + + targetos.manifest + + + + + Level1 + + + MaxSpeed + true + true + _WIN32_WINNT=0x600;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + false + $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) + MultiThreaded + Guard + /Gy %(AdditionalOptions) + + + Console + true + true + true + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-x64-Path);%(AdditionalLibraryDirectories) + wmainCRTStartup + true + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) + + + targetos.manifest + + + + + Level1 + + + MaxSpeed + true + true + _WIN32_WINNT=0x600;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + false + $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) + MultiThreaded + Guard + /Gy %(AdditionalOptions) + + + Console + true + true + true + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-arm64-Path);%(AdditionalLibraryDirectories) + wmainCRTStartup + true + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) + + + + + Level1 + + + MaxSpeed + true + true + _WIN32_WINNT=0x600;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + false + $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) + MultiThreaded + Guard + /Gy %(AdditionalOptions) + + + Console + true + true + true + posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-arm-Path);%(AdditionalLibraryDirectories) + wmainCRTStartup + true + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) + + + targetos.manifest + + + + + + \ No newline at end of file diff --git a/contrib/win32/openssh/ssh-add.vcxproj b/contrib/win32/openssh/ssh-add.vcxproj index b21e8a241..0c4bdafde 100644 --- a/contrib/win32/openssh/ssh-add.vcxproj +++ b/contrib/win32/openssh/ssh-add.vcxproj @@ -205,6 +205,9 @@ wmainCRTStartup /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) + + targetos.manifest + @@ -228,6 +231,9 @@ wmainCRTStartup /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) + + targetos.manifest + @@ -274,6 +280,9 @@ wmainCRTStartup /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) + + targetos.manifest + @@ -301,6 +310,9 @@ true /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) + + targetos.manifest + @@ -328,6 +340,9 @@ true /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) + + targetos.manifest + @@ -382,6 +397,9 @@ true /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) + + targetos.manifest + diff --git a/contrib/win32/openssh/ssh-shellhost.vcxproj b/contrib/win32/openssh/ssh-shellhost.vcxproj index e7ecbc18a..84d8f23a5 100644 --- a/contrib/win32/openssh/ssh-shellhost.vcxproj +++ b/contrib/win32/openssh/ssh-shellhost.vcxproj @@ -194,6 +194,9 @@ $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) + + targetos.manifest + @@ -217,6 +220,9 @@ $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) + + targetos.manifest + @@ -263,6 +269,9 @@ $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) + + targetos.manifest + @@ -290,6 +299,9 @@ true /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) + + targetos.manifest + @@ -317,6 +329,9 @@ $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) + + targetos.manifest + @@ -371,6 +386,9 @@ $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) + + targetos.manifest + diff --git a/contrib/win32/openssh/targetos.manifest b/contrib/win32/openssh/targetos.manifest index 44b37135f..87ac04756 100644 --- a/contrib/win32/openssh/targetos.manifest +++ b/contrib/win32/openssh/targetos.manifest @@ -1,11 +1,11 @@ - - + + - * - * + + @@ -14,4 +14,9 @@ + + + true + + \ No newline at end of file diff --git a/contrib/win32/win32compat/misc.c b/contrib/win32/win32compat/misc.c index 115d6cdf7..50dd1d066 100644 --- a/contrib/win32/win32compat/misc.c +++ b/contrib/win32/win32compat/misc.c @@ -1518,10 +1518,10 @@ setenv(const char *name, const char *value, int rewrite) int chroot(const char *path) { - char cwd[MAX_PATH]; + char cwd[PATH_MAX]; if (strcmp(path, ".") == 0) { - if (w32_getcwd(cwd, MAX_PATH) == NULL) + if (w32_getcwd(cwd, PATH_MAX) == NULL) return -1; path = (const char *)cwd; } else if (*(path + 1) != ':') { diff --git a/contrib/win32/win32compat/misc_internal.h b/contrib/win32/win32compat/misc_internal.h index 0dc05b1de..f5056095f 100644 --- a/contrib/win32/win32compat/misc_internal.h +++ b/contrib/win32/win32compat/misc_internal.h @@ -1,7 +1,6 @@ #pragma once #include -#define PATH_MAX MAX_PATH #define SSH_REGISTRY_ROOT L"SOFTWARE\\OpenSSH" #define GOTO_CLEANUP_IF(_cond_,_err_) do { \ if ((_cond_)) { \ @@ -23,6 +22,9 @@ #define errno_from_Win32LastError() errno_from_Win32Error(GetLastError()) +/* maximum potential size for paths when long paths are enabled */ +#define PATH_MAX 32768 + /* maximum size for user principal name as defined in ad schema */ #define MAX_UPN_LEN 1024 diff --git a/contrib/win32/win32compat/w32api_proxies.c b/contrib/win32/win32compat/w32api_proxies.c index acea8631d..704fd8beb 100644 --- a/contrib/win32/win32compat/w32api_proxies.c +++ b/contrib/win32/win32compat/w32api_proxies.c @@ -29,12 +29,13 @@ #include "w32api_proxies.h" #include "debug.h" +#include "misc_internal.h" static wchar_t* system32_dir() { static wchar_t* s_system32_dir = NULL; - static wchar_t s_system32_path[MAX_PATH + 1] = { 0, }; + static wchar_t s_system32_path[PATH_MAX + 1] = { 0, }; if (s_system32_dir) return s_system32_dir; diff --git a/contrib/win32/win32compat/w32log.c b/contrib/win32/win32compat/w32log.c index 365c99c21..4d230ebbd 100644 --- a/contrib/win32/win32compat/w32log.c +++ b/contrib/win32/win32compat/w32log.c @@ -101,12 +101,12 @@ openlog_file() if (GetModuleFileNameW(NULL, module_path, PATH_MAX) == 0) return; - if (wcsnlen(module_path, MAX_PATH) > MAX_PATH - wcslen(logs_dir)) + if (wcsnlen(module_path, PATH_MAX) > PATH_MAX - wcslen(logs_dir)) return; /* split path root and module */ { - wchar_t* tail = module_path + wcsnlen(module_path, MAX_PATH); + wchar_t* tail = module_path + wcsnlen(module_path, PATH_MAX); while (tail > module_path && *tail != L'\\' && *tail != L'/') tail--; diff --git a/contrib/win32/win32compat/wmain_sshd.c b/contrib/win32/win32compat/wmain_sshd.c index e81e5db42..5d5fff88f 100644 --- a/contrib/win32/win32compat/wmain_sshd.c +++ b/contrib/win32/win32compat/wmain_sshd.c @@ -105,7 +105,7 @@ generate_host_keys() { STARTUPINFOW si; PROCESS_INFORMATION pi; - wchar_t cmdline[MAX_PATH]; + wchar_t cmdline[PATH_MAX]; if (am_system()) { /* create host keys if they dont already exist */ diff --git a/regress/unittests/win32compat/dir_tests.c b/regress/unittests/win32compat/dir_tests.c index 1768c6887..94fbed5e5 100644 --- a/regress/unittests/win32compat/dir_tests.c +++ b/regress/unittests/win32compat/dir_tests.c @@ -17,7 +17,7 @@ dir_tests_1() char *test_dirname_1 = "test_dir_1"; char *tes_dirname_2 = "test_dir_2"; - char cwd[MAX_PATH]; + char cwd[PATH_MAX]; char *p_ret; struct stat st; char *tmpfile = "tmp.txt"; @@ -25,13 +25,13 @@ dir_tests_1() struct timeval tv[2]; DIR *dirp = NULL; struct dirent *dp = NULL; - char dir_fullpath[MAX_PATH]; + char dir_fullpath[PATH_MAX]; int f = -1; - p_ret = getcwd(NULL, MAX_PATH); + p_ret = getcwd(NULL, PATH_MAX); ASSERT_PTR_EQ(p_ret, NULL); - p_ret = getcwd(cwd, MAX_PATH); + p_ret = getcwd(cwd, PATH_MAX); ASSERT_PTR_NE(p_ret, NULL); // delete test_dirname_1, if exits. @@ -67,7 +67,7 @@ dir_tests_1() retValue = chdir(test_dirname_1); ASSERT_INT_EQ(retValue, 0); - p_ret = getcwd(cwd, MAX_PATH); + p_ret = getcwd(cwd, PATH_MAX); ASSERT_PTR_NE(p_ret, NULL); p_ret = NULL; p_ret = strstr(cwd, test_dirname_1); diff --git a/regress/unittests/win32compat/file_tests.c b/regress/unittests/win32compat/file_tests.c index 040237551..f0c4c6d3b 100644 --- a/regress/unittests/win32compat/file_tests.c +++ b/regress/unittests/win32compat/file_tests.c @@ -410,8 +410,8 @@ file_miscellaneous_tests() { TEST_START("file miscellaneous"); - char cwd[MAX_PATH]; - char *pcwd = getcwd(cwd, MAX_PATH); + char cwd[PATH_MAX]; + char *pcwd = getcwd(cwd, PATH_MAX); ASSERT_PTR_NE(pcwd, NULL); char thishost[NI_MAXHOST]; @@ -503,8 +503,8 @@ file_symlink_tests() } DeleteFileW(L"admin_check"); - wchar_t curdir[MAX_PATH]; - GetCurrentDirectoryW(MAX_PATH, curdir); + wchar_t curdir[PATH_MAX]; + GetCurrentDirectoryW(PATH_MAX, curdir); /* perform a variety of symlink tests using unicode, directory targets, * file targets, absolute/relative links, absolute/relative targets @@ -526,8 +526,8 @@ file_symlink_tests() _wsystem(L"RD /S /Q win32compat-tmp >NUL 2>&1"); _wsystem(L"MKDIR win32compat-tmp >NUL 2>&1"); - wchar_t tgt_path[MAX_PATH] = L""; - wchar_t lnk_path[MAX_PATH] = L""; + wchar_t tgt_path[PATH_MAX] = L""; + wchar_t lnk_path[PATH_MAX] = L""; /* prepend absolute path if doing absolute test */ if (do_absolute_tgt) { @@ -578,9 +578,9 @@ file_symlink_tests() ASSERT_INT_EQ(symlink_ret, 0); /* verify readlink() output against symlink() input */ - char readlink_buf[MAX_PATH] = ""; + char readlink_buf[PATH_MAX] = ""; /* readlink returns the absolute path */ - int readlink_ret = readlink(lnk_utf8, readlink_buf, MAX_PATH); + int readlink_ret = readlink(lnk_utf8, readlink_buf, PATH_MAX); char tgt_name_uft8_realpath[PATH_MAX] = { 0 }; realpath(tgt_utf8, tgt_name_uft8_realpath); ASSERT_INT_EQ(readlink_ret, strlen(tgt_name_uft8_realpath)); @@ -615,8 +615,8 @@ file_link_tests() DeleteFileW(L"admin_check_tgt"); if (perm_test == 0) return; - wchar_t curdir[MAX_PATH]; - GetCurrentDirectoryW(MAX_PATH, curdir); + wchar_t curdir[PATH_MAX]; + GetCurrentDirectoryW(PATH_MAX, curdir); /* perform a variety of link tests using unicode, absolute/relative links, * absolute/relative targets @@ -636,8 +636,8 @@ file_link_tests() _wsystem(L"RD /S /Q win32compat-tmp >NUL 2>&1"); _wsystem(L"MKDIR win32compat-tmp >NUL 2>&1"); - wchar_t tgt_path[MAX_PATH] = L""; - wchar_t lnk_path[MAX_PATH] = L""; + wchar_t tgt_path[PATH_MAX] = L""; + wchar_t lnk_path[PATH_MAX] = L""; /* prepend absolute path if doing absolute test */ if (do_absolute_tgt) { diff --git a/regress/unittests/win32compat/miscellaneous_tests.c b/regress/unittests/win32compat/miscellaneous_tests.c index 8ac60090f..97644e4e7 100644 --- a/regress/unittests/win32compat/miscellaneous_tests.c +++ b/regress/unittests/win32compat/miscellaneous_tests.c @@ -130,9 +130,9 @@ test_statvfs() TEST_START("test statvfs"); struct statvfs st; - char cwd[MAX_PATH]; + char cwd[PATH_MAX]; - char *tmp = getcwd(cwd, MAX_PATH); + char *tmp = getcwd(cwd, PATH_MAX); ASSERT_PTR_NE(tmp, NULL); retValue = statvfs(NULL, &st); @@ -150,7 +150,7 @@ void test_realpath() { TEST_START("test realpath"); - char resolved_path[MAX_PATH]; + char resolved_path[PATH_MAX]; char *ret = NULL; char *expectedOutput1 = "/c:/windows/system32"; char *expectedOutput2 = "/c:/"; @@ -212,7 +212,7 @@ test_chroot() { int fd; FILE *f; - char path[MAX_PATH], test_root[MAX_PATH]; + char path[PATH_MAX], test_root[PATH_MAX]; /* test directory setup */ _wsystem(L"RD /S /Q chroot-testdir >NUL 2>&1"); @@ -240,21 +240,21 @@ test_chroot() TEST_DONE(); TEST_START("real chroot now"); - getcwd(path, MAX_PATH); - getcwd(test_root, MAX_PATH); + getcwd(path, PATH_MAX); + getcwd(test_root, PATH_MAX); strcat(path, "\\chroot-testdir\\jail"); ASSERT_INT_EQ(chdir(path), 0); ASSERT_INT_EQ(chroot(path), 0); TEST_DONE(); TEST_START("chdir; getcwd and realpath"); - ASSERT_PTR_NE(getcwd(path, MAX_PATH), NULL); + ASSERT_PTR_NE(getcwd(path, PATH_MAX), NULL); ASSERT_STRING_EQ(path, "\\"); ASSERT_INT_NE(chdir(test_root), 0); ASSERT_INT_EQ(chdir("d1"), 0); ASSERT_PTR_NE(realpath("..", path), NULL); ASSERT_STRING_EQ(path, "/"); - ASSERT_PTR_NE(getcwd(path, MAX_PATH), NULL); + ASSERT_PTR_NE(getcwd(path, PATH_MAX), NULL); ASSERT_STRING_EQ(path, "\\d1"); ASSERT_PTR_NE(realpath(".", path), NULL); ASSERT_STRING_EQ(path, "/d1"); diff --git a/regress/unittests/win32compat/tests.c b/regress/unittests/win32compat/tests.c index 588e2dc77..5d8374ae4 100644 --- a/regress/unittests/win32compat/tests.c +++ b/regress/unittests/win32compat/tests.c @@ -49,7 +49,7 @@ delete_dir_recursive(char *full_dir_path) struct stat st; struct dirent *dp; char mode[12]; - char *tmpFullPath = malloc(MAX_PATH + 1); + char *tmpFullPath = malloc(PATH_MAX + 1); strcpy(tmpFullPath, full_dir_path); int tmpStrLen = strlen(tmpFullPath); tmpFullPath[tmpStrLen++] = '\\';