Tera Term

[Ttssh2-commit] [7786] TTProxyをビルドできるようにした。

• 前の記事 (スレッド) [Ttssh2-commit] [7785] OpenSSL 1.1.1をVS2005でビルドできるようにコンパイルオプションを変更した。
• 次の記事 (スレッド) [Ttssh2-commit] [7787] スクリーンショットの利用に関してQ&Aに追加した。
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]

Revision: 7786
          https://osdn.net/projects/ttssh2/scm/svn/commits/7786
Author:   yutakapon
Date:     2019-06-21 21:12:11 +0900 (Fri, 21 Jun 2019)
Log Message:
-----------
TTProxyをビルドできるようにした。

SSL_library_init関数はOpenSSL 1.1.0でdeprecatedとなり、OPENSSL_init_ssl関数に置き換わった。
SSL_load_error_strings関数はOpenSSL 1.1.0でdeprecatedとなり、呼び出し不要となった。

チケット #36876 

Ticket Links:
------------
    https://osdn.net/projects/ttssh2/tracker/detail/36876

Modified Paths:
--------------
    branches/openssl_1_1_1_v2/TTProxy/SSLLIB.h
    branches/openssl_1_1_1_v2/TTProxy/SSLSocket.h
    branches/openssl_1_1_1_v2/TTProxy/TTProxy.v10.vcxproj
    branches/openssl_1_1_1_v2/TTProxy/TTProxy.v11.vcxproj
    branches/openssl_1_1_1_v2/TTProxy/TTProxy.v12.vcxproj
    branches/openssl_1_1_1_v2/TTProxy/TTProxy.v14.vcxproj
    branches/openssl_1_1_1_v2/TTProxy/TTProxy.v15.vcxproj
    branches/openssl_1_1_1_v2/TTProxy/TTProxy.v16.vcxproj
    branches/openssl_1_1_1_v2/TTProxy/TTProxy.v9.vcproj
    branches/openssl_1_1_1_v2/TTProxy/TTProxy.vcproj

-------------- next part --------------
Modified: branches/openssl_1_1_1_v2/TTProxy/SSLLIB.h
===================================================================
--- branches/openssl_1_1_1_v2/TTProxy/SSLLIB.h	2019-06-21 11:19:25 UTC (rev 7785)
+++ branches/openssl_1_1_1_v2/TTProxy/SSLLIB.h	2019-06-21 12:12:11 UTC (rev 7786)
@@ -61,7 +61,6 @@
 DECLARE_SSLEAY32_API_v(SSL_free, (SSL *ssl), (ssl))
 DECLARE_SSLEAY32_API(int, SSL_get_error, (const SSL *s,int ret_code), (s,ret_code))
 DECLARE_SSLEAY32_API(X509 *, SSL_get_peer_certificate, (const SSL *s), (s))
-DECLARE_SSLEAY32_API_v(SSL_load_error_strings, (void ), ())
 DECLARE_SSLEAY32_API(SSL *, SSL_new, (SSL_CTX *ctx), (ctx))
 DECLARE_SSLEAY32_API(int, SSL_read, (SSL *ssl,void *buf,int num), (ssl, buf, num))
 DECLARE_SSLEAY32_API(int, SSL_set_fd, (SSL *s, int fd), (s, fd))
@@ -74,6 +73,6 @@
 #endif
 DECLARE_SSLEAY32_API(int, SSL_CTX_load_verify_locations, (SSL_CTX *ctx, const char *CAfile, const char *CApath), (ctx, CAfile, CApath))
 DECLARE_SSLEAY32_API(long, SSL_get_verify_result, (const SSL *ssl), (ssl))
-DECLARE_SSLEAY32_API(int, SSL_library_init, (void), ())
+DECLARE_SSLEAY32_API(int, OPENSSL_init_ssl, (uint64_t opts, const OPENSSL_INIT_SETTINGS *settings), (opts, settings))
 
 #endif//_SSLLIB_h_
\ No newline at end of file

