tyler.durden
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update certif/sha256 verification

This commit is contained in:
Don Ho 2022-11-12 02:28:30 +01:00
parent 67256a107b
commit f6b1cf3e77
3 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,15 +36,9 @@ SecurityMode SecurityGuard::_securityMode = sm_certif;
SecurityGuard::SecurityGuard() SecurityGuard::SecurityGuard()
{ {
_scilexerSha256.push_back(TEXT("03c9177631d2b32de3d32c73a8841cf68fc2cb17f306825489dc3df98000db85")); // v3.5.6 32 bit (signed)
_scilexerSha256.push_back(TEXT("9896c4089275e21412fd80421827912ebd80e357394b05145a613d190462e211")); // v3.5.6 64 bit (signed)
_gupSha256.push_back(TEXT("4c8191f511c2ad67148ef809b40c1108aaa074130547157c335a959404d8d6f6")); // v5.1 32 bit (signed) _gupSha256.push_back(TEXT("4c8191f511c2ad67148ef809b40c1108aaa074130547157c335a959404d8d6f6")); // v5.1 32 bit (signed)
_gupSha256.push_back(TEXT("268a65829e86d5c3d324eea79b51e59f0a7d07c69d3ba0f700c9cb3aa772566f")); // v5.1 64 bit (signed) _gupSha256.push_back(TEXT("268a65829e86d5c3d324eea79b51e59f0a7d07c69d3ba0f700c9cb3aa772566f")); // v5.1 64 bit (signed)
_pluginListSha256.push_back(TEXT("be9e251a30fd712fd2ff98febd360805df51110b6659de8c9a0000220d7ae535")); // v1.0.7 32 bit (unsigned)
_pluginListSha256.push_back(TEXT("3ecd7f9c56bcd659a4126c659eb69b354789c78574a82390749ac751ae539bc6")); // v1.0.7 64 bit (unsigned)
_pluginListSha256.push_back(TEXT("a4a7e57d605f29b294378d0d94fc867b9febd6a1cc63f1bb69bcb7609dc25f2c")); // v1.0.8 32 bit (unsigned) _pluginListSha256.push_back(TEXT("a4a7e57d605f29b294378d0d94fc867b9febd6a1cc63f1bb69bcb7609dc25f2c")); // v1.0.8 32 bit (unsigned)
_pluginListSha256.push_back(TEXT("1c404fd3578273f5ecde585af82179ff3b63c635fb4fa24be21ebde708e403e4")); // v1.0.8 64 bit (unsigned) _pluginListSha256.push_back(TEXT("1c404fd3578273f5ecde585af82179ff3b63c635fb4fa24be21ebde708e403e4")); // v1.0.8 64 bit (unsigned)
} }
@ -53,7 +47,7 @@ bool SecurityGuard::checkModule(const std::wstring& filePath, NppModule module2c
{ {
#ifndef _DEBUG #ifndef _DEBUG
if (_securityMode == sm_certif) if (_securityMode == sm_certif)
return verifySignedLibrary(filePath, module2check); return verifySignedLibrary(filePath);
else if (_securityMode == sm_sha256) else if (_securityMode == sm_sha256)
return checkSha256(filePath, module2check); return checkSha256(filePath, module2check);
else else
@ -87,9 +81,8 @@ bool SecurityGuard::checkSha256(const std::wstring& filePath, NppModule module2c
wsprintf(sha2hashStr + i * 2, TEXT("%02x"), sha2hash[i]); wsprintf(sha2hashStr + i * 2, TEXT("%02x"), sha2hash[i]);
std::vector<std::wstring>* moduleSha256 = nullptr; std::vector<std::wstring>* moduleSha256 = nullptr;
if (module2check == nm_scilexer)
moduleSha256 = &_scilexerSha256; if (module2check == nm_gup)
else if (module2check == nm_gup)
moduleSha256 = &_gupSha256; moduleSha256 = &_gupSha256;
else if (module2check == nm_pluginList) else if (module2check == nm_pluginList)
moduleSha256 = &_pluginListSha256; moduleSha256 = &_pluginListSha256;
@ -109,7 +102,7 @@ bool SecurityGuard::checkSha256(const std::wstring& filePath, NppModule module2c
return false; return false;
} }
bool SecurityGuard::verifySignedLibrary(const std::wstring& filepath, NppModule module2check) bool SecurityGuard::verifySignedLibrary(const std::wstring& filepath)
{ {
wstring display_name; wstring display_name;
wstring key_id_hex; wstring key_id_hex;
@ -292,20 +285,14 @@ bool SecurityGuard::verifySignedLibrary(const std::wstring& filepath, NppModule
} }
catch (const wstring& s) { catch (const wstring& s) {
if (module2check == nm_scilexer) wstring msg = s;
::MessageBox(NULL, s.c_str(), TEXT("DLL signature verification failed"), MB_ICONERROR); msg += TEXT(" - VerifyLibrary: error while getting certificate informations\n");
OutputDebugString(TEXT("VerifyLibrary: error while getting certificate informations\n")); OutputDebugString(msg.c_str());
status = false; status = false;
} }
catch (...) { catch (...) {
// Unknown error // Unknown error
OutputDebugString(TEXT("VerifyLibrary: error while getting certificate informations\n")); OutputDebugString(TEXT("VerifyLibrary: error while getting certificate informations\n"));
if (module2check == nm_scilexer)
{
wstring errMsg(TEXT("Unknown exception occurred. "));
errMsg += GetLastErrorAsString(GetLastError());
::MessageBox(NULL, errMsg.c_str(), TEXT("DLL signature verification failed"), MB_ICONERROR);
}
status = false; status = false;
} }

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

@ -49,7 +49,7 @@
#include <vector> #include <vector>
enum SecurityMode { sm_certif = 0, sm_sha256 = 1 }; enum SecurityMode { sm_certif = 0, sm_sha256 = 1 };
enum NppModule { nm_scilexer = 0, nm_gup = 1, nm_pluginList = 2 }; enum NppModule { nm_gup = 1, nm_pluginList = 2 };
class SecurityGuard final class SecurityGuard final
{ {
@ -60,7 +60,6 @@ public:
private: private:
// SHA256 // SHA256
static SecurityMode _securityMode; static SecurityMode _securityMode;
std::vector<std::wstring> _scilexerSha256;
std::vector<std::wstring> _gupSha256; std::vector<std::wstring> _gupSha256;
std::vector<std::wstring> _pluginListSha256; std::vector<std::wstring> _pluginListSha256;
@ -73,6 +72,6 @@ private:
bool _doCheckRevocation = false; bool _doCheckRevocation = false;
bool _doCheckChainOfTrust = false; bool _doCheckChainOfTrust = false;
bool verifySignedLibrary(const std::wstring& filepath, NppModule module2check); bool verifySignedLibrary(const std::wstring& filepath);
}; };

2
PowerEditor/src/Notepad_plus.cpp
View File

@ -7314,7 +7314,7 @@ static const QuoteParams quotes[] =
{TEXT("Anonymous #176"), QuoteParams::rapid, true, SC_CP_UTF8, L_TEXT, TEXT("A vegan said to me, \"people who sell meat are gross!\"\nI said, \"people who sell fruits and vegetables are grocer.\"\n") }, {TEXT("Anonymous #176"), QuoteParams::rapid, true, SC_CP_UTF8, L_TEXT, TEXT("A vegan said to me, \"people who sell meat are gross!\"\nI said, \"people who sell fruits and vegetables are grocer.\"\n") },
{TEXT("Anonymous #177"), QuoteParams::rapid, false, SC_CP_UTF8, L_TEXT, TEXT("Documentation is a love letter that you write to your future self.\n") }, {TEXT("Anonymous #177"), QuoteParams::rapid, false, SC_CP_UTF8, L_TEXT, TEXT("Documentation is a love letter that you write to your future self.\n") },
{TEXT("Anonymous #178"), QuoteParams::rapid, false, SC_CP_UTF8, L_TEXT, TEXT("When I die, I hope it's early in the morning so I don't have to go to work that day for no reason.\n") }, {TEXT("Anonymous #178"), QuoteParams::rapid, false, SC_CP_UTF8, L_TEXT, TEXT("When I die, I hope it's early in the morning so I don't have to go to work that day for no reason.\n") },
{TEXT("Anonymous #179"), QuoteParams::rapid, false, SC_CP_UTF8, L_TEXT, TEXT("Workers plaay football\nManagers play tennis\nCEOs play golf\n\nHigher the function, smaller the balls.\n") }, {TEXT("Anonymous #179"), QuoteParams::rapid, false, SC_CP_UTF8, L_TEXT, TEXT("Workers play football\nManagers play tennis\nCEOs play golf\n\nHigher the function, smaller the balls.\n") },
{TEXT("Anonymous #180"), QuoteParams::rapid, false, SC_CP_UTF8, L_TEXT, TEXT("Friends are just like trees.\nThey fall down when you hit them multiple times with an axe.\n") }, {TEXT("Anonymous #180"), QuoteParams::rapid, false, SC_CP_UTF8, L_TEXT, TEXT("Friends are just like trees.\nThey fall down when you hit them multiple times with an axe.\n") },
{TEXT("Anonymous #181"), QuoteParams::rapid, false, SC_CP_UTF8, L_TEXT, TEXT("I met a magical Genie. He gave me one wish.\nI said: \"I wish I could be you.\"\nThe Genue saud: \"Weurd wush but U wull grant ut.\"\n") }, {TEXT("Anonymous #181"), QuoteParams::rapid, false, SC_CP_UTF8, L_TEXT, TEXT("I met a magical Genie. He gave me one wish.\nI said: \"I wish I could be you.\"\nThe Genue saud: \"Weurd wush but U wull grant ut.\"\n") },
{TEXT("Anonymous #182"), QuoteParams::slow, false, SC_CP_UTF8, L_CPP, TEXT("printf(\"%s%s\", \"\\\\o/\\n| |\\n| |8=\", \"=D\\n/ \\\\\\n\");\n") }, {TEXT("Anonymous #182"), QuoteParams::slow, false, SC_CP_UTF8, L_CPP, TEXT("printf(\"%s%s\", \"\\\\o/\\n| |\\n| |8=\", \"=D\\n/ \\\\\\n\");\n") },