Tera TermRevision: 10693
https://osdn.net/projects/ttssh2/scm/svn/commits/10693
Author: zmatsuo
Date: 2023-05-02 22:27:32 +0900 (Tue, 02 May 2023)
Log Message:
-----------
ttssh2/libagentc/putty/ をビルドできるよう修正
- libputty.h
- libsshagent インターフェイス
- C++ からの利用も考慮
- putty_agent_query_synchronous() に const 追加
- CMakeLists.txt, プロジェクトファイル を調整
Modified Paths:
--------------
trunk/ttssh2/CMakeLists.txt
trunk/ttssh2/libsshagentc/putty/CMakeLists.txt
trunk/ttssh2/libsshagentc/putty/libputty.c
trunk/ttssh2/libsshagentc/putty/putty.v16.vcxproj
trunk/ttssh2/libsshagentc/putty/putty.v16.vcxproj.filters
trunk/ttssh2/libsshagentc/putty/putty.v17.vcxproj
trunk/ttssh2/libsshagentc/putty/putty.v17.vcxproj.filters
trunk/ttssh2/ttssh.v16.sln
trunk/ttssh2/ttssh.v17.sln
trunk/ttssh2/ttxssh/CMakeLists.txt
trunk/ttssh2/ttxssh/ttxssh.v16.vcxproj
trunk/ttssh2/ttxssh/ttxssh.v17.vcxproj
Added Paths:
-----------
trunk/ttssh2/libsshagentc/CMakeLists.txt
trunk/ttssh2/libsshagentc/README.md
trunk/ttssh2/libsshagentc/libputty.h
Removed Paths:
-------------
trunk/ttssh2/libsshagentc/putty/libputty.h
-------------- next part --------------
Modified: trunk/ttssh2/CMakeLists.txt
===================================================================
--- trunk/ttssh2/CMakeLists.txt 2023-05-02 13:27:22 UTC (rev 10692)
+++ trunk/ttssh2/CMakeLists.txt 2023-05-02 13:27:32 UTC (rev 10693)
@@ -4,8 +4,8 @@
add_subdirectory(matcher)
set_target_properties(matcher PROPERTIES FOLDER ttssh2)
-add_subdirectory(putty)
-set_target_properties(libputty PROPERTIES FOLDER ttssh2)
-
add_subdirectory(argon2)
set_target_properties(argon2 PROPERTIES FOLDER ttssh2)
+
+add_subdirectory(libsshagentc)
+set_target_properties(libsshagentc PROPERTIES FOLDER ttssh2)
Added: trunk/ttssh2/libsshagentc/CMakeLists.txt
===================================================================
--- trunk/ttssh2/libsshagentc/CMakeLists.txt (rev 0)
+++ trunk/ttssh2/libsshagentc/CMakeLists.txt 2023-05-02 13:27:32 UTC (rev 10693)
@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 3.11)
+project(libsshagentc)
+
+add_subdirectory(putty)
Added: trunk/ttssh2/libsshagentc/README.md
===================================================================
--- trunk/ttssh2/libsshagentc/README.md (rev 0)
+++ trunk/ttssh2/libsshagentc/README.md 2023-05-02 13:27:32 UTC (rev 10693)
@@ -0,0 +1,16 @@
+# libsshagentc
+
+- ssh-agent と通信するためのライブラリ
+
+ファイル/フォルダ
+
+- libputty.h
+ - libsshagentc インターフェイス
+- putty/
+ - putty 0.76 を利用した ssh-agent client
+
+# 資料
+
+- SSH Agent Protocol
+ - https://datatracker.ietf.org/doc/html/draft-miller-ssh-agent-04
+- https://qiita.com/slotport/items/e1d5a5dbd3aa7c6a2a24
Copied: trunk/ttssh2/libsshagentc/libputty.h (from rev 10692, trunk/ttssh2/libsshagentc/putty/libputty.h)
===================================================================
--- trunk/ttssh2/libsshagentc/libputty.h (rev 0)
+++ trunk/ttssh2/libsshagentc/libputty.h 2023-05-02 13:27:32 UTC (rev 10693)
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2008- 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.
+ */
+// PuTTY is copyright 1997-2021 Simon Tatham.
+
+#include <windows.h> // for BOOL
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int putty_get_ssh2_keylist(unsigned char **keylist);
+void *putty_sign_ssh2_key(unsigned char *pubkey,
+ unsigned char *data,
+ int datalen,
+ int *outlen,
+ int signflags);
+int putty_get_ssh1_keylist(unsigned char **keylist);
+void *putty_hash_ssh1_challenge(unsigned char *pubkey,
+ int pubkeylen,
+ unsigned char *data,
+ int datalen,
+ unsigned char *session_id,
+ int *outlen);
+int putty_get_ssh1_keylen(unsigned char *key, int maxlen);
+const char *putty_get_version();
+void putty_agent_query_synchronous(const void *req_ptr, int req_len, void **rep_ptr, int *rep_len);
+BOOL putty_agent_exists(void);
+
+// \x83G\x83\x89\x81[\x89\x9E\x93\x9A\x97p
+#define SSH_AGENT_FAILURE_MSG "\x00\x00\x00\x01\x05"
+
+// pageant.h
+#define AGENT_MAX_MSGLEN 262144
+
+// puttymen.h
+// memory.c
+extern void safefree(void *);
+
+#ifdef __cplusplus
+}
+#endif
Modified: trunk/ttssh2/libsshagentc/putty/CMakeLists.txt
===================================================================
--- trunk/ttssh2/libsshagentc/putty/CMakeLists.txt 2023-05-02 13:27:22 UTC (rev 10692)
+++ trunk/ttssh2/libsshagentc/putty/CMakeLists.txt 2023-05-02 13:27:32 UTC (rev 10693)
@@ -1,5 +1,7 @@
-project(libputty)
+set(PACKAGE_NAME "libsshagentc")
+project(${PACKAGE_NAME})
+
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
if(MINGW)
@@ -7,53 +9,56 @@
endif()
set(PUTTY_SRC
- ../../libs/putty/aqsync.c
- ../../libs/putty/callback.c
- ../../libs/putty/errsock.c
- ../../libs/putty/marshal.c
- ../../libs/putty/memory.c
- ../../libs/putty/mpint.c
- ../../libs/putty/sshsh256.c
- ../../libs/putty/tree234.c
- ../../libs/putty/utils.c
- ../../libs/putty/version.c
- ../../libs/putty/windows/wincapi.c
- ../../libs/putty/windows/winhandl.c
- ../../libs/putty/windows/winhsock.c
- ../../libs/putty/windows/winmisc.c
- ../../libs/putty/windows/winnpc.c
- ../../libs/putty/windows/winpgntc.c
- ../../libs/putty/windows/winsecur.c
- )
+ ../../../libs/putty/aqsync.c
+ ../../../libs/putty/callback.c
+ ../../../libs/putty/errsock.c
+ ../../../libs/putty/marshal.c
+ ../../../libs/putty/memory.c
+ ../../../libs/putty/mpint.c
+ ../../../libs/putty/sshsh256.c
+ ../../../libs/putty/tree234.c
+ ../../../libs/putty/utils.c
+ ../../../libs/putty/version.c
+ ../../../libs/putty/windows/wincapi.c
+ ../../../libs/putty/windows/winhandl.c
+ ../../../libs/putty/windows/winhsock.c
+ ../../../libs/putty/windows/winmisc.c
+ ../../../libs/putty/windows/winnpc.c
+ ../../../libs/putty/windows/winpgntc.c
+ ../../../libs/putty/windows/winsecur.c
+)
source_group(
"putty"
FILES
${PUTTY_SRC}
- )
+)
set(SRC
libputty.c
- libputty.h
+ ../libputty.h
putty-import.c
- )
+)
-include_directories(
- ../../libs/putty
- ../../libs/putty/windows
- .
- )
-
add_library(
- libputty
+ ${PACKAGE_NAME}
${SRC}
${PUTTY_SRC}
)
+target_include_directories(
+ ${PACKAGE_NAME}
+ PRIVATE
+ ..
+ ../../../libs/putty
+ ../../../libs/putty/windows
+ .
+)
+
# sshsh256.c, sshsh512.c で出るエラーを回避
if(MINGW)
target_compile_definitions(
- libputty
+ ${PACKAGE_NAME}
PRIVATE
_FORCE_SOFTWARE_SHA
)
Modified: trunk/ttssh2/libsshagentc/putty/libputty.c
===================================================================
--- trunk/ttssh2/libsshagentc/putty/libputty.c 2023-05-02 13:27:22 UTC (rev 10692)
+++ trunk/ttssh2/libsshagentc/putty/libputty.c 2023-05-02 13:27:32 UTC (rev 10693)
@@ -261,7 +261,7 @@
return ver;
}
-void putty_agent_query_synchronous(void *in, int inlen, void **out, int *outlen)
+void putty_agent_query_synchronous(const void *in, int inlen, void **out, int *outlen)
{
strbuf *buf = strbuf_new();
Deleted: trunk/ttssh2/libsshagentc/putty/libputty.h
===================================================================
--- trunk/ttssh2/libsshagentc/putty/libputty.h 2023-05-02 13:27:22 UTC (rev 10692)
+++ trunk/ttssh2/libsshagentc/putty/libputty.h 2023-05-02 13:27:32 UTC (rev 10693)
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2008- 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.
- */
-// PuTTY is copyright 1997-2021 Simon Tatham.
-
-int putty_get_ssh2_keylist(unsigned char **keylist);
-void *putty_sign_ssh2_key(unsigned char *pubkey,
- unsigned char *data,
- int datalen,
- int *outlen,
- int signflags);
-int putty_get_ssh1_keylist(unsigned char **keylist);
-void *putty_hash_ssh1_challenge(unsigned char *pubkey,
- int pubkeylen,
- unsigned char *data,
- int datalen,
- unsigned char *session_id,
- int *outlen);
-int putty_get_ssh1_keylen(unsigned char *key, int maxlen);
-const char *putty_get_version();
-void putty_agent_query_synchronous(void *in, int inlen, void **out, int *outlen);
-BOOL putty_agent_exists();
-
-// \x83G\x83\x89\x81[\x89\x9E\x93\x9A\x97p
-#define SSH_AGENT_FAILURE_MSG "\x00\x00\x00\x01\x05"
-
-// pageant.h
-#define AGENT_MAX_MSGLEN 262144
-
-// puttymen.h
-// memory.c
-extern void safefree(void *);
-
Modified: trunk/ttssh2/libsshagentc/putty/putty.v16.vcxproj
===================================================================
--- trunk/ttssh2/libsshagentc/putty/putty.v16.vcxproj 2023-05-02 13:27:22 UTC (rev 10692)
+++ trunk/ttssh2/libsshagentc/putty/putty.v16.vcxproj 2023-05-02 13:27:32 UTC (rev 10693)
@@ -52,7 +52,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(SolutionDir)..\libs\putty;$(SolutionDir)..\libs\putty\windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(SolutionDir)libsshagentc;$(SolutionDir)..\libs\putty;$(SolutionDir)..\libs\putty\windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WINDOWS;_CRT_SECURE_NO_DEPRECATE;SECURITY_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -64,7 +64,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
- <AdditionalIncludeDirectories>$(SolutionDir)..\libs\putty;$(SolutionDir)..\libs\putty\windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(SolutionDir)libsshagentc;$(SolutionDir)..\libs\putty;$(SolutionDir)..\libs\putty\windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WINDOWS;_CRT_SECURE_NO_DEPRECATE;SECURITY_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
@@ -73,23 +73,23 @@
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\libs\putty\aqsync.c" />
- <ClCompile Include="..\..\libs\putty\callback.c" />
- <ClCompile Include="..\..\libs\putty\errsock.c" />
- <ClCompile Include="..\..\libs\putty\marshal.c" />
- <ClCompile Include="..\..\libs\putty\memory.c" />
- <ClCompile Include="..\..\libs\putty\mpint.c" />
- <ClCompile Include="..\..\libs\putty\sshsh256.c" />
- <ClCompile Include="..\..\libs\putty\tree234.c" />
- <ClCompile Include="..\..\libs\putty\utils.c" />
- <ClCompile Include="..\..\libs\putty\version.c" />
- <ClCompile Include="..\..\libs\putty\windows\wincapi.c" />
- <ClCompile Include="..\..\libs\putty\windows\winhandl.c" />
- <ClCompile Include="..\..\libs\putty\windows\winhsock.c" />
- <ClCompile Include="..\..\libs\putty\windows\winmisc.c" />
- <ClCompile Include="..\..\libs\putty\windows\winnpc.c" />
- <ClCompile Include="..\..\libs\putty\windows\winpgntc.c" />
- <ClCompile Include="..\..\libs\putty\windows\winsecur.c" />
+ <ClCompile Include="..\..\..\libs\putty\aqsync.c" />
+ <ClCompile Include="..\..\..\libs\putty\callback.c" />
+ <ClCompile Include="..\..\..\libs\putty\errsock.c" />
+ <ClCompile Include="..\..\..\libs\putty\marshal.c" />
+ <ClCompile Include="..\..\..\libs\putty\memory.c" />
+ <ClCompile Include="..\..\..\libs\putty\mpint.c" />
+ <ClCompile Include="..\..\..\libs\putty\sshsh256.c" />
+ <ClCompile Include="..\..\..\libs\putty\tree234.c" />
+ <ClCompile Include="..\..\..\libs\putty\utils.c" />
+ <ClCompile Include="..\..\..\libs\putty\version.c" />
+ <ClCompile Include="..\..\..\libs\putty\windows\wincapi.c" />
+ <ClCompile Include="..\..\..\libs\putty\windows\winhandl.c" />
+ <ClCompile Include="..\..\..\libs\putty\windows\winhsock.c" />
+ <ClCompile Include="..\..\..\libs\putty\windows\winmisc.c" />
+ <ClCompile Include="..\..\..\libs\putty\windows\winnpc.c" />
+ <ClCompile Include="..\..\..\libs\putty\windows\winpgntc.c" />
+ <ClCompile Include="..\..\..\libs\putty\windows\winsecur.c" />
<ClCompile Include="libputty.c" />
<ClCompile Include="putty-import.c" />
</ItemGroup>
@@ -99,4 +99,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
Modified: trunk/ttssh2/libsshagentc/putty/putty.v16.vcxproj.filters
===================================================================
--- trunk/ttssh2/libsshagentc/putty/putty.v16.vcxproj.filters 2023-05-02 13:27:22 UTC (rev 10692)
+++ trunk/ttssh2/libsshagentc/putty/putty.v16.vcxproj.filters 2023-05-02 13:27:32 UTC (rev 10693)
@@ -6,55 +6,55 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\libs\putty\aqsync.c">
+ <ClCompile Include="..\..\..\libs\putty\aqsync.c">
<Filter>Putty Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\libs\putty\callback.c">
+ <ClCompile Include="..\..\..\libs\putty\callback.c">
<Filter>Putty Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\libs\putty\errsock.c">
+ <ClCompile Include="..\..\..\libs\putty\errsock.c">
<Filter>Putty Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\libs\putty\marshal.c">
+ <ClCompile Include="..\..\..\libs\putty\marshal.c">
<Filter>Putty Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\libs\putty\memory.c">
+ <ClCompile Include="..\..\..\libs\putty\memory.c">
<Filter>Putty Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\libs\putty\mpint.c">
+ <ClCompile Include="..\..\..\libs\putty\mpint.c">
<Filter>Putty Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\libs\putty\sshsh256.c">
+ <ClCompile Include="..\..\..\libs\putty\sshsh256.c">
<Filter>Putty Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\libs\putty\tree234.c">
+ <ClCompile Include="..\..\..\libs\putty\tree234.c">
<Filter>Putty Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\libs\putty\utils.c">
+ <ClCompile Include="..\..\..\libs\putty\utils.c">
<Filter>Putty Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\libs\putty\version.c">
+ <ClCompile Include="..\..\..\libs\putty\version.c">
<Filter>Putty Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\libs\putty\windows\wincapi.c">
+ <ClCompile Include="..\..\..\libs\putty\windows\wincapi.c">
<Filter>Putty Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\libs\putty\windows\winhandl.c">
+ <ClCompile Include="..\..\..\libs\putty\windows\winhandl.c">
<Filter>Putty Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\libs\putty\windows\winhsock.c">
+ <ClCompile Include="..\..\..\libs\putty\windows\winhsock.c">
<Filter>Putty Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\libs\putty\windows\winmisc.c">
+ <ClCompile Include="..\..\..\libs\putty\windows\winmisc.c">
<Filter>Putty Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\libs\putty\windows\winnpc.c">
+ <ClCompile Include="..\..\..\libs\putty\windows\winnpc.c">
<Filter>Putty Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\libs\putty\windows\winpgntc.c">
+ <ClCompile Include="..\..\..\libs\putty\windows\winpgntc.c">
<Filter>Putty Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\libs\putty\windows\winsecur.c">
+ <ClCompile Include="..\..\..\libs\putty\windows\winsecur.c">
<Filter>Putty Files</Filter>
</ClCompile>
<ClCompile Include="libputty.c" />
Modified: trunk/ttssh2/libsshagentc/putty/putty.v17.vcxproj
===================================================================
--- trunk/ttssh2/libsshagentc/putty/putty.v17.vcxproj 2023-05-02 13:27:22 UTC (rev 10692)
+++ trunk/ttssh2/libsshagentc/putty/putty.v17.vcxproj 2023-05-02 13:27:32 UTC (rev 10693)
@@ -52,7 +52,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(SolutionDir)..\libs\putty;$(SolutionDir)..\libs\putty\windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(SolutionDir)libsshagentc;$(SolutionDir)..\libs\putty;$(SolutionDir)..\libs\putty\windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WINDOWS;_CRT_SECURE_NO_DEPRECATE;SECURITY_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -64,7 +64,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
- <AdditionalIncludeDirectories>$(SolutionDir)..\libs\putty;$(SolutionDir)..\libs\putty\windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(SolutionDir)libsshagentc;$(SolutionDir)..\libs\putty;$(SolutionDir)..\libs\putty\windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WINDOWS;_CRT_SECURE_NO_DEPRECATE;SECURITY_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
@@ -73,23 +73,23 @@
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\libs\putty\aqsync.c" />
- <ClCompile Include="..\..\libs\putty\callback.c" />
- <ClCompile Include="..\..\libs\putty\errsock.c" />
- <ClCompile Include="..\..\libs\putty\marshal.c" />
- <ClCompile Include="..\..\libs\putty\memory.c" />
- <ClCompile Include="..\..\libs\putty\mpint.c" />
- <ClCompile Include="..\..\libs\putty\sshsh256.c" />
- <ClCompile Include="..\..\libs\putty\tree234.c" />
- <ClCompile Include="..\..\libs\putty\utils.c" />
- <ClCompile Include="..\..\libs\putty\version.c" />
- <ClCompile Include="..\..\libs\putty\windows\wincapi.c" />
- <ClCompile Include="..\..\libs\putty\windows\winhandl.c" />
- <ClCompile Include="..\..\libs\putty\windows\winhsock.c" />
- <ClCompile Include="..\..\libs\putty\windows\winmisc.c" />
- <ClCompile Include="..\..\libs\putty\windows\winnpc.c" />
- <ClCompile Include="..\..\libs\putty\windows\winpgntc.c" />
- <ClCompile Include="..\..\libs\putty\windows\winsecur.c" />
+ <ClCompile Include="..\..\..\libs\putty\aqsync.c" />
+ <ClCompile Include="..\..\..\libs\putty\callback.c" />
+ <ClCompile Include="..\..\..\libs\putty\errsock.c" />
+ <ClCompile Include="..\..\..\libs\putty\marshal.c" />
+ <ClCompile Include="..\..\..\libs\putty\memory.c" />
+ <ClCompile Include="..\..\..\libs\putty\mpint.c" />
+ <ClCompile Include="..\..\..\libs\putty\sshsh256.c" />
+ <ClCompile Include="..\..\..\libs\putty\tree234.c" />
+ <ClCompile Include="..\..\..\libs\putty\utils.c" />
+ <ClCompile Include="..\..\..\libs\putty\version.c" />
+ <ClCompile Include="..\..\..\libs\putty\windows\wincapi.c" />
+ <ClCompile Include="..\..\..\libs\putty\windows\winhandl.c" />
+ <ClCompile Include="..\..\..\libs\putty\windows\winhsock.c" />
+ <ClCompile Include="..\..\..\libs\putty\windows\winmisc.c" />
+ <ClCompile Include="..\..\..\libs\putty\windows\winnpc.c" />
+ <ClCompile Include="..\..\..\libs\putty\windows\winpgntc.c" />
+ <ClCompile Include="..\..\..\libs\putty\windows\winsecur.c" />
<ClCompile Include="libputty.c" />
<ClCompile Include="putty-import.c" />
</ItemGroup>
@@ -99,4 +99,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
Modified: trunk/ttssh2/libsshagentc/putty/putty.v17.vcxproj.filters
===================================================================
--- trunk/ttssh2/libsshagentc/putty/putty.v17.vcxproj.filters 2023-05-02 13:27:22 UTC (rev 10692)
+++ trunk/ttssh2/libsshagentc/putty/putty.v17.vcxproj.filters 2023-05-02 13:27:32 UTC (rev 10693)
@@ -6,55 +6,55 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\libs\putty\aqsync.c">
+ <ClCompile Include="..\..\..\libs\putty\aqsync.c">
<Filter>Putty Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\libs\putty\callback.c">
+ <ClCompile Include="..\..\..\libs\putty\callback.c">
<Filter>Putty Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\libs\putty\errsock.c">
+ <ClCompile Include="..\..\..\libs\putty\errsock.c">
<Filter>Putty Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\libs\putty\marshal.c">
+ <ClCompile Include="..\..\..\libs\putty\marshal.c">
<Filter>Putty Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\libs\putty\memory.c">
+ <ClCompile Include="..\..\..\libs\putty\memory.c">
<Filter>Putty Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\libs\putty\mpint.c">
+ <ClCompile Include="..\..\..\libs\putty\mpint.c">
<Filter>Putty Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\libs\putty\sshsh256.c">
+ <ClCompile Include="..\..\..\libs\putty\sshsh256.c">
<Filter>Putty Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\libs\putty\tree234.c">
+ <ClCompile Include="..\..\..\libs\putty\tree234.c">
<Filter>Putty Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\libs\putty\utils.c">
+ <ClCompile Include="..\..\..\libs\putty\utils.c">
<Filter>Putty Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\libs\putty\version.c">
+ <ClCompile Include="..\..\..\libs\putty\version.c">
<Filter>Putty Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\libs\putty\windows\wincapi.c">
+ <ClCompile Include="..\..\..\libs\putty\windows\wincapi.c">
<Filter>Putty Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\libs\putty\windows\winhandl.c">
+ <ClCompile Include="..\..\..\libs\putty\windows\winhandl.c">
<Filter>Putty Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\libs\putty\windows\winhsock.c">
+ <ClCompile Include="..\..\..\libs\putty\windows\winhsock.c">
<Filter>Putty Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\libs\putty\windows\winmisc.c">
+ <ClCompile Include="..\..\..\libs\putty\windows\winmisc.c">
<Filter>Putty Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\libs\putty\windows\winnpc.c">
+ <ClCompile Include="..\..\..\libs\putty\windows\winnpc.c">
<Filter>Putty Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\libs\putty\windows\winpgntc.c">
+ <ClCompile Include="..\..\..\libs\putty\windows\winpgntc.c">
<Filter>Putty Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\libs\putty\windows\winsecur.c">
+ <ClCompile Include="..\..\..\libs\putty\windows\winsecur.c">
<Filter>Putty Files</Filter>
</ClCompile>
<ClCompile Include="libputty.c" />
@@ -63,4 +63,4 @@
<ItemGroup>
<ClInclude Include="libputty.h" />
</ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
Modified: trunk/ttssh2/ttssh.v16.sln
===================================================================
--- trunk/ttssh2/ttssh.v16.sln 2023-05-02 13:27:22 UTC (rev 10692)
+++ trunk/ttssh2/ttssh.v16.sln 2023-05-02 13:27:32 UTC (rev 10693)
@@ -6,7 +6,7 @@
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", "putty\putty.v16.vcxproj", "{98CA1284-8F6C-4791-BF57-7E5FAD33744E}"
+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
Modified: trunk/ttssh2/ttssh.v17.sln
===================================================================
--- trunk/ttssh2/ttssh.v17.sln 2023-05-02 13:27:22 UTC (rev 10692)
+++ trunk/ttssh2/ttssh.v17.sln 2023-05-02 13:27:32 UTC (rev 10693)
@@ -5,7 +5,7 @@
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", "putty\putty.v17.vcxproj", "{98CA1284-8F6C-4791-BF57-7E5FAD33744E}"
+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
Modified: trunk/ttssh2/ttxssh/CMakeLists.txt
===================================================================
--- trunk/ttssh2/ttxssh/CMakeLists.txt 2023-05-02 13:27:22 UTC (rev 10692)
+++ trunk/ttssh2/ttxssh/CMakeLists.txt 2023-05-02 13:27:32 UTC (rev 10693)
@@ -160,7 +160,7 @@
PRIVATE
../../teraterm/teraterm
../matcher
- ../putty
+ ../libsshagentc
../../libs/include
${ZLIB_INCLUDE_DIRS}
)
@@ -211,7 +211,7 @@
${PACKAGE_NAME}
PRIVATE
common_static
- libputty
+ libsshagentc
ttpcmn
argon2
${ZLIB_LIB}
Modified: trunk/ttssh2/ttxssh/ttxssh.v16.vcxproj
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.v16.vcxproj 2023-05-02 13:27:22 UTC (rev 10692)
+++ trunk/ttssh2/ttxssh/ttxssh.v16.vcxproj 2023-05-02 13:27:32 UTC (rev 10693)
@@ -62,7 +62,7 @@
<ClCompile>
<AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\libs\libressl\include;$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\libs\zlib;$(SolutionDir)matcher;$(SolutionDir)putty;$(SolutionDir)argon2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\libs\libressl\include;$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\libs\zlib;$(SolutionDir)matcher;$(SolutionDir)libsshagentc;$(SolutionDir)argon2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -107,7 +107,7 @@
<AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\libs\libressl\include;$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\libs\zlib;$(SolutionDir)matcher;$(SolutionDir)putty;$(SolutionDir)argon2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\libs\libressl\include;$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\libs\zlib;$(SolutionDir)matcher;$(SolutionDir)libsshagentc;$(SolutionDir)argon2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -238,7 +238,7 @@
<Project>{d33c59b8-e227-47d2-8f80-eda3e28bf995}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="..\putty\putty.v16.vcxproj">
+ <ProjectReference Include="..\libsshagentc\putty.v16.vcxproj">
<Project>{98ca1284-8f6c-4791-bf57-7e5fad33744e}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
@@ -249,4 +249,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
Modified: trunk/ttssh2/ttxssh/ttxssh.v17.vcxproj
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.v17.vcxproj 2023-05-02 13:27:22 UTC (rev 10692)
+++ trunk/ttssh2/ttxssh/ttxssh.v17.vcxproj 2023-05-02 13:27:32 UTC (rev 10693)
@@ -62,7 +62,7 @@
<ClCompile>
<AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\libs\libressl\include;$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\libs\zlib;$(SolutionDir)matcher;$(SolutionDir)putty;$(SolutionDir)argon2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\libs\libressl\include;$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\libs\zlib;$(SolutionDir)matcher;$(SolutionDir)libsshagentc;$(SolutionDir)argon2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -107,7 +107,7 @@
<AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\libs\libressl\include;$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\libs\zlib;$(SolutionDir)matcher;$(SolutionDir)putty;$(SolutionDir)argon2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\libs\libressl\include;$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\libs\zlib;$(SolutionDir)matcher;$(SolutionDir)libsshagentc;$(SolutionDir)argon2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -238,7 +238,7 @@
<Project>{d33c59b8-e227-47d2-8f80-eda3e28bf995}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="..\putty\putty.v17.vcxproj">
+ <ProjectReference Include="..\libsshagentc\putty\putty.v17.vcxproj">
<Project>{98ca1284-8f6c-4791-bf57-7e5fad33744e}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>