Modified: branches/openssl_1_1_1_v2/TTProxy/SSLSocket.h
===================================================================
--- branches/openssl_1_1_1_v2/TTProxy/SSLSocket.h	2019-06-21 11:19:25 UTC (rev 7785)
+++ branches/openssl_1_1_1_v2/TTProxy/SSLSocket.h	2019-06-21 12:12:11 UTC (rev 7786)
@@ -54,8 +54,13 @@
 
     private:
         SSLContext():ctx(NULL) {
-            SSL_library_init(); 
-            SSL_load_error_strings();
+			/********* OPENSSL1.1.1 NOTEST *********/
+			// SSL_library_init\x8A֐\x94\x82\xCDOpenSSL 1.1.0\x82\xC5deprecated\x82ƂȂ\xE8\x81A
+			// OPENSSL_init_ssl\x8A֐\x94\x82ɒu\x82\xAB\x8A\xB7\x82\xED\x82\xC1\x82\xBD\x81B
+			OPENSSL_init_ssl(0, NULL);
+
+            // SSL_load_error_strings\x8A֐\x94\x82\xCDOpenSSL 1.1.0\x82\xC5deprecated\x82ƂȂ\xE8\x81A
+			// \x8CĂяo\x82\xB5\x95s\x97v\x82ƂȂ\xC1\x82\xBD\x82\xBD\x82߁A\x8D폜\x82\xB5\x82\xBD\x81B
             ctx = SSL_CTX_new(SSLv23_client_method());
             SSL_CTX_set_mode(ctx, SSL_MODE_AUTO_RETRY | SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER);
         }

Modified: branches/openssl_1_1_1_v2/TTProxy/TTProxy.v10.vcxproj
===================================================================
--- branches/openssl_1_1_1_v2/TTProxy/TTProxy.v10.vcxproj	2019-06-21 11:19:25 UTC (rev 7785)
+++ branches/openssl_1_1_1_v2/TTProxy/TTProxy.v10.vcxproj	2019-06-21 12:12:11 UTC (rev 7786)
@@ -62,7 +62,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\teraterm\common;YCL\include;$(SolutionDir)..\libs\openssl\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\teraterm\common;YCL\include;$(SolutionDir)..\libs\openssl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;TTX_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -102,7 +102,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\teraterm\common;YCL\include;$(SolutionDir)..\libs\openssl\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\teraterm\common;YCL\include;$(SolutionDir)..\libs\openssl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;TTX_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

Modified: branches/openssl_1_1_1_v2/TTProxy/TTProxy.v11.vcxproj
===================================================================
--- branches/openssl_1_1_1_v2/TTProxy/TTProxy.v11.vcxproj	2019-06-21 11:19:25 UTC (rev 7785)
+++ branches/openssl_1_1_1_v2/TTProxy/TTProxy.v11.vcxproj	2019-06-21 12:12:11 UTC (rev 7786)
@@ -67,7 +67,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\teraterm\common;YCL\include;$(SolutionDir)..\libs\openssl\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\teraterm\common;YCL\include;$(SolutionDir)..\libs\openssl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;TTX_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -107,7 +107,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\teraterm\common;YCL\include;$(SolutionDir)..\libs\openssl\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\teraterm\common;YCL\include;$(SolutionDir)..\libs\openssl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;TTX_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

Modified: branches/openssl_1_1_1_v2/TTProxy/TTProxy.v12.vcxproj
===================================================================
--- branches/openssl_1_1_1_v2/TTProxy/TTProxy.v12.vcxproj	2019-06-21 11:19:25 UTC (rev 7785)
+++ branches/openssl_1_1_1_v2/TTProxy/TTProxy.v12.vcxproj	2019-06-21 12:12:11 UTC (rev 7786)
@@ -67,7 +67,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\teraterm\common;YCL\include;$(SolutionDir)..\libs\openssl\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\teraterm\common;YCL\include;$(SolutionDir)..\libs\openssl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;TTX_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -107,7 +107,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\teraterm\common;YCL\include;$(SolutionDir)..\libs\openssl\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\teraterm\common;YCL\include;$(SolutionDir)..\libs\openssl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;TTX_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

