github
/
teleport
mirror of https://github.com/tp4a/teleport
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

temp.

pull/105/head
Apex Liu 2017-11-27 23:22:59 +08:00
parent c0bfcd2226
commit 4ca0d58f1d
6 changed files with 638 additions and 625 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

393
external/libssh-win-static/include/config.h vendored
View File

@ -1,196 +1,197 @@
#ifdef _DEBUG #ifdef _DEBUG
#include <vld.h> #include <vld.h>
#endif #endif
/* Name of package */ /* Name of package */
#define PACKAGE "libssh" #define PACKAGE "libssh"
/* Version number of package */ /* Version number of package */
#define VERSION "0.7.4" #define VERSION "0.7.4"
/* #undef LOCALEDIR */ /* #undef LOCALEDIR */
/* #undef DATADIR */ /* #undef DATADIR */
//#define LIBDIR "lib" //#define LIBDIR "lib"
//#define PLUGINDIR "plugins-4" //#define PLUGINDIR "plugins-4"
/* #undef SYSCONFDIR */ /* #undef SYSCONFDIR */
//#define BINARYDIR "E:/work/eomsoft/tmp/libssh/build" //#define BINARYDIR "E:/work/eomsoft/tmp/libssh/build"
//#define SOURCEDIR "E:/work/eomsoft/tmp/libssh" //#define SOURCEDIR "E:/work/eomsoft/tmp/libssh"
/************************** HEADER FILES *************************/ /************************** HEADER FILES *************************/
/* Define to 1 if you have the <argp.h> header file. */ /* Define to 1 if you have the <argp.h> header file. */
/* #undef HAVE_ARGP_H */ /* #undef HAVE_ARGP_H */
/* Define to 1 if you have the <aprpa/inet.h> header file. */ /* Define to 1 if you have the <aprpa/inet.h> header file. */
/* #undef HAVE_ARPA_INET_H */ /* #undef HAVE_ARPA_INET_H */
/* Define to 1 if you have the <pty.h> header file. */ /* Define to 1 if you have the <pty.h> header file. */
/* #undef HAVE_PTY_H */ /* #undef HAVE_PTY_H */
/* Define to 1 if you have the <utmp.h> header file. */ /* Define to 1 if you have the <utmp.h> header file. */
/* #undef HAVE_UTMP_H */ /* #undef HAVE_UTMP_H */
/* Define to 1 if you have the <util.h> header file. */ /* Define to 1 if you have the <util.h> header file. */
/* #undef HAVE_UTIL_H */ /* #undef HAVE_UTIL_H */
/* Define to 1 if you have the <libutil.h> header file. */ /* Define to 1 if you have the <libutil.h> header file. */
/* #undef HAVE_LIBUTIL_H */ /* #undef HAVE_LIBUTIL_H */
/* Define to 1 if you have the <sys/time.h> header file. */ /* Define to 1 if you have the <sys/time.h> header file. */
/* #undef HAVE_SYS_TIME_H */ /* #undef HAVE_SYS_TIME_H */
/* Define to 1 if you have the <termios.h> header file. */ /* Define to 1 if you have the <termios.h> header file. */
/* #undef HAVE_TERMIOS_H */ /* #undef HAVE_TERMIOS_H */
/* Define to 1 if you have the <unistd.h> header file. */ /* Define to 1 if you have the <unistd.h> header file. */
/* #undef HAVE_UNISTD_H */ /* #undef HAVE_UNISTD_H */
/* Define to 1 if you have the <openssl/aes.h> header file. */ /* Define to 1 if you have the <openssl/aes.h> header file. */
#define HAVE_OPENSSL_AES_H 1 #define HAVE_OPENSSL_AES_H 1
/* Define to 1 if you have the <wspiapi.h> header file. */ /* Define to 1 if you have the <wspiapi.h> header file. */
#define HAVE_WSPIAPI_H 1 #define HAVE_WSPIAPI_H 1
/* Define to 1 if you have the <openssl/blowfish.h> header file. */ /* Define to 1 if you have the <openssl/blowfish.h> header file. */
#define HAVE_OPENSSL_BLOWFISH_H 1 #define HAVE_OPENSSL_BLOWFISH_H 1
/* Define to 1 if you have the <openssl/des.h> header file. */ /* Define to 1 if you have the <openssl/des.h> header file. */
#define HAVE_OPENSSL_DES_H 1 #define HAVE_OPENSSL_DES_H 1
/* Define to 1 if you have the <openssl/ecdh.h> header file. */ /* Define to 1 if you have the <openssl/ecdh.h> header file. */
#define HAVE_OPENSSL_ECDH_H 1 #define HAVE_OPENSSL_ECDH_H 1
/* Define to 1 if you have the <openssl/ec.h> header file. */ /* Define to 1 if you have the <openssl/ec.h> header file. */
#define HAVE_OPENSSL_EC_H 1 #define HAVE_OPENSSL_EC_H 1
/* Define to 1 if you have the <openssl/ecdsa.h> header file. */ /* Define to 1 if you have the <openssl/ecdsa.h> header file. */
#define HAVE_OPENSSL_ECDSA_H 1 #define HAVE_OPENSSL_ECDSA_H 1
/* Define to 1 if you have the <pthread.h> header file. */ /* Define to 1 if you have the <pthread.h> header file. */
/* #undef HAVE_PTHREAD_H */ /* #undef HAVE_PTHREAD_H */
/* Define to 1 if you have eliptic curve cryptography in openssl */ /* Define to 1 if you have eliptic curve cryptography in openssl */
#define HAVE_OPENSSL_ECC 1 #define HAVE_OPENSSL_ECC 1
/* Define to 1 if you have eliptic curve cryptography in gcrypt */ /* Define to 1 if you have eliptic curve cryptography in gcrypt */
/* #undef HAVE_GCRYPT_ECC */ /* #undef HAVE_GCRYPT_ECC */
/* Define to 1 if you have eliptic curve cryptography */ /* Define to 1 if you have eliptic curve cryptography */
#define HAVE_ECC 1 #define HAVE_ECC 1
/*************************** FUNCTIONS ***************************/ /*************************** FUNCTIONS ***************************/
/* Define to 1 if you have the `EVP_aes128_ctr' function. */ /* Define to 1 if you have the `EVP_aes128_ctr' function. */
#define HAVE_OPENSSL_EVP_AES_CTR 1 #define HAVE_OPENSSL_EVP_AES_CTR 1
/* Define to 1 if you have the `EVP_aes128_cbc' function. */ /* Define to 1 if you have the `EVP_aes128_cbc' function. */
#define HAVE_OPENSSL_EVP_AES_CBC 1 #define HAVE_OPENSSL_EVP_AES_CBC 1
/* Define to 1 if you have the `snprintf' function. */ /* Define to 1 if you have the `snprintf' function. */
#define HAVE_SNPRINTF 1 #define HAVE_SNPRINTF 1
/* Define to 1 if you have the `_snprintf' function. */ /* Define to 1 if you have the `_snprintf' function. */
/* #undef HAVE__SNPRINTF */ /* #undef HAVE__SNPRINTF */
/* Define to 1 if you have the `_snprintf_s' function. */ /* Define to 1 if you have the `_snprintf_s' function. */
/* #undef HAVE__SNPRINTF_S */ /* #undef HAVE__SNPRINTF_S */
/* Define to 1 if you have the `vsnprintf' function. */ /* Define to 1 if you have the `vsnprintf' function. */
#define HAVE_VSNPRINTF 1 #define HAVE_VSNPRINTF 1
/* Define to 1 if you have the `_vsnprintf' function. */ /* Define to 1 if you have the `_vsnprintf' function. */
/* #undef HAVE__VSNPRINTF */ /* #undef HAVE__VSNPRINTF */
/* Define to 1 if you have the `_vsnprintf_s' function. */ /* Define to 1 if you have the `_vsnprintf_s' function. */
/* #undef HAVE__VSNPRINTF_S */ /* #undef HAVE__VSNPRINTF_S */
/* Define to 1 if you have the `isblank' function. */ /* Define to 1 if you have the `isblank' function. */
#define HAVE_ISBLANK 1 #define HAVE_ISBLANK 1
/* Define to 1 if you have the `strncpy' function. */ /* Define to 1 if you have the `strncpy' function. */
#define HAVE_STRNCPY 1 #define HAVE_STRNCPY 1
/* Define to 1 if you have the `cfmakeraw' function. */ /* Define to 1 if you have the `cfmakeraw' function. */
/* #undef HAVE_CFMAKERAW */ /* #undef HAVE_CFMAKERAW */
/* Define to 1 if you have the `getaddrinfo' function. */ /* Define to 1 if you have the `getaddrinfo' function. */
#define HAVE_GETADDRINFO 1 #define HAVE_GETADDRINFO 1
/* Define to 1 if you have the `poll' function. */ /* Define to 1 if you have the `poll' function. */
/* #undef HAVE_POLL */ /* #undef HAVE_POLL */
/* Define to 1 if you have the `select' function. */ /* Define to 1 if you have the `select' function. */
#define HAVE_SELECT 1 #define HAVE_SELECT 1
/* Define to 1 if you have the `clock_gettime' function. */ /* Define to 1 if you have the `clock_gettime' function. */
/* #undef HAVE_CLOCK_GETTIME */ /* #undef HAVE_CLOCK_GETTIME */
/* Define to 1 if you have the `ntohll' function. */ /* Define to 1 if you have the `ntohll' function. */
//#define HAVE_NTOHLL 1 //#define HAVE_NTOHLL 1
/* Define to 1 if you have the `htonll' function. */ /* Define to 1 if you have the `htonll' function. */
//#define HAVE_HTONLL 1 //#define HAVE_HTONLL 1
/* Define to 1 if you have the `strtoull' function. */ /* Define to 1 if you have the `strtoull' function. */
/* #undef HAVE_STRTOULL */ /* #undef HAVE_STRTOULL */
/* Define to 1 if you have the `__strtoull' function. */ /* Define to 1 if you have the `__strtoull' function. */
/* #undef HAVE___STRTOULL */ /* #undef HAVE___STRTOULL */
/* Define to 1 if you have the `_strtoui64' function. */ /* Define to 1 if you have the `_strtoui64' function. */
#define HAVE__STRTOUI64 1 #define HAVE__STRTOUI64 1
/*************************** LIBRARIES ***************************/ /*************************** LIBRARIES ***************************/
/* Define to 1 if you have the `crypto' library (-lcrypto). */ /* Define to 1 if you have the `crypto' library (-lcrypto). */
#define HAVE_LIBCRYPTO 1 #define HAVE_LIBCRYPTO 1
/* Define to 1 if you have the `gcrypt' library (-lgcrypt). */ /* Define to 1 if you have the `gcrypt' library (-lgcrypt). */
/* #undef HAVE_LIBGCRYPT */ /* #undef HAVE_LIBGCRYPT */
/* Define to 1 if you have the `pthread' library (-lpthread). */ /* Define to 1 if you have the `pthread' library (-lpthread). */
/* #undef HAVE_PTHREAD */ /* #undef HAVE_PTHREAD */
/**************************** OPTIONS ****************************/ /**************************** OPTIONS ****************************/
/* #undef HAVE_GCC_THREAD_LOCAL_STORAGE */ /* #undef HAVE_GCC_THREAD_LOCAL_STORAGE */
#define HAVE_MSC_THREAD_LOCAL_STORAGE 1 #define HAVE_MSC_THREAD_LOCAL_STORAGE 1
/* #undef HAVE_GCC_VOLATILE_MEMORY_PROTECTION */ /* #undef HAVE_GCC_VOLATILE_MEMORY_PROTECTION */
/*#define HAVE_GCC_NARG_MACRO 1*/ /*#define HAVE_GCC_NARG_MACRO 1*/
/* #undef HAVE_COMPILER__FUNC__ */ /* #undef HAVE_COMPILER__FUNC__ */
#define HAVE_COMPILER__FUNCTION__ 1 #define HAVE_COMPILER__FUNCTION__ 1
/* Define to 1 if you want to enable GSSAPI */ /* Define to 1 if you want to enable GSSAPI */
/* #undef WITH_GSSAPI */ /* #undef WITH_GSSAPI */
/* Define to 1 if you want to enable ZLIB */ /* Define to 1 if you want to enable ZLIB */
/*#define WITH_ZLIB 1*/ /*#define WITH_ZLIB 1*/
/* Define to 1 if you want to enable SFTP */ /* Define to 1 if you want to enable SFTP */
#define WITH_SFTP 1 #define WITH_SFTP 1
/* Define to 1 if you want to enable SSH1 */ /* Define to 1 if you want to enable SSH1 */
/* #undef WITH_SSH1 */ /* #undef WITH_SSH1 */
#define WITH_SSH1
/* Define to 1 if you want to enable server support */
#define WITH_SERVER 1 /* Define to 1 if you want to enable server support */
#define WITH_SERVER 1
/* Define to 1 if you want to enable debug output for crypto functions */
/* #undef DEBUG_CRYPTO */ /* Define to 1 if you want to enable debug output for crypto functions */
/* #undef DEBUG_CRYPTO */
/* Define to 1 if you want to enable pcap output support (experimental) */
/* #undef WITH_PCAP */ /* Define to 1 if you want to enable pcap output support (experimental) */
/* #undef WITH_PCAP */
/* Define to 1 if you want to enable calltrace debug output */
/* #undef DEBUG_CALLTRACE */ /* Define to 1 if you want to enable calltrace debug output */
/* #undef DEBUG_CALLTRACE */
/* Define to 1 if you want to enable NaCl support */
/* #undef WITH_NACL */ /* Define to 1 if you want to enable NaCl support */
/* #undef WITH_NACL */
/*************************** ENDIAN *****************************/
/*************************** ENDIAN *****************************/
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
significant byte first (like Motorola and SPARC, unlike Intel). */ /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
/* #undef WORDS_BIGENDIAN */ significant byte first (like Motorola and SPARC, unlike Intel). */
/* #undef WORDS_BIGENDIAN */

