・[change] SSL/TLSライブラリを wolfSSL から OpenSSL へ変更

・[change] CA証明書の生成では必ずECC暗号を利用するようにした
amate · Oct 5, 2021 · 8788ff5 · 8788ff5
1 parent b7df686
commit 8788ff5
Show file tree

Hide file tree

Showing 10 changed files with 488 additions and 817 deletions.
diff --git a/Proxydomo.sln b/Proxydomo.sln
@@ -4,11 +4,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 VisualStudioVersion = 16.0.28803.352
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proxydomo", "Proxydomo\Proxydomo.vcxproj", "{DDADC3EE-73B1-4DED-9073-F4AF4755B6D4}"
-	ProjectSection(ProjectDependencies) = postProject
-		{73973223-5EE8-41CA-8E88-1D60E89A237B} = {73973223-5EE8-41CA-8E88-1D60E89A237B}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wolfssl", "wolfssl\wolfssl.vcxproj", "{73973223-5EE8-41CA-8E88-1D60E89A237B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -44,26 +39,6 @@ Global
 		{DDADC3EE-73B1-4DED-9073-F4AF4755B6D4}.Test|Win32.Build.0 = Test|Win32
 		{DDADC3EE-73B1-4DED-9073-F4AF4755B6D4}.Test|x64.ActiveCfg = Test|x64
 		{DDADC3EE-73B1-4DED-9073-F4AF4755B6D4}.Test|x64.Build.0 = Test|x64
-		{73973223-5EE8-41CA-8E88-1D60E89A237B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{73973223-5EE8-41CA-8E88-1D60E89A237B}.Debug|Win32.Build.0 = Debug|Win32
-		{73973223-5EE8-41CA-8E88-1D60E89A237B}.Debug|x64.ActiveCfg = Debug|x64
-		{73973223-5EE8-41CA-8E88-1D60E89A237B}.Debug|x64.Build.0 = Debug|x64
-		{73973223-5EE8-41CA-8E88-1D60E89A237B}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
-		{73973223-5EE8-41CA-8E88-1D60E89A237B}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
-		{73973223-5EE8-41CA-8E88-1D60E89A237B}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
-		{73973223-5EE8-41CA-8E88-1D60E89A237B}.DLL Debug|x64.Build.0 = DLL Debug|x64
-		{73973223-5EE8-41CA-8E88-1D60E89A237B}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
-		{73973223-5EE8-41CA-8E88-1D60E89A237B}.DLL Release|Win32.Build.0 = DLL Release|Win32
-		{73973223-5EE8-41CA-8E88-1D60E89A237B}.DLL Release|x64.ActiveCfg = DLL Release|x64
-		{73973223-5EE8-41CA-8E88-1D60E89A237B}.DLL Release|x64.Build.0 = DLL Release|x64
-		{73973223-5EE8-41CA-8E88-1D60E89A237B}.Release|Win32.ActiveCfg = Release|Win32
-		{73973223-5EE8-41CA-8E88-1D60E89A237B}.Release|Win32.Build.0 = Release|Win32
-		{73973223-5EE8-41CA-8E88-1D60E89A237B}.Release|x64.ActiveCfg = Release|x64
-		{73973223-5EE8-41CA-8E88-1D60E89A237B}.Release|x64.Build.0 = Release|x64
-		{73973223-5EE8-41CA-8E88-1D60E89A237B}.Test|Win32.ActiveCfg = Release|Win32
-		{73973223-5EE8-41CA-8E88-1D60E89A237B}.Test|Win32.Build.0 = Release|Win32
-		{73973223-5EE8-41CA-8E88-1D60E89A237B}.Test|x64.ActiveCfg = Release|x64
-		{73973223-5EE8-41CA-8E88-1D60E89A237B}.Test|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/Proxydomo/AboutDlg.h b/Proxydomo/AboutDlg.h
@@ -23,7 +23,7 @@
 
 #include "AppConst.h"
 #include "resource.h"
-#include <wolfssl\ssl.h>
+#include <openssl\opensslv.h>
 
 class CAboutDlg : public CDialogImpl<CAboutDlg>
 {
@@ -51,8 +51,8 @@ class CAboutDlg : public CDialogImpl<CAboutDlg>
 		text.ReleaseBuffer();
 		text.Replace(_T("%APP_NAME%"), APP_NAME);
 		text.Replace(_T("%APP_VERSION%"), APP_VERSION);
-		const char* wolfsslversion = wolfSSL_lib_version();
-		text.Replace(_T("%WOLFSSLVERSION%"), (LPWSTR)CA2W(wolfsslversion));
+		const char* sslversion = OPENSSL_VERSION_TEXT;
+		text.Replace(_T("%SSLVERSION%"), (LPWSTR)CA2W(sslversion));
 		wndDiscription.SetWindowText(text);
 
 		return TRUE;

diff --git a/Proxydomo/AppConst.h b/Proxydomo/AppConst.h
@@ -39,7 +39,7 @@
 #endif
 
 /// アプリケーションのバージョン
-#define APP_VERSION	_T("1.110")
+#define APP_VERSION	_T("2.0")
 
 
 

diff --git a/Proxydomo/OptionDialog.h b/Proxydomo/OptionDialog.h
@@ -161,13 +161,13 @@ class COptionDialog : public CDialogImpl<COptionDialog>, public CWinDataExchange
 		if (ret == IDCANCEL)
 			return 0;
 
-		ret = MessageBox(UITranslator::GetTranslateMessage(ID_CHOICEPRIVATEKEYMESSAGE).c_str(), UITranslator::GetTranslateMessage(ID_TRANS_CONFIRM).c_str(), MB_YESNOCANCEL);
-		if (ret == IDCANCEL)
-			return 0;
+		//ret = MessageBox(UITranslator::GetTranslateMessage(ID_CHOICEPRIVATEKEYMESSAGE).c_str(), UITranslator::GetTranslateMessage(ID_TRANS_CONFIRM).c_str(), MB_YESNOCANCEL);
+		//if (ret == IDCANCEL)
+		//	return 0;
 
-		bool rsa = (ret != IDYES);
+		//bool rsa = (ret != IDYES);
 		try {
-			GenerateCACertificate(rsa);
+			GenerateCACertificate();
 		} catch (std::exception& e) {
 			CString errormsg = UITranslator::GetTranslateMessage(ID_CREATECAFAILEDMESSAGE).c_str();
 			errormsg += e.what();

diff --git a/Proxydomo/Proxydomo.rc b/Proxydomo/Proxydomo.rc
@@ -75,7 +75,7 @@ CAPTION "About"
 FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,130,91,50,14
-    LTEXT           "%APP_NAME% v%APP_VERSION%\n\nwolfSSL version - %WOLFSSLVERSION%\n\n(c) Antony Boucher 2004\n(c) amate 2013-2016\n\nOpen-Source project distributed under GNU GPL",IDC_STATIC_APP,13,15,163,64
+    LTEXT           "%APP_NAME% v%APP_VERSION%\n\n %SSLVERSION%\n\n(c) Antony Boucher 2004\n(c) amate 2013-2016\n\nOpen-Source project distributed under GNU GPL",IDC_STATIC_APP,13,15,163,64
     ICON            IDR_MAINFRAME,IDC_STATIC,129,11,20,20
     GROUPBOX        "",IDC_STATIC,6,1,174,87
 END

diff --git a/Proxydomo/Proxydomo.vcxproj b/Proxydomo/Proxydomo.vcxproj
@@ -104,11 +104,11 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(SolutionDir)wolfssl;$(SolutionDir)icu\include;$(SolutionDir)Proxydomo\brotli\include;D:\Program\WTL81_12085\Include;$(SolutionDir)zlib\x64\include;C:\Programing\#lib\boost_1_73_0\lib\include\boost-1_73;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)icu\include;$(SolutionDir)Proxydomo\brotli\include;D:\Program\WTL81_12085\Include;$(SolutionDir)zlib\x64\include;C:\Programing\#lib\boost_1_73_0\lib\include\boost-1_73;$(SolutionDir)openssl-3\x64\include;$(IncludePath)</IncludePath>
     <OutDir>$(SolutionDir)$(Configuration)$(Platform)\</OutDir>
     <IntDir>$(Configuration)$(Platform)\</IntDir>
     <TargetName>$(ProjectName)64</TargetName>
-    <LibraryPath>C:\Programing\#lib\boost_1_73_0\lib\lib;$(SolutionDir)icu\lib64;$(SolutionDir)zlib\x64\lib;$(SolutionDir)sqlite\Win64;$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64);$(LibraryPath)</LibraryPath>
+    <LibraryPath>C:\Programing\#lib\boost_1_73_0\lib\lib;$(SolutionDir)icu\lib64;$(SolutionDir)zlib\x64\lib;$(SolutionDir)sqlite\Win64;$(SolutionDir)openssl-3\x64\lib;$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64);$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Test|x64'">
     <LinkIncremental>true</LinkIncremental>
@@ -128,8 +128,8 @@
     <OutDir>$(SolutionDir)$(Configuration)$(Platform)\</OutDir>
     <IntDir>$(Configuration)$(Platform)\</IntDir>
     <TargetName>$(ProjectName)64</TargetName>
-    <LibraryPath>C:\Programing\#lib\boost_1_73_0\lib\lib;$(SolutionDir)icu\lib64;$(SolutionDir)zlib\x64\lib;$(SolutionDir)sqlite\Win64;$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64);$(LibraryPath)</LibraryPath>
-    <IncludePath>$(SolutionDir)wolfssl;$(SolutionDir)icu\include;$(SolutionDir)Proxydomo\brotli\include;D:\Program\WTL81_12085\Include;$(SolutionDir)zlib\x64\include;C:\Programing\#lib\boost_1_73_0\lib\include\boost-1_73;$(IncludePath)</IncludePath>
+    <LibraryPath>C:\Programing\#lib\boost_1_73_0\lib\lib;$(SolutionDir)openssl-3\x64\lib;$(SolutionDir)icu\lib64;$(SolutionDir)zlib\x64\lib;$(SolutionDir)sqlite\Win64;$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64);$(LibraryPath)</LibraryPath>
+    <IncludePath>$(SolutionDir)wolfssl;$(SolutionDir)icu\include;$(SolutionDir)Proxydomo\brotli\include;D:\Program\WTL81_12085\Include;$(SolutionDir)zlib\x64\include;C:\Programing\#lib\boost_1_73_0\lib\include\boost-1_73;$(SolutionDir)openssl-3\x64\include;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -1187,11 +1187,6 @@
     <Image Include="res\StatusAnnotations_Critical_16xLG.ico" />
     <Image Include="res\WebFilter.ico" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\wolfssl\wolfssl.vcxproj">
-      <Project>{73973223-5ee8-41ca-8e88-1d60e89a237b}</Project>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
-Original file line number
+Diff line change
@@ Expand Up / @@ -39,7 +39,7 @@ @@
     #endif
     /// アプリケーションのバージョン
-    #define APP_VERSION	_T("1.110")
+    #define APP_VERSION	_T("2.0")
@@ Expand Down @@