Tera TermRevision: 7924
https://osdn.net/projects/ttssh2/scm/svn/commits/7924
Author: yutakapon
Date: 2019-08-09 00:04:14 +0900 (Fri, 09 Aug 2019)
Log Message:
-----------
OpenSSL 3.0.0向けサポート
チケット #36876
Ticket Links:
------------
https://osdn.net/projects/ttssh2/tracker/detail/36876
Modified Paths:
--------------
branches/openssl_1_1_1_v2/TTProxy/SSLLIB.h
Added Paths:
-----------
branches/openssl_1_1_1_v2/libs/buildopenssl30.bat
-------------- next part --------------
Modified: branches/openssl_1_1_1_v2/TTProxy/SSLLIB.h
===================================================================
--- branches/openssl_1_1_1_v2/TTProxy/SSLLIB.h 2019-08-08 13:10:31 UTC (rev 7923)
+++ branches/openssl_1_1_1_v2/TTProxy/SSLLIB.h 2019-08-08 15:04:14 UTC (rev 7924)
@@ -1,11 +1,16 @@
#ifndef _SSLLIB_h_
#define _SSLLIB_h_
+#ifdef OPENSSL_VERSION_MAJOR
+// OpenSSL 3.0.0\x82ł\xCDOPENSSL_VERSION_MAJOR, OPENSSL_VERSION_MINOR,
+// OPENSSL_VERSION_PATCH \x82\xAA\x83f\x83t\x83H\x83\x8B\x83g\x82Œ\xE8\x8B`\x82\xB3\x82\xEA\x82\xE9\x81B
+#else
#define OPENSSL_VERSION_MAJOR (OPENSSL_VERSION_NUMBER & 0xf0000000L) >> 28
#define OPENSSL_VERSION_MINOR (OPENSSL_VERSION_NUMBER & 0x0ff00000L) >> 20
#define OPENSSL_VERSION_FIX (OPENSSL_VERSION_NUMBER & 0x000ff000L) >> 12
#define OPENSSL_VERSION_PATCH (OPENSSL_VERSION_NUMBER & 0x00000ff0L) >> 4
#define OPENSSL_VERSION_STATUS (OPENSSL_VERSION_NUMBER & 0x0000000fL)
+#endif
#define DECLARE_MODULE_API(module, rettype, apiname, arglist, args) \
rettype apiname arglist { \
Added: branches/openssl_1_1_1_v2/libs/buildopenssl30.bat
===================================================================
--- branches/openssl_1_1_1_v2/libs/buildopenssl30.bat (rev 0)
+++ branches/openssl_1_1_1_v2/libs/buildopenssl30.bat 2019-08-08 15:04:14 UTC (rev 7924)
@@ -0,0 +1,53 @@
+
+rem \x83p\x83b\x83`\x93K\x97p\x83`\x83F\x83b\x83N
+rem pushd openssl_patch
+rem call check_patch.bat
+rem popd
+
+rem OpenSSL\x82̃r\x83\x8B\x83h\x82ֈڍs
+
+cd openssl
+
+if exist "out32.dbg\libcrypto.lib" goto build_dbg_end
+
+rem \x90ݒ\xE8\x83t\x83@\x83C\x83\x8B\x82̃o\x83b\x83N\x83A\x83b\x83v\x82\xF0\x8E\xE6\x82\xE9
+copy /y Configurations\10-main.conf Configurations\10-main.conf.orig
+
+rem VS2005\x82\xBE\x82ƌx\x8D\x90\x83G\x83\x89\x81[\x82ŃR\x83\x93\x83p\x83C\x83\x8B\x82\xAA\x8E~\x82܂\xE9\x96\xE2\x91\xE8\x82ւ̏\x88\x92u
+perl -e "open(IN,'Configurations/10-main.conf');binmode(STDOUT);while(<IN>){s|/W3|/W1|;s|/WX||;print $_;}close(IN);" > conf.tmp
+move conf.tmp Configurations/10-main.conf
+
+rem GetModuleHandleExW API\x88ˑ\xB6\x8F\x9C\x8B\x8E\x82̂\xBD\x82\xDF
+perl -e "open(IN,'Configurations/10-main.conf');binmode(STDOUT);while(<IN>){s|(dso_scheme(.+)"win32")|#$1|;print $_;}close(IN);" > conf.tmp
+move conf.tmp Configurations/10-main.conf
+
+rem Debug build\x82\xCCwarning LNK4099\x91\xF4(Workaround)
+perl -e "open(IN,'Configurations/10-main.conf');binmode(STDOUT);while(<IN>){s|/Zi|/Z7|;s|/WX||;print $_;}close(IN);" > conf.tmp
+move conf.tmp Configurations/10-main.conf
+
+perl Configure no-asm no-async no-shared no-capieng no-dso no-engine VC-WIN32 -D_WIN32_WINNT=0x0501 --debug
+perl -e "open(IN,'makefile');while(<IN>){s| /MDd| /MTd|;print $_;}close(IN);" > makefile.tmp
+if exist "makefile.dbg" del makefile.dbg
+ren makefile.tmp makefile.dbg
+nmake -f makefile.dbg clean
+nmake -f makefile.dbg
+mkdir out32.dbg
+move libcrypto* out32.dbg
+move libssl* out32.dbg
+move apps\openssl.exe out32.dbg
+:build_dbg_end
+
+if exist "out32\libcrypto.lib" goto build_end
+perl Configure no-asm no-async no-shared no-capieng no-dso no-engine VC-WIN32 -D_WIN32_WINNT=0x0501
+perl -e "open(IN,'makefile');while(<IN>){s| /MD| /MT|;print $_;}close(IN);" > makefile.tmp
+if exist "makefile" del makefile
+ren makefile.tmp makefile
+nmake clean
+nmake
+mkdir out32
+move libcrypto* out32
+move libssl* out32
+move apps\openssl.exe out32
+:build_end
+
+cd ..