439
external/libssh-win-static/libssh.vs2015.vcxproj vendored
View File

@ -1,219 +1,222 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations"> <ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32"> <ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration> <Configuration>Debug</Configuration>
<Platform>Win32</Platform> <Platform>Win32</Platform>
</ProjectConfiguration> </ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32"> <ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration> <Configuration>Release</Configuration>
<Platform>Win32</Platform> <Platform>Win32</Platform>
</ProjectConfiguration> </ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64"> <ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration> <Configuration>Debug</Configuration>
<Platform>x64</Platform> <Platform>x64</Platform>
</ProjectConfiguration> </ProjectConfiguration>
<ProjectConfiguration Include="Release|x64"> <ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration> <Configuration>Release</Configuration>
<Platform>x64</Platform> <Platform>x64</Platform>
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{228F651A-4726-41CE-89B3-5D07CF55909B}</ProjectGuid> <ProjectGuid>{228F651A-4726-41CE-89B3-5D07CF55909B}</ProjectGuid>
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
<RootNamespace>libssh</RootNamespace> <RootNamespace>libssh</RootNamespace>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
<ProjectName>libssh</ProjectName> <ProjectName>libssh</ProjectName>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType> <ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries> <UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v140_xp</PlatformToolset> <PlatformToolset>v140_xp</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType> <ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v140_xp</PlatformToolset> <PlatformToolset>v140_xp</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType> <ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries> <UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset> <PlatformToolset>v140</PlatformToolset>
<CharacterSet>Unicode</CharacterSet> <CharacterSet>Unicode</CharacterSet>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType> <ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset> <PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet> <CharacterSet>Unicode</CharacterSet>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings"> <ImportGroup Label="ExtensionSettings">
</ImportGroup> </ImportGroup>
<ImportGroup Label="Shared"> <ImportGroup Label="Shared">
</ImportGroup> </ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup> </ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup> </ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup> </ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>$(ProjectDir)lib\</OutDir> <OutDir>$(ProjectDir)lib\</OutDir>
<IntDir>..\..\out\_tmp_\$(ProjectName)\$(PlatformTarget)\$(Configuration)\</IntDir> <IntDir>..\..\out\_tmp_\$(ProjectName)\$(PlatformTarget)\$(Configuration)\</IntDir>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<IntDir>..\..\out\_tmp_\$(ProjectName)\$(PlatformTarget)\$(Configuration)\</IntDir> <IntDir>..\..\out\_tmp_\$(ProjectName)\$(PlatformTarget)\$(Configuration)\</IntDir>
<OutDir>$(ProjectDir)lib\</OutDir> <OutDir>$(ProjectDir)lib\</OutDir>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile> <ClCompile>
<PrecompiledHeader> <PrecompiledHeader>
</PrecompiledHeader> </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;LIBSSH_STATIC;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_DEBUG;LIBSSH_STATIC;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>.\include;..\openssl\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>.\include;..\openssl\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
</Link> </Link>
<Lib> <Lib>
<OutputFile>$(OutDir)$(TargetName)MTd$(TargetExt)</OutputFile> <OutputFile>$(OutDir)$(TargetName)MTd$(TargetExt)</OutputFile>
</Lib> </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile> <ClCompile>
<PrecompiledHeader> <PrecompiledHeader>
</PrecompiledHeader> </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile> <ClCompile>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<PrecompiledHeader> <PrecompiledHeader>
</PrecompiledHeader> </PrecompiledHeader>
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;LIBSSH_STATIC;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;NDEBUG;LIBSSH_STATIC;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>.\include;..\openssl\inc32</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>.\include;..\openssl\inc32</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
</Link> </Link>
<Lib> <Lib>
<OutputFile>$(OutDir)$(TargetName)MT$(TargetExt)</OutputFile> <OutputFile>$(OutDir)$(TargetName)MT$(TargetExt)</OutputFile>
</Lib> </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile> <ClCompile>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<PrecompiledHeader> <PrecompiledHeader>
</PrecompiledHeader> </PrecompiledHeader>
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<Text Include="ReadMe.txt" /> <Text Include="ReadMe.txt" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="src\agent.c" /> <ClCompile Include="src\agent.c" />
<ClCompile Include="src\auth.c" /> <ClCompile Include="src\auth.c" />
<ClCompile Include="src\auth1.c" /> <ClCompile Include="src\auth1.c" />
<ClCompile Include="src\base64.c" /> <ClCompile Include="src\base64.c" />
<ClCompile Include="src\bignum.c" /> <ClCompile Include="src\bignum.c" />
<ClCompile Include="src\bind.c" /> <ClCompile Include="src\bind.c" />
<ClCompile Include="src\buffer.c" /> <ClCompile Include="src\buffer.c" />
<ClCompile Include="src\callbacks.c" /> <ClCompile Include="src\callbacks.c" />
<ClCompile Include="src\channels.c" /> <ClCompile Include="src\channels.c" />
<ClCompile Include="src\channels1.c" /> <ClCompile Include="src\channels1.c" />
<ClCompile Include="src\client.c" /> <ClCompile Include="src\client.c" />
<ClCompile Include="src\config.c" /> <ClCompile Include="src\config.c" />
<ClCompile Include="src\connect.c" /> <ClCompile Include="src\connect.c" />
<ClCompile Include="src\crc32.c" /> <ClCompile Include="src\crc32.c" />
<ClCompile Include="src\curve25519.c" /> <ClCompile Include="src\curve25519.c" />
<ClCompile Include="src\dh.c" /> <ClCompile Include="src\dh.c" />
<ClCompile Include="src\ecdh.c" /> <ClCompile Include="src\ecdh.c" />
<ClCompile Include="src\error.c" /> <ClCompile Include="src\error.c" />
<ClCompile Include="src\external\bcrypt_pbkdf.c" /> <ClCompile Include="src\external\bcrypt_pbkdf.c" />
<ClCompile Include="src\external\blowfish.c" /> <ClCompile Include="src\external\blowfish.c" />
<ClCompile Include="src\external\curve25519_ref.c" /> <ClCompile Include="src\external\curve25519_ref.c" />
<ClCompile Include="src\external\ed25519.c" /> <ClCompile Include="src\external\ed25519.c" />
<ClCompile Include="src\external\fe25519.c" /> <ClCompile Include="src\external\fe25519.c" />
<ClCompile Include="src\external\ge25519.c" /> <ClCompile Include="src\external\ge25519.c" />
<ClCompile Include="src\external\sc25519.c" /> <ClCompile Include="src\external\sc25519.c" />
<ClCompile Include="src\gcrypt_missing.c" /> <ClCompile Include="src\gcrypt_missing.c" />
<ClCompile Include="src\getpass.c" /> <ClCompile Include="src\getpass.c" />
<ClCompile Include="src\init.c" /> <ClCompile Include="src\init.c" />
<ClCompile Include="src\kex.c" /> <ClCompile Include="src\kex.c" />
<ClCompile Include="src\kex1.c" /> <ClCompile Include="src\kex1.c" />
<ClCompile Include="src\known_hosts.c" /> <ClCompile Include="src\known_hosts.c" />
<ClCompile Include="src\legacy.c" /> <ClCompile Include="src\legacy.c" />
<ClCompile Include="src\libcrypto.c" /> <ClCompile Include="src\libcrypto.c" />
<ClCompile Include="src\libgcrypt.c" /> <ClCompile Include="src\libgcrypt.c" />
<ClCompile Include="src\log.c" /> <ClCompile Include="src\log.c" />
<ClCompile Include="src\match.c" /> <ClCompile Include="src\match.c" />
<ClCompile Include="src\messages.c" /> <ClCompile Include="src\messages.c" />
<ClCompile Include="src\misc.c" /> <ClCompile Include="src\misc.c" />
<ClCompile Include="src\options.c" /> <ClCompile Include="src\options.c" />
<ClCompile Include="src\packet.c" /> <ClCompile Include="src\packet.c" />
<ClCompile Include="src\packet1.c" /> <ClCompile Include="src\packet1.c" />
<ClCompile Include="src\packet_cb.c" /> <ClCompile Include="src\packet_cb.c" />
<ClCompile Include="src\packet_crypt.c" /> <ClCompile Include="src\packet_crypt.c" />
<ClCompile Include="src\pcap.c" /> <ClCompile Include="src\pcap.c" />
<ClCompile Include="src\pki.c" /> <ClCompile Include="src\pki.c" />
<ClCompile Include="src\pki_container_openssh.c" /> <ClCompile Include="src\pki_container_openssh.c" />
<ClCompile Include="src\pki_crypto.c" /> <ClCompile Include="src\pki_crypto.c" />
<ClCompile Include="src\pki_ed25519.c" /> <ClCompile Include="src\pki_ed25519.c" />
<ClCompile Include="src\pki_gcrypt.c" /> <ClCompile Include="src\pki_gcrypt.c" />
<ClCompile Include="src\poll.c" /> <ClCompile Include="src\poll.c" />
<ClCompile Include="src\scp.c" /> <ClCompile Include="src\scp.c" />
<ClCompile Include="src\server.c" /> <ClCompile Include="src\server.c" />
<ClCompile Include="src\session.c" /> <ClCompile Include="src\session.c" />
<ClCompile Include="src\sftp.c" /> <ClCompile Include="src\sftp.c" />
<ClCompile Include="src\sftpserver.c" /> <ClCompile Include="src\sftpserver.c" />
<ClCompile Include="src\socket.c" /> <ClCompile Include="src\socket.c" />
<ClCompile Include="src\string.c" /> <ClCompile Include="src\string.c" />
<ClCompile Include="src\threads.c" /> <ClCompile Include="src\threads.c" />
<ClCompile Include="src\threads\pthread.c" /> <ClCompile Include="src\threads\pthread.c" />
<ClCompile Include="src\wrapper.c" /> <ClCompile Include="src\wrapper.c" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ItemGroup>
<ImportGroup Label="ExtensionTargets"> <ClInclude Include="include\config.h" />
</ImportGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project> </Project>

