Tera Term

[Ttssh2-commit] [6622] PuTTY 0.68 にアップデート

svnno****@sourc***** svnno****@sourc*****
2017年 3月 11日 (土) 08:37:48 JST

• 前の記事 [Ttssh2-commit] [6621] base64 decode を ISC 由来のコードから自前実装に変更 [Ttssh2-devel 3043]
• 次の記事 [Ttssh2-commit] [6623] フォントの指定忘れを修正
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]

Revision: 6622
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6622
Author:   maya
Date:     2017-03-11 08:37:47 +0900 (Sat, 11 Mar 2017)
Log Message:
-----------
PuTTY 0.68 にアップデート

sshbn.c の先の依存関係が激しくなったので、使うだけ関数を libputty.c にコピー
プロジェクトに読み込まなくてよいファイルの登録を vcproj から削除
メッセージの長さを修正
  https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=66b5455b139942ff08625ac194e4e4a3f27abcf5

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/en/html/reference/develop.txt
    trunk/doc/ja/html/about/history.html
    trunk/doc/ja/html/reference/develop.txt
    trunk/ttssh2/putty/libputty.c
    trunk/ttssh2/putty/libputty.h
    trunk/ttssh2/putty/putty.v10.vcxproj
    trunk/ttssh2/putty/putty.v10.vcxproj.filters
    trunk/ttssh2/putty/putty.v11.vcxproj
    trunk/ttssh2/putty/putty.v11.vcxproj.filters
    trunk/ttssh2/putty/putty.v12.vcxproj
    trunk/ttssh2/putty/putty.v12.vcxproj.filters
    trunk/ttssh2/putty/putty.v14.vcxproj
    trunk/ttssh2/putty/putty.v14.vcxproj.filters
    trunk/ttssh2/putty/putty.v9.vcproj
    trunk/ttssh2/putty/putty.vcproj

-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2017-03-09 07:55:28 UTC (rev 6621)
+++ trunk/doc/en/html/about/history.html	2017-03-10 23:37:47 UTC (rev 6622)
@@ -2842,6 +2842,28 @@
 <h2><a name="ttssh">TTSSH</a></h2>
 
 
+<h3><a name="ttssh_2.81">2017.05.xx (Ver 2.81)</a></h3>
+<ul class="history">
+  <!-- li>Changes
+    <ul>
+      <li></li>
+    </ul>
+  </li -->
+
+  <!--li>Bug fixes
+    <ul>
+      <li></li>
+    </ul>
+  </li-->
+
+  <li>Misc
+    <ul>
+      <li>upgraded PuTTY to 0.68</li>
+    </ul>
+  </li>
+</ul>
+
+
 <h3><a name="ttssh_2.80">2017.02.28 (Ver 2.80)</a></h3>
 <ul class="history">
   <!-- li>Changes

