Fierelier/notepad-plus-plus-legacy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Disable the certification chain verification

Browse Source 
WinTrust library checks chain of trust on line which makes Notepad++
hanging due to the Firewall's restriction.
This commit is contained in:
Don HO 2017-05-16 19:50:22 +02:00
parent caee890960
commit 8dbd956344
3 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
PowerEditor/src/MISC/Common/verifySignedfile.cpp
View File

@ -45,7 +45,8 @@ bool VerifySignedLibrary(const wstring& filepath,
const wstring& cert_key_id_hex, const wstring& cert_key_id_hex,
const wstring& cert_subject, const wstring& cert_subject,
const wstring& cert_display_name, const wstring& cert_display_name,
bool doCheckRevocation) bool doCheckRevocation,
bool doCheckChainOfTrust)
{ {
wstring display_name; wstring display_name;
wstring key_id_hex; wstring key_id_hex;
@ -100,24 +101,27 @@ bool VerifySignedLibrary(const wstring& filepath,
} }
} }
// Verify signature and cert-chain validity if (doCheckChainOfTrust)
GUID policy = WINTRUST_ACTION_GENERIC_VERIFY_V2;
LONG vtrust = ::WinVerifyTrust(NULL, &policy, &winTEXTrust_data );
// Post check cleanup
winTEXTrust_data.dwStateAction = WTD_STATEACTION_CLOSE;
LONG t2 = ::WinVerifyTrust(NULL, &policy, &winTEXTrust_data);
if (vtrust)
{ {
OutputDebugString(TEXT("VerifyLibrary: trust verification failed\n")); // Verify signature and cert-chain validity
return false; GUID policy = WINTRUST_ACTION_GENERIC_VERIFY_V2;
} LONG vtrust = ::WinVerifyTrust(NULL, &policy, &winTEXTrust_data);
if (t2) // Post check cleanup
{ winTEXTrust_data.dwStateAction = WTD_STATEACTION_CLOSE;
OutputDebugString(TEXT("VerifyLibrary: error encountered while cleaning up after WinVerifyTrust\n")); LONG t2 = ::WinVerifyTrust(NULL, &policy, &winTEXTrust_data);
return false;
if (vtrust)
{
OutputDebugString(TEXT("VerifyLibrary: trust verification failed\n"));
return false;
}
if (t2)
{
OutputDebugString(TEXT("VerifyLibrary: error encountered while cleaning up after WinVerifyTrust\n"));
return false;
}
} }
// //

3
PowerEditor/src/MISC/Common/verifySignedfile.h
View File

@ -64,4 +64,5 @@ bool VerifySignedLibrary(const std::wstring& filepath,
const std::wstring& key_id_hex, const std::wstring& key_id_hex,
const std::wstring& cert_subject, const std::wstring& cert_subject,
const std::wstring& display_name, const std::wstring& display_name,
bool doCheckRevocation); bool doCheckRevocation,
bool doCheckChainOfTrust);

2
PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp
View File

@ -185,7 +185,7 @@ HMODULE loadSciLexerDll()
{ {
generic_string sciLexerPath = getSciLexerFullPathName(moduleFileName, 1024); generic_string sciLexerPath = getSciLexerFullPathName(moduleFileName, 1024);
bool isOK = VerifySignedLibrary(sciLexerPath, scintilla_signer_key_id, scintilla_signer_subject, scintilla_signer_display_name, false); bool isOK = VerifySignedLibrary(sciLexerPath, scintilla_signer_key_id, scintilla_signer_subject, scintilla_signer_display_name, false, false);
if (!isOK) if (!isOK)
{ {