Tera TermRevision: 10750
https://osdn.net/projects/ttssh2/scm/svn/commits/10750
Author: zmatsuo
Date: 2023-06-11 22:49:36 +0900 (Sun, 11 Jun 2023)
Log Message:
-----------
新しい実装のsshagent clientに切り替え
- PuTTYベースのsshagent clientから切り替え
- ttxsshのAboutBoxにsshagentの種別とバージョンを表示するようにした
- プロジェクトファイルを変更
- Visual Studio 2019
- Visual Studio 2022
- cmake
Modified Paths:
--------------
trunk/ttssh2/libsshagentc/CMakeLists.txt
trunk/ttssh2/libsshagentc/libputty.h
trunk/ttssh2/libsshagentc/putty/libputty.c
trunk/ttssh2/libsshagentc/skelton/skelton.c
trunk/ttssh2/libsshagentc/sshagentc/agentc.cpp
trunk/ttssh2/ttssh.v16.sln
trunk/ttssh2/ttssh.v17.sln
trunk/ttssh2/ttxssh/ttxssh.c
trunk/ttssh2/ttxssh/ttxssh.v16.vcxproj
trunk/ttssh2/ttxssh/ttxssh.v17.vcxproj
Added Paths:
-----------
trunk/ttssh2/libsshagentc/sshagentc/sshagentc.v16.vcxproj
-------------- next part --------------
Modified: trunk/ttssh2/libsshagentc/CMakeLists.txt
===================================================================
--- trunk/ttssh2/libsshagentc/CMakeLists.txt 2023-06-10 00:45:19 UTC (rev 10749)
+++ trunk/ttssh2/libsshagentc/CMakeLists.txt 2023-06-11 13:49:36 UTC (rev 10750)
@@ -4,11 +4,11 @@
# どの libsshagentc を使用するか
# すべて OFF の時、従来と同じ putty を使用する
option(SSHAGENTC_SKELTON "use skelton" OFF)
-option(SSHAGENTC_NEXT "use next sshagent" OFF)
+option(SSHAGENTC_SSHAGENTC "use next sshagent client" ON)
option(SSHAGENTC_TOOL "sshagentc test/debug tool" OFF)
-if(SSHAGENTC_NEXT)
+if(SSHAGENTC_SSHAGENTC)
add_subdirectory(sshagentc)
elseif(SSHAGENTC_SKELTON)
add_subdirectory(skelton)
Modified: trunk/ttssh2/libsshagentc/libputty.h
===================================================================
--- trunk/ttssh2/libsshagentc/libputty.h 2023-06-10 00:45:19 UTC (rev 10749)
+++ trunk/ttssh2/libsshagentc/libputty.h 2023-06-11 13:49:36 UTC (rev 10750)
@@ -52,6 +52,8 @@
BOOL putty_agent_exists(void);
// \x83G\x83\x89\x81[\x89\x9E\x93\x9A\x97p
+// 0x00 0x00 0x00 0x01 1 = uint32 length
+// 0x05 5 = AGENT FAILURE
#define SSH_AGENT_FAILURE_MSG "\x00\x00\x00\x01\x05"
// pageant.h
Modified: trunk/ttssh2/libsshagentc/putty/libputty.c
===================================================================
--- trunk/ttssh2/libsshagentc/putty/libputty.c 2023-06-10 00:45:19 UTC (rev 10749)
+++ trunk/ttssh2/libsshagentc/putty/libputty.c 2023-06-11 13:49:36 UTC (rev 10750)
@@ -255,10 +255,14 @@
return rsa_ssh1_public_blob_len(make_ptrlen(key, maxlen));
}
+// PuTTY\x82̃o\x81[\x83W\x83\x87\x83\x93\x82\xF0\x95Ԃ\xB7
const char *putty_get_version()
{
extern const char ver[]; /* in version.c */
- return ver;
+ static char ver_str[32];
+
+ sprintf_s(ver_str, sizeof(ver_str), "PuTTY %s", ver);
+ return ver_str;
}
void putty_agent_query_synchronous(const void *in, int inlen, void **out, int *outlen)
@@ -277,4 +281,3 @@
}
return FALSE;
}
-
Modified: trunk/ttssh2/libsshagentc/skelton/skelton.c
===================================================================
--- trunk/ttssh2/libsshagentc/skelton/skelton.c 2023-06-10 00:45:19 UTC (rev 10749)
+++ trunk/ttssh2/libsshagentc/skelton/skelton.c 2023-06-11 13:49:36 UTC (rev 10750)
@@ -1,3 +1,30 @@
+/*
+ * Copyright (C) 2023- TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
#include <stdlib.h>
#include "libputty.h"
@@ -39,7 +66,7 @@
const char *putty_get_version()
{
- return "libsshagent 0.0";
+ return "sshagentc skelton";
}
void putty_agent_query_synchronous(void *in, int inlen, void **out, int *outlen)
Modified: trunk/ttssh2/libsshagentc/sshagentc/agentc.cpp
===================================================================
--- trunk/ttssh2/libsshagentc/sshagentc/agentc.cpp 2023-06-10 00:45:19 UTC (rev 10749)
+++ trunk/ttssh2/libsshagentc/sshagentc/agentc.cpp 2023-06-11 13:49:36 UTC (rev 10750)
@@ -750,7 +750,7 @@
const char *putty_get_version()
{
- return "libsshagent 0.1";
+ return "libsshagent 1.0";
}
/**
Added: trunk/ttssh2/libsshagentc/sshagentc/sshagentc.v16.vcxproj
===================================================================
--- trunk/ttssh2/libsshagentc/sshagentc/sshagentc.v16.vcxproj (rev 0)
+++ trunk/ttssh2/libsshagentc/sshagentc/sshagentc.v16.vcxproj 2023-06-11 13:49:36 UTC (rev 10750)
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <VCProjectVersion>16.0</VCProjectVersion>
+ <Keyword>Win32Proj</Keyword>
+ <ProjectGuid>{b5323378-e523-4cb3-8484-85445b35d39b}</ProjectGuid>
+ <RootNamespace>sshagentc</RootNamespace>
+ <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Label="Shared">
+ </ImportGroup>
+ <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" />
+ </ImportGroup>
+ <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" />
+ </ImportGroup>
+ <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" />
+ </ImportGroup>
+ <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" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <WarningLevel>Level4</WarningLevel>
+ <SDLCheck>true</SDLCheck>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <WarningLevel>Level4</WarningLevel>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <SDLCheck>true</SDLCheck>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <SDLCheck>true</SDLCheck>
+ <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <ConformanceMode>true</ConformanceMode>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <SDLCheck>true</SDLCheck>
+ <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <ConformanceMode>true</ConformanceMode>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClInclude Include="..\libputty.h" />
+ <ClInclude Include="sha256.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="agentc.cpp" />
+ <ClCompile Include="sha256_bcrypt.cpp" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
Modified: trunk/ttssh2/ttssh.v16.sln
===================================================================
--- trunk/ttssh2/ttssh.v16.sln 2023-06-10 00:45:19 UTC (rev 10749)
+++ trunk/ttssh2/ttssh.v16.sln 2023-06-11 13:49:36 UTC (rev 10750)
@@ -6,10 +6,10 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttxssh", "ttxssh\ttxssh.v16.vcxproj", "{5638BB89-44E3-4D55-BA98-A01142B4223E}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "putty", "libsshagentc\putty\putty.v16.vcxproj", "{98CA1284-8F6C-4791-BF57-7E5FAD33744E}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "argon2", "argon2\argon2.v16.vcxproj", "{D33C59B8-E227-47D2-8F80-EDA3E28BF995}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sshagentc.v16", "libsshagentc\sshagentc\sshagentc.v16.vcxproj", "{B5323378-E523-4CB3-8484-85445B35D39B}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -24,16 +24,19 @@
{5638BB89-44E3-4D55-BA98-A01142B4223E}.Debug|Win32.Build.0 = Debug|Win32
{5638BB89-44E3-4D55-BA98-A01142B4223E}.Release|Win32.ActiveCfg = Release|Win32
{5638BB89-44E3-4D55-BA98-A01142B4223E}.Release|Win32.Build.0 = Release|Win32
- {98CA1284-8F6C-4791-BF57-7E5FAD33744E}.Debug|Win32.ActiveCfg = Debug|Win32
- {98CA1284-8F6C-4791-BF57-7E5FAD33744E}.Debug|Win32.Build.0 = Debug|Win32
- {98CA1284-8F6C-4791-BF57-7E5FAD33744E}.Release|Win32.ActiveCfg = Release|Win32
- {98CA1284-8F6C-4791-BF57-7E5FAD33744E}.Release|Win32.Build.0 = Release|Win32
{D33C59B8-E227-47D2-8F80-EDA3E28BF995}.Debug|Win32.ActiveCfg = Debug|Win32
{D33C59B8-E227-47D2-8F80-EDA3E28BF995}.Debug|Win32.Build.0 = Debug|Win32
{D33C59B8-E227-47D2-8F80-EDA3E28BF995}.Release|Win32.ActiveCfg = Release|Win32
{D33C59B8-E227-47D2-8F80-EDA3E28BF995}.Release|Win32.Build.0 = Release|Win32
+ {B5323378-E523-4CB3-8484-85445B35D39B}.Debug|Win32.ActiveCfg = Debug|Win32
+ {B5323378-E523-4CB3-8484-85445B35D39B}.Debug|Win32.Build.0 = Debug|Win32
+ {B5323378-E523-4CB3-8484-85445B35D39B}.Release|Win32.ActiveCfg = Release|Win32
+ {B5323378-E523-4CB3-8484-85445B35D39B}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {0A304DA2-C07B-4828-9F78-166B53FD7614}
+ EndGlobalSection
EndGlobal
Modified: trunk/ttssh2/ttssh.v17.sln
===================================================================
--- trunk/ttssh2/ttssh.v17.sln 2023-06-10 00:45:19 UTC (rev 10749)
+++ trunk/ttssh2/ttssh.v17.sln 2023-06-11 13:49:36 UTC (rev 10750)
@@ -1,14 +1,16 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
+VisualStudioVersion = 17.6.33723.286
+MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "matcher", "matcher\matcher.v17.vcxproj", "{C4B19BFB-8068-4EF2-A3A1-4EC4C40BE7F1}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttxssh", "ttxssh\ttxssh.v17.vcxproj", "{5638BB89-44E3-4D55-BA98-A01142B4223E}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "putty", "libsshagentc\putty\putty.v17.vcxproj", "{98CA1284-8F6C-4791-BF57-7E5FAD33744E}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "argon2", "argon2\argon2.v17.vcxproj", "{D33C59B8-E227-47D2-8F80-EDA3E28BF995}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sshagentc.v17", "libsshagentc\sshagentc\sshagentc.v17.vcxproj", "{B5323378-E523-4CB3-8484-85445B35D39B}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -23,16 +25,19 @@
{5638BB89-44E3-4D55-BA98-A01142B4223E}.Debug|Win32.Build.0 = Debug|Win32
{5638BB89-44E3-4D55-BA98-A01142B4223E}.Release|Win32.ActiveCfg = Release|Win32
{5638BB89-44E3-4D55-BA98-A01142B4223E}.Release|Win32.Build.0 = Release|Win32
- {98CA1284-8F6C-4791-BF57-7E5FAD33744E}.Debug|Win32.ActiveCfg = Debug|Win32
- {98CA1284-8F6C-4791-BF57-7E5FAD33744E}.Debug|Win32.Build.0 = Debug|Win32
- {98CA1284-8F6C-4791-BF57-7E5FAD33744E}.Release|Win32.ActiveCfg = Release|Win32
- {98CA1284-8F6C-4791-BF57-7E5FAD33744E}.Release|Win32.Build.0 = Release|Win32
{D33C59B8-E227-47D2-8F80-EDA3E28BF995}.Debug|Win32.ActiveCfg = Debug|Win32
{D33C59B8-E227-47D2-8F80-EDA3E28BF995}.Debug|Win32.Build.0 = Debug|Win32
{D33C59B8-E227-47D2-8F80-EDA3E28BF995}.Release|Win32.ActiveCfg = Release|Win32
{D33C59B8-E227-47D2-8F80-EDA3E28BF995}.Release|Win32.Build.0 = Release|Win32
+ {B5323378-E523-4CB3-8484-85445B35D39B}.Debug|Win32.ActiveCfg = Debug|Win32
+ {B5323378-E523-4CB3-8484-85445B35D39B}.Debug|Win32.Build.0 = Debug|Win32
+ {B5323378-E523-4CB3-8484-85445B35D39B}.Release|Win32.ActiveCfg = Release|Win32
+ {B5323378-E523-4CB3-8484-85445B35D39B}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {0A304DA2-C07B-4828-9F78-166B53FD7614}
+ EndGlobalSection
EndGlobal
Modified: trunk/ttssh2/ttxssh/ttxssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.c 2023-06-10 00:45:19 UTC (rev 10749)
+++ trunk/ttssh2/ttxssh/ttxssh.c 2023-06-11 13:49:36 UTC (rev 10750)
@@ -2073,12 +2073,12 @@
// TTSSH\x82̃o\x81[\x83W\x83\x87\x83\x93\x82\xF0\x90ݒ肷\x82\xE9 (2005.2.28 yutaka)
_snprintf_s(buf, sizeof(buf), _TRUNCATE,
"TTSSH\r\nTera Term Secure Shell extension, %d.%d\r\nCompatible with SSH protocol version 1.5 and 2.0", TTSSH_VERSION_MAJOR, TTSSH_VERSION_MINOR);
- SendMessage(GetDlgItem(dlg, IDC_TTSSH_VERSION), WM_SETTEXT, 0, (LPARAM)buf);
+ SetDlgItemTextA(dlg, IDC_TTSSH_VERSION, buf);
// OpenSSL\x82̃o\x81[\x83W\x83\x87\x83\x93\x82\xF0\x90ݒ肷\x82\xE9 (2005.1.24 yutaka)
// \x8F\xF0\x8C\x8F\x95\xB6\x92lj\xC1 (2005.5.11 yutaka)
// OPENSSL_VERSION_TEXT \x83}\x83N\x83\x8D\x92\xE8\x8B`\x82ł͂Ȃ\xAD\x81A\x8A\x94\x82\xF0\x8Eg\x82\xC1\x82ăo\x81[\x83W\x83\x87\x83\x93\x82\xF0\x8E擾\x82\xB7\x82\xE9\x81B(2013.11.24 yutaka)
- SendMessage(GetDlgItem(dlg, IDC_OPENSSL_VERSION), WM_SETTEXT, 0, (LPARAM)SSLeay_version(SSLEAY_VERSION));
+ SetDlgItemTextA(dlg, IDC_OPENSSL_VERSION, SSLeay_version(SSLEAY_VERSION));
// zlib\x82̃o\x81[\x83W\x83\x87\x83\x93\x82\xF0\x90ݒ肷\x82\xE9 (2005.5.11 yutaka)
#ifdef ZLIB_VERSION
@@ -2086,11 +2086,10 @@
#else
_snprintf(buf, sizeof(buf), "ZLib Unknown");
#endif
- SendMessage(GetDlgItem(dlg, IDC_ZLIB_VERSION), WM_SETTEXT, 0, (LPARAM)buf);
+ SetDlgItemTextA(dlg, IDC_ZLIB_VERSION, buf);
- // PuTTY\x82̃o\x81[\x83W\x83\x87\x83\x93\x82\xF0\x90ݒ肷\x82\xE9 (2011.7.26 yutaka)
- _snprintf_s(buf, sizeof(buf), _TRUNCATE, "PuTTY %s", putty_get_version());
- SendMessage(GetDlgItem(dlg, IDC_PUTTY_VERSION), WM_SETTEXT, 0, (LPARAM)buf);
+ // ssh agent client \x82̎\xED\x97ނƃo\x81[\x83W\x83\x87\x83\x93\x82\xF0\x95\\x8E\xA6
+ SetDlgItemTextA(dlg, IDC_PUTTY_VERSION, putty_get_version());
}
static WNDPROC g_defAboutDlgEditWndProc; // Edit Control\x82̃T\x83u\x83N\x83\x89\x83X\x89\xBB\x97p
Modified: trunk/ttssh2/ttxssh/ttxssh.v16.vcxproj
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.v16.vcxproj 2023-06-10 00:45:19 UTC (rev 10749)
+++ trunk/ttssh2/ttxssh/ttxssh.v16.vcxproj 2023-06-11 13:49:36 UTC (rev 10750)
@@ -80,7 +80,7 @@
<AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalDependencies>common_static.lib;ws2_32.lib;crypto-50.lib;Bcrypt.lib;zlibd.lib;ttpcmn.lib;dnsapi.lib;comctl32.lib;setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>common_static.lib;ws2_32.lib;crypto-50.lib;Bcrypt.lib;zlibd.lib;ttpcmn.lib;dnsapi.lib;comctl32.lib;setupapi.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>$(SolutionDir)..\libs\libressl\crypto\Debug;$(SolutionDir)..\libs\zlib;$(SolutionDir)..\teraterm\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
@@ -124,7 +124,7 @@
<AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalDependencies>common_static.lib;ws2_32.lib;crypto-50.lib;Bcrypt.lib;zlib.lib;ttpcmn.lib;dnsapi.lib;comctl32.lib;setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>common_static.lib;ws2_32.lib;crypto-50.lib;Bcrypt.lib;zlib.lib;ttpcmn.lib;dnsapi.lib;comctl32.lib;setupapi.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>$(SolutionDir)..\libs\libressl\crypto\Release;$(SolutionDir)..\libs\zlib;$(SolutionDir)..\teraterm\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
@@ -238,9 +238,8 @@
<Project>{d33c59b8-e227-47d2-8f80-eda3e28bf995}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="..\libsshagentc\putty\putty.v16.vcxproj">
- <Project>{98ca1284-8f6c-4791-bf57-7e5fad33744e}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ <ProjectReference Include="..\libsshagentc\sshagentc\sshagentc.v16.vcxproj">
+ <Project>{b5323378-e523-4cb3-8484-85445b35d39b}</Project>
</ProjectReference>
</ItemGroup>
<ItemGroup>
Modified: trunk/ttssh2/ttxssh/ttxssh.v17.vcxproj
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.v17.vcxproj 2023-06-10 00:45:19 UTC (rev 10749)
+++ trunk/ttssh2/ttxssh/ttxssh.v17.vcxproj 2023-06-11 13:49:36 UTC (rev 10750)
@@ -80,7 +80,7 @@
<AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalDependencies>common_static.lib;ws2_32.lib;crypto-50.lib;Bcrypt.lib;zlibd.lib;ttpcmn.lib;dnsapi.lib;comctl32.lib;setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>common_static.lib;ws2_32.lib;crypto-50.lib;Bcrypt.lib;zlibd.lib;ttpcmn.lib;dnsapi.lib;comctl32.lib;setupapi.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>$(SolutionDir)..\libs\libressl\crypto\Debug;$(SolutionDir)..\libs\zlib;$(SolutionDir)..\teraterm\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
@@ -124,7 +124,7 @@
<AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalDependencies>common_static.lib;ws2_32.lib;crypto-50.lib;Bcrypt.lib;zlib.lib;ttpcmn.lib;dnsapi.lib;comctl32.lib;setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>common_static.lib;ws2_32.lib;crypto-50.lib;Bcrypt.lib;zlib.lib;ttpcmn.lib;dnsapi.lib;comctl32.lib;setupapi.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>$(SolutionDir)..\libs\libressl\crypto\Release;$(SolutionDir)..\libs\zlib;$(SolutionDir)..\teraterm\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
@@ -238,9 +238,8 @@
<Project>{d33c59b8-e227-47d2-8f80-eda3e28bf995}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="..\libsshagentc\putty\putty.v17.vcxproj">
- <Project>{98ca1284-8f6c-4791-bf57-7e5fad33744e}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ <ProjectReference Include="..\libsshagentc\sshagentc\sshagentc.v17.vcxproj">
+ <Project>{b5323378-e523-4cb3-8484-85445b35d39b}</Project>
</ProjectReference>
</ItemGroup>
<ItemGroup>
@@ -249,4 +248,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
\ No newline at end of file