fixing outgoung encrypted filetransfer...

2 files changed, 32 insertions, 9 deletions

diff --git a/new_gpg.vcxproj b/new_gpg.vcxproj
index 39bdf92..21ee00c 100644
--- a/new_gpg.vcxproj
+++ b/new_gpg.vcxproj
@@ -477,7 +477,7 @@
     </Midl>

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>x:\temp\windows\libs\utf8cpp\include;C:\Boost\include\boost-1_45;x:\install\git\miranda\miranda-im\miranda\include;x:\install\git\miranda\mim_plugs;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>x:\temp\windows\libs\utf8cpp\include;C:\Boost\include\boost-1_46;x:\install\git\miranda\miranda-im\miranda\include;x:\install\git\miranda\mim_plugs;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;TESTPLUG_EXPORTS;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

@@ -499,7 +499,7 @@
       <Culture>0x0809</Culture>

     </ResourceCompile>

     <Link>

-      <AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies) libboost_thread-vc100-mt-sgd-1_45.lib</AdditionalDependencies>

+      <AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies) libboost_thread-vc100-mt-sgd-1_46_1.lib</AdditionalDependencies>

       <SuppressStartupBanner>true</SuppressStartupBanner>

       <AdditionalLibraryDirectories>C:\Boost\lib-debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

       <GenerateDebugInformation>true</GenerateDebugInformation>

@@ -527,7 +527,7 @@
     </Midl>

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>x:\temp\windows\libs\utf8cpp\include;C:\Boost\include\boost-1_45;x:\install\git\miranda\miranda-im\miranda\include;x:\install\git\miranda\mim_plugs;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>x:\temp\windows\libs\utf8cpp\include;C:\Boost\include\boost-1_46;x:\install\git\miranda\miranda-im\miranda\include;x:\install\git\miranda\mim_plugs;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;TESTPLUG_EXPORTS;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

@@ -685,7 +685,7 @@
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <OmitFramePointers>true</OmitFramePointers>

       <WholeProgramOptimization>true</WholeProgramOptimization>

-      <AdditionalIncludeDirectories>x:\temp\windows\libs\utf8cpp\include;C:\Boost\include\boost-1_45;x:\install\git\miranda\miranda-im\miranda\include;x:\install\git\miranda\mim_plugs;../../include</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>x:\temp\windows\libs\utf8cpp\include;C:\Boost\include\boost-1_46;x:\install\git\miranda\miranda-im\miranda\include;x:\install\git\miranda\mim_plugs;../../include</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

@@ -739,7 +739,7 @@
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <OmitFramePointers>true</OmitFramePointers>

       <WholeProgramOptimization>true</WholeProgramOptimization>

-      <AdditionalIncludeDirectories>x:\temp\windows\libs\utf8cpp\include;C:\Boost\include\boost-1_45;x:\install\git\miranda\miranda-im\miranda\include;x:\install\git\miranda\mim_plugs;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>x:\temp\windows\libs\utf8cpp\include;C:\Boost\include\boost-1_46;x:\install\git\miranda\miranda-im\miranda\include;x:\install\git\miranda\mim_plugs;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

diff --git a/utilities.cpp b/utilities.cpp
index d59a7cb..28bb51e 100644
--- a/utilities.cpp
+++ b/utilities.cpp
@@ -375,7 +375,9 @@ int onSendFile(WPARAM w, LPARAM l)
 			DWORD code;
 			pxResult result;
 			char *keyid = UniGetContactSettingUtf(ccs->hContact, szGPGModuleName, "KeyID", "");
-			wstring cmd = _T("-r ");
+			wstring cmd = _T("--batch --yes -r ");
+			if(DBGetContactSettingByte(ccs->hContact, szGPGModuleName, "bAlwaysTrust", 0))
+				cmd += _T("--trust-model always ");
 			TCHAR *szKeyid = mir_a2t(keyid);
 			cmd += szKeyid;
 			mir_free(szKeyid);
@@ -401,19 +403,40 @@ int onSendFile(WPARAM w, LPARAM l)
 			params.code = &code;
 			params.result = &result;
 			boost::thread *gpg_thread = new boost::thread(boost::bind(&pxEexcute_thread, &params));
-			if(!gpg_thread->timed_join(boost::posix_time::minutes(10)))
+			if(!gpg_thread->timed_join(boost::posix_time::seconds(180)))
 			{
 				delete gpg_thread;
 				debuglog<<time_str()<<": GPG execution timed out, aborted\n";
 			}
+			if(out.find("There is no assurance this key belongs to the named user") != string::npos)
+			{
+				out.clear();
+				if(MessageBox(0, _T("We trying to encrypt with untrusted key, do you want to trust this key permanently ?"), _T("Warning"), MB_YESNO) == IDYES)
+				{
+					DBWriteContactSettingByte(ccs->hContact, szGPGModuleName, "bAlwaysTrust", 1);
+					cmd.insert(0, _T("--trust-model always "));
+					gpg_execution_params params;
+					pxResult result;
+					params.cmd = &cmd;
+					params.useless = "";
+					params.out = &out;
+					params.code = &code;
+					params.result = &result;
+					boost::thread gpg_thread(boost::bind(&pxEexcute_thread, &params));
+					if(!gpg_thread.timed_join(boost::posix_time::seconds(180)))
+					{
+						gpg_thread.~thread();
+						debuglog<<time_str()<<": GPG execution timed out, aborted\n";
+					}
+				}
+			}
 			mir_free(file[i]);
 			file[i]=mir_wstrdup(path_out.c_str());
 			mir_free(file_out);
 			transfers.push_back(path_out);
 		}
 	}
-
-	return CallService(PSS_FILE, w, l);
+	return CallService(ccs->szProtoService, w, l);
 }
 
 void storeOutput(HANDLE ahandle, string *output)