Modified: trunk/doc/en/html/reference/develop.txt
===================================================================
--- trunk/doc/en/html/reference/develop.txt	2017-03-09 07:55:28 UTC (rev 6621)
+++ trunk/doc/en/html/reference/develop.txt	2017-03-10 23:37:47 UTC (rev 6622)
@@ -46,7 +46,7 @@
 - Oniguruma 6.1.3 (https://github.com/kkos/oniguruma)
 - OpenSSL 1.0.2k (http://www.openssl.org/)
 - zlib 1.2.11 (http://www.zlib.net/)
-- PuTTY 0.67 (http://www.chiark.greenend.org.uk/~sgtatham/putty/)
+- PuTTY 0.68 (http://www.chiark.greenend.org.uk/~sgtatham/putty/)
 
 
 * Notice for SVN commiter

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2017-03-09 07:55:28 UTC (rev 6621)
+++ trunk/doc/ja/html/about/history.html	2017-03-10 23:37:47 UTC (rev 6622)
@@ -2847,6 +2847,28 @@
 <h2><a name="ttssh">TTSSH</a></h2>
 
 
+<h3><a name="ttssh_2.81">2017.05.xx (Ver 2.81)</a></h3>
+<ul class="history">
+  <!-- li>\x95ύX
+    <ul>
+      <li></li>
+    </ul>
+  </li -->
+
+  <!--li>\x83o\x83O\x8FC\x90\xB3
+    <ul>
+      <li></li>
+    </ul>
+  </li-->
+
+  <li>\x82\xBB\x82̑\xBC
+    <ul>
+      <li>PuTTY 0.68 \x82֍\xB7\x82\xB5\x91ւ\xA6\x82\xBD</li>
+    </ul>
+  </li>
+</ul>
+
+
 <h3><a name="ttssh_2.80">2017.02.28 (Ver 2.80)</a></h3>
 <ul class="history">
   <!-- li>\x95ύX

Modified: trunk/doc/ja/html/reference/develop.txt
===================================================================
--- trunk/doc/ja/html/reference/develop.txt	2017-03-09 07:55:28 UTC (rev 6621)
+++ trunk/doc/ja/html/reference/develop.txt	2017-03-10 23:37:47 UTC (rev 6622)
@@ -47,7 +47,7 @@
 - Oniguruma 6.1.3 (https://github.com/kkos/oniguruma)
 - OpenSSL 1.0.2k (http://www.openssl.org/)
 - zlib 1.2.11 (http://www.zlib.net/)
-- PuTTY 0.67 (http://www.chiark.greenend.org.uk/~sgtatham/putty/)
+- PuTTY 0.68 (http://www.chiark.greenend.org.uk/~sgtatham/putty/)
 
 
 \x81\xA1 SVN \x83R\x83~\x83b\x83^\x81[\x82ւ̒\x8D\x88\xD3

Modified: trunk/ttssh2/putty/libputty.c
===================================================================
--- trunk/ttssh2/putty/libputty.c	2017-03-09 07:55:28 UTC (rev 6621)
+++ trunk/ttssh2/putty/libputty.c	2017-03-10 23:37:47 UTC (rev 6622)
@@ -6,9 +6,17 @@
 #include <windows.h>
 #include <assert.h>
 
+#include "sshbn.h"
+
+// from SSHBN.C (ver 0.60)
+#define BIGNUM_INTERNAL
+typedef BignumInt *Bignum;
+
 #include "ssh.h"
+
 #include "libputty.h"
 
+
 /*
  * for SSH2
  *   \x8C\xAE\x82̈ꗗ\x82𓾂\xE9
@@ -58,8 +66,10 @@
 	retval = agent_query(request, reqlen, &vresponse, &resplen, NULL, NULL);
 	assert(retval == 1);
 	response = vresponse;
-	if (resplen < 5 || response[4] != SSH2_AGENT_SIGN_RESPONSE)
+	if (resplen < 5 || response[4] != SSH2_AGENT_SIGN_RESPONSE) {
+		sfree(response);
 		return NULL;
+	}
 
 	ret = snewn(resplen-5, unsigned char);
 	memcpy(ret, response+5, resplen-5);
@@ -131,8 +141,10 @@
 	retval = agent_query(request, reqlen, &vresponse, &resplen, NULL, NULL);
 	assert(retval == 1);
 	response = vresponse;
-	if (resplen < 5 || response[4] != SSH1_AGENT_RSA_RESPONSE)
+	if (resplen < 5 || response[4] != SSH1_AGENT_RSA_RESPONSE) {
+		sfree(response);
 		return NULL;
+	}
 
 	ret = snewn(resplen-5, unsigned char);
 	memcpy(ret, response+5, resplen-5);
@@ -155,8 +167,76 @@
  * Following functions are copied from putty source.
  */
 
+// from SSHBN.C (ver 0.63)
+static Bignum newbn(int length)
+{
+	Bignum b;
 
-// SSHRSA.C
+	assert(length >= 0 && length < INT_MAX / BIGNUM_INT_BITS);
+
+	b = snewn(length + 1, BignumInt);
+	if (!b)
+		abort();		       /* FIXME */
+	memset(b, 0, (length + 1) * sizeof(*b));
+	b[0] = length;
+	return b;
+}
+
+// from SSHBN.C (ver 0.65)
+Bignum bignum_from_bytes(const unsigned char *data, int nbytes)
+{
+	Bignum result;
+	int w, i;
+
+	assert(nbytes >= 0 && nbytes < INT_MAX / 8);
+
+	w = (nbytes + BIGNUM_INT_BYTES - 1) / BIGNUM_INT_BYTES; /* bytes->words */
+
+	result = newbn(w);
+	for (i = 1; i <= w; i++)
+		result[i] = 0;
+	for (i = nbytes; i--;) {
+		unsigned char byte = *data++;
+		result[1 + i / BIGNUM_INT_BYTES] |=
+			(BignumInt)byte << (8 * i % BIGNUM_INT_BITS);
+	}
+
+	while (result[0] > 1 && result[result[0]] == 0)
+		result[0]--;
+	return result;
+}
+
+// from SSHBN.C (ver 0.60)
+/*
+* Read an SSH-1-format bignum from a data buffer. Return the number
+* of bytes consumed, or -1 if there wasn't enough data.
+*/
+int ssh1_read_bignum(const unsigned char *data, int len, Bignum * result)
+{
+	const unsigned char *p = data;
+	int i;
+	int w, b;
+
+	if (len < 2)
+		return -1;
+
+	w = 0;
+	for (i = 0; i < 2; i++)
+		w = (w << 8) + *p++;
+	b = (w + 7) / 8;		       /* bits -> bytes */
+
+	if (len < b + 2)
+		return -1;
+
+	if (!result)		       /* just return length */
+		return b + 2;
+
+	*result = bignum_from_bytes(p, b);
+
+	return p + b - data;
+}
+
+// from SSHRSA.C (putty 0.60)
 /* Given a public blob, determine its length. */
 int rsa_public_blob_len(void *data, int maxlen)
 {
@@ -181,7 +261,7 @@
 	return p - (unsigned char *)data;
 }
 
-// WINDOWS\WINPGNT.C
+// from WINDOWS\WINPGNT.C (putty 0.63)
 /*
  * Acquire a keylist1 from the primary Pageant; this means either
  * calling make_keylist1 (if that's us) or sending a message to the
@@ -195,13 +275,15 @@
 	void *vresponse;
 	int resplen, retval;
 	request[4] = SSH1_AGENTC_REQUEST_RSA_IDENTITIES;
-	PUT_32BIT(request, 4);
+	PUT_32BIT(request, 1);
 
 	retval = agent_query(request, 5, &vresponse, &resplen, NULL, NULL);
 	assert(retval == 1);
 	response = vresponse;
-	if (resplen < 5 || response[4] != SSH1_AGENT_RSA_IDENTITIES_ANSWER)
+	if (resplen < 5 || response[4] != SSH1_AGENT_RSA_IDENTITIES_ANSWER) {
+		sfree(response);
 		return NULL;
+	}
 
 	ret = snewn(resplen-5, unsigned char);
 	memcpy(ret, response+5, resplen-5);
@@ -213,6 +295,7 @@
 	return ret;
 }
 
+// from WINDOWS\WINPGNT.C (putty 0.63)
 /*
  * Acquire a keylist2 from the primary Pageant; this means either
  * calling make_keylist2 (if that's us) or sending a message to the
@@ -227,13 +310,15 @@
 	int resplen, retval;
 
 	request[4] = SSH2_AGENTC_REQUEST_IDENTITIES;
-	PUT_32BIT(request, 4);
+	PUT_32BIT(request, 1);
 
 	retval = agent_query(request, 5, &vresponse, &resplen, NULL, NULL);
 	assert(retval == 1);
 	response = vresponse;
-	if (resplen < 5 || response[4] != SSH2_AGENT_IDENTITIES_ANSWER)
+	if (resplen < 5 || response[4] != SSH2_AGENT_IDENTITIES_ANSWER) {
+		sfree(response);
 		return NULL;
+	}
 
 	ret = snewn(resplen-5, unsigned char);
 	memcpy(ret, response+5, resplen-5);
@@ -245,7 +330,7 @@
 	return ret;
 }
 
-// WINDOWS\WINDOW.C
+// from WINDOWS\WINDOW.C (putty 0.60)
 /*
  * Print a modal (Really Bad) message box and perform a fatal exit.
  */

Modified: trunk/ttssh2/putty/libputty.h
===================================================================
--- trunk/ttssh2/putty/libputty.h	2017-03-09 07:55:28 UTC (rev 6621)
+++ trunk/ttssh2/putty/libputty.h	2017-03-10 23:37:47 UTC (rev 6622)
@@ -3,6 +3,9 @@
  */
 // PuTTY is copyright 1997-2007 Simon Tatham.
 
+// MISC.C
+extern void safefree(void *);
+
 // WINDOWS\WINPGNTC.C
 extern int agent_exists(void);
 extern int agent_query(void *in, int inlen, void **out, int *outlen,
@@ -22,7 +25,5 @@
 int putty_get_ssh1_keylen(unsigned char *key,
                           int maxlen);
 
-void safefree(void *);
-
 static void *get_keylist1(int *length);
 static void *get_keylist2(int *length);

Modified: trunk/ttssh2/putty/putty.v10.vcxproj
===================================================================
--- trunk/ttssh2/putty/putty.v10.vcxproj	2017-03-09 07:55:28 UTC (rev 6621)
+++ trunk/ttssh2/putty/putty.v10.vcxproj	2017-03-10 23:37:47 UTC (rev 6622)
@@ -66,8 +66,8 @@
   <ItemGroup>
     <ClCompile Include="..\..\libs\putty\CONF.C" />
     <ClCompile Include="..\..\libs\putty\MISC.C" />
-    <ClCompile Include="..\..\libs\putty\SSHBN.C" />
     <ClCompile Include="..\..\libs\putty\TREE234.C" />
+    <ClCompile Include="..\..\libs\putty\VERSION.C" />
     <ClCompile Include="..\..\libs\putty\WINDOWS\WINMISC.C" />
     <ClCompile Include="..\..\libs\putty\WINDOWS\WINPGNTC.C" />
     <ClCompile Include="..\..\libs\putty\WINDOWS\WINSECUR.C" />
@@ -74,16 +74,6 @@
     <ClCompile Include="libputty.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\libs\putty\INT64.H" />
-    <ClInclude Include="..\..\libs\putty\MISC.H" />
-    <ClInclude Include="..\..\libs\putty\NETWORK.H" />
-    <ClInclude Include="..\..\libs\putty\PUTTY.H" />
-    <ClInclude Include="..\..\libs\putty\PUTTYMEM.H" />
-    <ClInclude Include="..\..\libs\putty\puttyps.h" />
-    <ClInclude Include="..\..\libs\putty\SSH.H" />
-    <ClInclude Include="..\..\libs\putty\TREE234.H" />
-    <ClInclude Include="..\..\libs\putty\WINDOWS\WINHELP.H" />
-    <ClInclude Include="..\..\libs\putty\WINDOWS\WINSTUFF.H" />
     <ClInclude Include="libputty.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

Modified: trunk/ttssh2/putty/putty.v10.vcxproj.filters
===================================================================
--- trunk/ttssh2/putty/putty.v10.vcxproj.filters	2017-03-09 07:55:28 UTC (rev 6621)
+++ trunk/ttssh2/putty/putty.v10.vcxproj.filters	2017-03-10 23:37:47 UTC (rev 6622)
@@ -12,10 +12,10 @@
     <ClCompile Include="..\..\libs\putty\MISC.C">
       <Filter>Putty Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libs\putty\SSHBN.C">
+    <ClCompile Include="..\..\libs\putty\TREE234.C">
       <Filter>Putty Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libs\putty\TREE234.C">
+    <ClCompile Include="..\..\libs\putty\VERSION.C">
       <Filter>Putty Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\libs\putty\WINDOWS\WINMISC.C">
@@ -30,36 +30,6 @@
     <ClCompile Include="libputty.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\libs\putty\INT64.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\MISC.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\NETWORK.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\PUTTY.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\PUTTYMEM.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\puttyps.h">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\SSH.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\TREE234.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\WINDOWS\WINHELP.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\WINDOWS\WINSTUFF.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
     <ClInclude Include="libputty.h" />
   </ItemGroup>
 </Project>
\ No newline at end of file

Modified: trunk/ttssh2/putty/putty.v11.vcxproj
===================================================================
--- trunk/ttssh2/putty/putty.v11.vcxproj	2017-03-09 07:55:28 UTC (rev 6621)
+++ trunk/ttssh2/putty/putty.v11.vcxproj	2017-03-10 23:37:47 UTC (rev 6622)
@@ -72,8 +72,8 @@
   <ItemGroup>
     <ClCompile Include="..\..\libs\putty\CONF.C" />
     <ClCompile Include="..\..\libs\putty\MISC.C" />
-    <ClCompile Include="..\..\libs\putty\SSHBN.C" />
     <ClCompile Include="..\..\libs\putty\TREE234.C" />
+    <ClCompile Include="..\..\libs\putty\VERSION.C" />
     <ClCompile Include="..\..\libs\putty\WINDOWS\WINMISC.C" />
     <ClCompile Include="..\..\libs\putty\WINDOWS\WINPGNTC.C" />
     <ClCompile Include="..\..\libs\putty\WINDOWS\WINSECUR.C" />
@@ -80,16 +80,6 @@
     <ClCompile Include="libputty.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\libs\putty\INT64.H" />
-    <ClInclude Include="..\..\libs\putty\MISC.H" />
-    <ClInclude Include="..\..\libs\putty\NETWORK.H" />
-    <ClInclude Include="..\..\libs\putty\PUTTY.H" />
-    <ClInclude Include="..\..\libs\putty\PUTTYMEM.H" />
-    <ClInclude Include="..\..\libs\putty\puttyps.h" />
-    <ClInclude Include="..\..\libs\putty\SSH.H" />
-    <ClInclude Include="..\..\libs\putty\TREE234.H" />
-    <ClInclude Include="..\..\libs\putty\WINDOWS\WINHELP.H" />
-    <ClInclude Include="..\..\libs\putty\WINDOWS\WINSTUFF.H" />
     <ClInclude Include="libputty.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

Modified: trunk/ttssh2/putty/putty.v11.vcxproj.filters
===================================================================
--- trunk/ttssh2/putty/putty.v11.vcxproj.filters	2017-03-09 07:55:28 UTC (rev 6621)
+++ trunk/ttssh2/putty/putty.v11.vcxproj.filters	2017-03-10 23:37:47 UTC (rev 6622)
@@ -12,10 +12,10 @@
     <ClCompile Include="..\..\libs\putty\MISC.C">
       <Filter>Putty Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libs\putty\SSHBN.C">
+    <ClCompile Include="..\..\libs\putty\TREE234.C">
       <Filter>Putty Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libs\putty\TREE234.C">
+    <ClCompile Include="..\..\libs\putty\VERSION.C">
       <Filter>Putty Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\libs\putty\WINDOWS\WINMISC.C">
@@ -30,36 +30,6 @@
     <ClCompile Include="libputty.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\libs\putty\INT64.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\MISC.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\NETWORK.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\PUTTY.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\PUTTYMEM.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\puttyps.h">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\SSH.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\TREE234.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\WINDOWS\WINHELP.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\WINDOWS\WINSTUFF.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
     <ClInclude Include="libputty.h" />
   </ItemGroup>
 </Project>
\ No newline at end of file

Modified: trunk/ttssh2/putty/putty.v12.vcxproj
===================================================================
--- trunk/ttssh2/putty/putty.v12.vcxproj	2017-03-09 07:55:28 UTC (rev 6621)
+++ trunk/ttssh2/putty/putty.v12.vcxproj	2017-03-10 23:37:47 UTC (rev 6622)
@@ -72,8 +72,8 @@
   <ItemGroup>
     <ClCompile Include="..\..\libs\putty\CONF.C" />
     <ClCompile Include="..\..\libs\putty\MISC.C" />
-    <ClCompile Include="..\..\libs\putty\SSHBN.C" />
     <ClCompile Include="..\..\libs\putty\TREE234.C" />
+    <ClCompile Include="..\..\libs\putty\VERSION.C" />
     <ClCompile Include="..\..\libs\putty\WINDOWS\WINMISC.C" />
     <ClCompile Include="..\..\libs\putty\WINDOWS\WINPGNTC.C" />
     <ClCompile Include="..\..\libs\putty\WINDOWS\WINSECUR.C" />
@@ -80,16 +80,6 @@
     <ClCompile Include="libputty.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\libs\putty\INT64.H" />
-    <ClInclude Include="..\..\libs\putty\MISC.H" />
-    <ClInclude Include="..\..\libs\putty\NETWORK.H" />
-    <ClInclude Include="..\..\libs\putty\PUTTY.H" />
-    <ClInclude Include="..\..\libs\putty\PUTTYMEM.H" />
-    <ClInclude Include="..\..\libs\putty\puttyps.h" />
-    <ClInclude Include="..\..\libs\putty\SSH.H" />
-    <ClInclude Include="..\..\libs\putty\TREE234.H" />
-    <ClInclude Include="..\..\libs\putty\WINDOWS\WINHELP.H" />
-    <ClInclude Include="..\..\libs\putty\WINDOWS\WINSTUFF.H" />
     <ClInclude Include="libputty.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

Modified: trunk/ttssh2/putty/putty.v12.vcxproj.filters
===================================================================
--- trunk/ttssh2/putty/putty.v12.vcxproj.filters	2017-03-09 07:55:28 UTC (rev 6621)
+++ trunk/ttssh2/putty/putty.v12.vcxproj.filters	2017-03-10 23:37:47 UTC (rev 6622)
@@ -12,10 +12,10 @@
     <ClCompile Include="..\..\libs\putty\MISC.C">
       <Filter>Putty Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libs\putty\SSHBN.C">
+    <ClCompile Include="..\..\libs\putty\TREE234.C">
       <Filter>Putty Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libs\putty\TREE234.C">
+    <ClCompile Include="..\..\libs\putty\VERSION.C">
       <Filter>Putty Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\libs\putty\WINDOWS\WINMISC.C">
@@ -30,36 +30,6 @@
     <ClCompile Include="libputty.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\libs\putty\INT64.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\MISC.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\NETWORK.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\PUTTY.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\PUTTYMEM.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\puttyps.h">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\SSH.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\TREE234.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\WINDOWS\WINHELP.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\WINDOWS\WINSTUFF.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
     <ClInclude Include="libputty.h" />
   </ItemGroup>
 </Project>
\ No newline at end of file

Modified: trunk/ttssh2/putty/putty.v14.vcxproj
===================================================================
--- trunk/ttssh2/putty/putty.v14.vcxproj	2017-03-09 07:55:28 UTC (rev 6621)
+++ trunk/ttssh2/putty/putty.v14.vcxproj	2017-03-10 23:37:47 UTC (rev 6622)
@@ -72,8 +72,8 @@
   <ItemGroup>
     <ClCompile Include="..\..\libs\putty\CONF.C" />
     <ClCompile Include="..\..\libs\putty\MISC.C" />
-    <ClCompile Include="..\..\libs\putty\SSHBN.C" />
     <ClCompile Include="..\..\libs\putty\TREE234.C" />
+    <ClCompile Include="..\..\libs\putty\VERSION.C" />
     <ClCompile Include="..\..\libs\putty\WINDOWS\WINMISC.C" />
     <ClCompile Include="..\..\libs\putty\WINDOWS\WINPGNTC.C" />
     <ClCompile Include="..\..\libs\putty\WINDOWS\WINSECUR.C" />
@@ -80,16 +80,6 @@
     <ClCompile Include="libputty.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\libs\putty\INT64.H" />
-    <ClInclude Include="..\..\libs\putty\MISC.H" />
-    <ClInclude Include="..\..\libs\putty\NETWORK.H" />
-    <ClInclude Include="..\..\libs\putty\PUTTY.H" />
-    <ClInclude Include="..\..\libs\putty\PUTTYMEM.H" />
-    <ClInclude Include="..\..\libs\putty\puttyps.h" />
-    <ClInclude Include="..\..\libs\putty\SSH.H" />
-    <ClInclude Include="..\..\libs\putty\TREE234.H" />
-    <ClInclude Include="..\..\libs\putty\WINDOWS\WINHELP.H" />
-    <ClInclude Include="..\..\libs\putty\WINDOWS\WINSTUFF.H" />
     <ClInclude Include="libputty.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

Modified: trunk/ttssh2/putty/putty.v14.vcxproj.filters
===================================================================
--- trunk/ttssh2/putty/putty.v14.vcxproj.filters	2017-03-09 07:55:28 UTC (rev 6621)
+++ trunk/ttssh2/putty/putty.v14.vcxproj.filters	2017-03-10 23:37:47 UTC (rev 6622)
@@ -12,10 +12,10 @@
     <ClCompile Include="..\..\libs\putty\MISC.C">
       <Filter>Putty Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libs\putty\SSHBN.C">
+    <ClCompile Include="..\..\libs\putty\TREE234.C">
       <Filter>Putty Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libs\putty\TREE234.C">
+    <ClCompile Include="..\..\libs\putty\VERSION.C">
       <Filter>Putty Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\libs\putty\WINDOWS\WINMISC.C">
@@ -30,36 +30,6 @@
     <ClCompile Include="libputty.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\libs\putty\INT64.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\MISC.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\NETWORK.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\PUTTY.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\PUTTYMEM.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\puttyps.h">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\SSH.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\TREE234.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\WINDOWS\WINHELP.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libs\putty\WINDOWS\WINSTUFF.H">
-      <Filter>Putty Files</Filter>
-    </ClInclude>
     <ClInclude Include="libputty.h" />
   </ItemGroup>
 </Project>
\ No newline at end of file

Modified: trunk/ttssh2/putty/putty.v9.vcproj
===================================================================
--- trunk/ttssh2/putty/putty.v9.vcproj	2017-03-09 07:55:28 UTC (rev 6621)
+++ trunk/ttssh2/putty/putty.v9.vcproj	2017-03-10 23:37:47 UTC (rev 6622)
@@ -149,47 +149,15 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\libs\putty\INT64.H"
-				>
-			</File>
-			<File
 				RelativePath="..\..\libs\putty\MISC.C"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libs\putty\MISC.H"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\putty\NETWORK.H"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\putty\PUTTY.H"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\putty\PUTTYMEM.H"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\putty\puttyps.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\putty\SSH.H"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\putty\SSHBN.C"
-				>
-			</File>
-			<File
 				RelativePath="..\..\libs\putty\TREE234.C"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libs\putty\TREE234.H"
+				RelativePath="..\..\libs\putty\VERSION.C"
 				>
 			</File>
 			<File
@@ -208,10 +176,6 @@
 				RelativePath="..\..\libs\putty\WINDOWS\WINSECUR.C"
 				>
 			</File>
-			<File
-				RelativePath="..\..\libs\putty\WINDOWS\WINSTUFF.H"
-				>
-			</File>
 		</Filter>
 		<File
 			RelativePath=".\libputty.c"

Modified: trunk/ttssh2/putty/putty.vcproj
===================================================================
--- trunk/ttssh2/putty/putty.vcproj	2017-03-09 07:55:28 UTC (rev 6621)
+++ trunk/ttssh2/putty/putty.vcproj	2017-03-10 23:37:47 UTC (rev 6622)
@@ -148,54 +148,18 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\libs\putty\INT64.H"
-				>
-			</File>
-			<File
 				RelativePath="..\..\libs\putty\MISC.C"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libs\putty\MISC.H"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\putty\NETWORK.H"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\putty\PUTTY.H"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\putty\PUTTYMEM.H"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\putty\puttyps.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\putty\SSH.H"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\putty\SSHBN.C"
-				>
-			</File>
-			<File
 				RelativePath="..\..\libs\putty\TREE234.C"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libs\putty\TREE234.H"
+				RelativePath="..\..\libs\putty\VERSION.C"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libs\putty\WINDOWS\WINHELP.H"
-				>
-			</File>
-			<File
 				RelativePath="..\..\libs\putty\WINDOWS\WINMISC.C"
 				>
 			</File>
@@ -207,10 +171,6 @@
 				RelativePath="..\..\libs\putty\WINDOWS\WINSECUR.C"
 				>
 			</File>
-			<File
-				RelativePath="..\..\libs\putty\WINDOWS\WINSTUFF.H"
-				>
-			</File>
 		</Filter>
 		<File
 			RelativePath=".\libputty.c"

• 前の記事 [Ttssh2-commit] [6621] base64 decode を ISC 由来のコードから自前実装に変更 [Ttssh2-devel 3043]
• 次の記事 [Ttssh2-commit] [6623] フォントの指定忘れを修正
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]