419
external/libssh-win-static/libssh.vs2015.vcxproj.filters vendored
View File

@ -1,208 +1,213 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<Filter Include="Source Files"> <Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter> </Filter>
<Filter Include="Header Files"> <Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions> <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter> </Filter>
<Filter Include="Resource Files"> <Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions> <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter> </Filter>
<Filter Include="Source Files\external"> <Filter Include="Source Files\external">
<UniqueIdentifier>{8ec876c8-97fa-4f69-a5aa-7c59b5107ca1}</UniqueIdentifier> <UniqueIdentifier>{8ec876c8-97fa-4f69-a5aa-7c59b5107ca1}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Source Files\threads"> <Filter Include="Source Files\threads">
<UniqueIdentifier>{0f864866-f75b-4063-baf2-63c1c0134342}</UniqueIdentifier> <UniqueIdentifier>{0f864866-f75b-4063-baf2-63c1c0134342}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Text Include="ReadMe.txt" /> <Text Include="ReadMe.txt" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="src\agent.c"> <ClCompile Include="src\agent.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\auth.c"> <ClCompile Include="src\auth.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\auth1.c"> <ClCompile Include="src\auth1.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\base64.c"> <ClCompile Include="src\base64.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\bignum.c"> <ClCompile Include="src\bignum.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\bind.c"> <ClCompile Include="src\bind.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\buffer.c"> <ClCompile Include="src\buffer.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\callbacks.c"> <ClCompile Include="src\callbacks.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\channels.c"> <ClCompile Include="src\channels.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\channels1.c"> <ClCompile Include="src\channels1.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\client.c"> <ClCompile Include="src\client.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\config.c"> <ClCompile Include="src\config.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\connect.c"> <ClCompile Include="src\connect.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\crc32.c"> <ClCompile Include="src\crc32.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\curve25519.c"> <ClCompile Include="src\curve25519.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\dh.c"> <ClCompile Include="src\dh.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\ecdh.c"> <ClCompile Include="src\ecdh.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\error.c"> <ClCompile Include="src\error.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\gcrypt_missing.c"> <ClCompile Include="src\gcrypt_missing.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\getpass.c"> <ClCompile Include="src\getpass.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\init.c"> <ClCompile Include="src\init.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\kex.c"> <ClCompile Include="src\kex.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\kex1.c"> <ClCompile Include="src\kex1.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\known_hosts.c"> <ClCompile Include="src\known_hosts.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\legacy.c"> <ClCompile Include="src\legacy.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\libcrypto.c"> <ClCompile Include="src\libcrypto.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\libgcrypt.c"> <ClCompile Include="src\libgcrypt.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\log.c"> <ClCompile Include="src\log.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\match.c"> <ClCompile Include="src\match.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\messages.c"> <ClCompile Include="src\messages.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\misc.c"> <ClCompile Include="src\misc.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\options.c"> <ClCompile Include="src\options.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\packet.c"> <ClCompile Include="src\packet.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\packet_cb.c"> <ClCompile Include="src\packet_cb.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\packet_crypt.c"> <ClCompile Include="src\packet_crypt.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\packet1.c"> <ClCompile Include="src\packet1.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\pcap.c"> <ClCompile Include="src\pcap.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\pki.c"> <ClCompile Include="src\pki.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\pki_container_openssh.c"> <ClCompile Include="src\pki_container_openssh.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\pki_crypto.c"> <ClCompile Include="src\pki_crypto.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\pki_ed25519.c"> <ClCompile Include="src\pki_ed25519.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\pki_gcrypt.c"> <ClCompile Include="src\pki_gcrypt.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\poll.c"> <ClCompile Include="src\poll.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\scp.c"> <ClCompile Include="src\scp.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\server.c"> <ClCompile Include="src\server.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\session.c"> <ClCompile Include="src\session.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\sftp.c"> <ClCompile Include="src\sftp.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\sftpserver.c"> <ClCompile Include="src\sftpserver.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\socket.c"> <ClCompile Include="src\socket.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\string.c"> <ClCompile Include="src\string.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\threads.c"> <ClCompile Include="src\threads.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\wrapper.c"> <ClCompile Include="src\wrapper.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\external\bcrypt_pbkdf.c"> <ClCompile Include="src\external\bcrypt_pbkdf.c">
<Filter>Source Files\external</Filter> <Filter>Source Files\external</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\external\blowfish.c"> <ClCompile Include="src\external\blowfish.c">
<Filter>Source Files\external</Filter> <Filter>Source Files\external</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\external\curve25519_ref.c"> <ClCompile Include="src\external\curve25519_ref.c">
<Filter>Source Files\external</Filter> <Filter>Source Files\external</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\external\ed25519.c"> <ClCompile Include="src\external\ed25519.c">
<Filter>Source Files\external</Filter> <Filter>Source Files\external</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\external\fe25519.c"> <ClCompile Include="src\external\fe25519.c">
<Filter>Source Files\external</Filter> <Filter>Source Files\external</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\external\ge25519.c"> <ClCompile Include="src\external\ge25519.c">
<Filter>Source Files\external</Filter> <Filter>Source Files\external</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\external\sc25519.c"> <ClCompile Include="src\external\sc25519.c">
<Filter>Source Files\external</Filter> <Filter>Source Files\external</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\threads\pthread.c"> <ClCompile Include="src\threads\pthread.c">
<Filter>Source Files\threads</Filter> <Filter>Source Files\threads</Filter>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup>
<ClInclude Include="include\config.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project> </Project>