Modified: branches/openssl_1_1_1_v2/TTProxy/TTProxy.v14.vcxproj
===================================================================
--- branches/openssl_1_1_1_v2/TTProxy/TTProxy.v14.vcxproj	2019-06-21 11:19:25 UTC (rev 7785)
+++ branches/openssl_1_1_1_v2/TTProxy/TTProxy.v14.vcxproj	2019-06-21 12:12:11 UTC (rev 7786)
@@ -67,7 +67,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\teraterm\common;YCL\include;$(SolutionDir)..\libs\openssl\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\teraterm\common;YCL\include;$(SolutionDir)..\libs\openssl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;TTX_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -106,7 +106,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\teraterm\common;YCL\include;$(SolutionDir)..\libs\openssl\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\teraterm\common;YCL\include;$(SolutionDir)..\libs\openssl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;TTX_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

Modified: branches/openssl_1_1_1_v2/TTProxy/TTProxy.v15.vcxproj
===================================================================
--- branches/openssl_1_1_1_v2/TTProxy/TTProxy.v15.vcxproj	2019-06-21 11:19:25 UTC (rev 7785)
+++ branches/openssl_1_1_1_v2/TTProxy/TTProxy.v15.vcxproj	2019-06-21 12:12:11 UTC (rev 7786)
@@ -68,7 +68,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\teraterm\common;YCL\include;$(SolutionDir)..\libs\openssl\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\teraterm\common;YCL\include;$(SolutionDir)..\libs\openssl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;TTX_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

Modified: branches/openssl_1_1_1_v2/TTProxy/TTProxy.v16.vcxproj
===================================================================
--- branches/openssl_1_1_1_v2/TTProxy/TTProxy.v16.vcxproj	2019-06-21 11:19:25 UTC (rev 7785)
+++ branches/openssl_1_1_1_v2/TTProxy/TTProxy.v16.vcxproj	2019-06-21 12:12:11 UTC (rev 7786)
@@ -68,7 +68,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\teraterm\common;YCL\include;$(SolutionDir)..\libs\openssl\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\teraterm\common;YCL\include;$(SolutionDir)..\libs\openssl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;TTX_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -107,7 +107,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\teraterm\common;YCL\include;$(SolutionDir)..\libs\openssl\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\teraterm\common;YCL\include;$(SolutionDir)..\libs\openssl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;TTX_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

Modified: branches/openssl_1_1_1_v2/TTProxy/TTProxy.v9.vcproj
===================================================================
--- branches/openssl_1_1_1_v2/TTProxy/TTProxy.v9.vcproj	2019-06-21 11:19:25 UTC (rev 7785)
+++ branches/openssl_1_1_1_v2/TTProxy/TTProxy.v9.vcproj	2019-06-21 12:12:11 UTC (rev 7786)
@@ -49,7 +49,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\teraterm\common;YCL\include;$(SolutionDir)..\libs\openssl\inc32"
+				AdditionalIncludeDirectories="$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\teraterm\common;YCL\include;$(SolutionDir)..\libs\openssl\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;TTX_EXPORTS"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -143,7 +143,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\teraterm\common;YCL\include;$(SolutionDir)..\libs\openssl\inc32"
+				AdditionalIncludeDirectories="$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\teraterm\common;YCL\include;$(SolutionDir)..\libs\openssl\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TTX_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"

Modified: branches/openssl_1_1_1_v2/TTProxy/TTProxy.vcproj
===================================================================
--- branches/openssl_1_1_1_v2/TTProxy/TTProxy.vcproj	2019-06-21 11:19:25 UTC (rev 7785)
+++ branches/openssl_1_1_1_v2/TTProxy/TTProxy.vcproj	2019-06-21 12:12:11 UTC (rev 7786)
@@ -48,7 +48,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\teraterm\common;YCL\include;$(SolutionDir)..\libs\openssl\inc32"
+				AdditionalIncludeDirectories="$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\teraterm\common;YCL\include;$(SolutionDir)..\libs\openssl\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;TTX_EXPORTS"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -143,7 +143,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\teraterm\common;YCL\include;$(SolutionDir)..\libs\openssl\inc32"
+				AdditionalIncludeDirectories="$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\teraterm\common;YCL\include;$(SolutionDir)..\libs\openssl\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TTX_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"

• 前の記事 (スレッド) [Ttssh2-commit] [7785] OpenSSL 1.1.1をVS2005でビルドできるようにコンパイルオプションを変更した。
• 次の記事 (スレッド) [Ttssh2-commit] [7787] スクリーンショットの利用に関してQ&Aに追加した。
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]