2
server/tp_core/protocol/ssh/ssh_proxy.cpp
View File

@ -86,6 +86,8 @@ void SshProxy::_thread_loop()
{ {
// 注意，ssh_new()出来的指针，如果遇到停止标志，本函数内部就释放了，否则这个指针交给了SshSession类实例管理，其析构时会释放。 // 注意，ssh_new()出来的指针，如果遇到停止标志，本函数内部就释放了，否则这个指针交给了SshSession类实例管理，其析构时会释放。
ssh_session sess_to_client = ssh_new(); ssh_session sess_to_client = ssh_new();
int verbosity = 4;
ssh_options_set(sess_to_client, SSH_OPTIONS_LOG_VERBOSITY, &verbosity);
ssh_set_blocking(sess_to_client, 1); ssh_set_blocking(sess_to_client, 1);
struct sockaddr_storage sock_client; struct sockaddr_storage sock_client;

8
server/tp_core/protocol/ssh/ssh_session.cpp
View File

@ -348,6 +348,8 @@ int SshSession::_on_auth_password_request(ssh_session session, const char *user,
// 现在尝试根据session-id获取得到的信息，连接并登录真正的SSH服务器 // 现在尝试根据session-id获取得到的信息，连接并登录真正的SSH服务器
EXLOGV("[ssh] try to connect to real SSH server %s:%d\n", _this->m_conn_ip.c_str(), _this->m_conn_port); EXLOGV("[ssh] try to connect to real SSH server %s:%d\n", _this->m_conn_ip.c_str(), _this->m_conn_port);
_this->m_srv_session = ssh_new(); _this->m_srv_session = ssh_new();
int verbosity = 4;
ssh_options_set(_this->m_srv_session, SSH_OPTIONS_LOG_VERBOSITY, &verbosity);
ssh_set_blocking(_this->m_srv_session, 1); ssh_set_blocking(_this->m_srv_session, 1);
ssh_options_set(_this->m_srv_session, SSH_OPTIONS_HOST, _this->m_conn_ip.c_str()); ssh_options_set(_this->m_srv_session, SSH_OPTIONS_HOST, _this->m_conn_ip.c_str());
int port = (int)_this->m_conn_port; int port = (int)_this->m_conn_port;
@ -596,7 +598,7 @@ int SshSession::_on_client_shell_request(ssh_session session, ssh_channel channe
cp->type = TS_SSH_CHANNEL_TYPE_SHELL; cp->type = TS_SSH_CHANNEL_TYPE_SHELL;
g_ssh_env.session_update(cp->db_id, TP_PROTOCOL_TYPE_SSH_SHELL, TP_SESS_STAT_STARTED); g_ssh_env.session_update(cp->db_id, TP_PROTOCOL_TYPE_SSH_SHELL, TP_SESS_STAT_STARTED);
// FIXME: if client is putty, it will block here. the following function will never return. // FIXME: sometimes it will block here. the following function will never return.
// at this time, can not write data to this channel. read from this channel with timeout, got 0 byte. // at this time, can not write data to this channel. read from this channel with timeout, got 0 byte.
// I have no idea how to fix it... :( // I have no idea how to fix it... :(
int err = ssh_channel_request_shell(cp->srv_channel); int err = ssh_channel_request_shell(cp->srv_channel);
@ -630,7 +632,7 @@ void SshSession::_on_client_channel_close(ssh_session session, ssh_channel chann
int SshSession::_on_client_channel_data(ssh_session session, ssh_channel channel, void *data, unsigned int len, int is_stderr, void *userdata) int SshSession::_on_client_channel_data(ssh_session session, ssh_channel channel, void *data, unsigned int len, int is_stderr, void *userdata)
{ {
//EXLOG_BIN((ex_u8*)data, len, "on_client_channel_data [is_stderr=%d]:", is_stderr); EXLOG_BIN((ex_u8*)data, len, "on_client_channel_data [is_stderr=%d]:", is_stderr);
SshSession *_this = (SshSession *)userdata; SshSession *_this = (SshSession *)userdata;
@ -742,7 +744,7 @@ int SshSession::_on_client_channel_exec_request(ssh_session session, ssh_channel
} }
int SshSession::_on_server_channel_data(ssh_session session, ssh_channel channel, void *data, unsigned int len, int is_stderr, void *userdata) { int SshSession::_on_server_channel_data(ssh_session session, ssh_channel channel, void *data, unsigned int len, int is_stderr, void *userdata) {
//EXLOG_BIN((ex_u8*)data, len, "on_server_channel_data [is_stderr=%d]:", is_stderr); EXLOG_BIN((ex_u8*)data, len, "on_server_channel_data [is_stderr=%d]:", is_stderr);
SshSession *_this = (SshSession *)userdata; SshSession *_this = (SshSession *)userdata;

2
server/www/teleport/webroot/app/controller/account.py
View File

@ -240,7 +240,7 @@ class DoUpdateAccountHandler(TPBaseJsonHandler):
if param['auth_type'] == TP_AUTH_TYPE_PASSWORD and len(param['password']) > 0: if param['auth_type'] == TP_AUTH_TYPE_PASSWORD and len(param['password']) > 0:
code, ret_data = yield core_service_async_enc(param['password']) code, ret_data = yield core_service_async_enc(param['password'])
if code != TPE_OK: if code != TPE_OK:
return self.write_json(code, '无法加密存储密码！') return self.write_json(code)
else: else:
param['password'] = ret_data param['password'] = ret_data
elif param['auth_type'] == TP_AUTH_TYPE_PRIVATE_KEY and len(param['pri_key']) > 0: elif param['auth_type'] == TP_AUTH_TYPE_PRIVATE_KEY and len(param['pri_key']) > 0: