Amebis/Updater
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert asserts to proper checks and log error

Browse Source 
Signed-off-by: Simon Rozman <simon@rozman.si>
This commit is contained in:
Simon Rozman 2021-04-02 16:12:29 +02:00
parent 165894247e
commit 625549838e
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
UpdSignXML/main.cpp
View File

@ -90,13 +90,21 @@ int _tmain(int argc, _TCHAR *argv[])
// Import the private key into the session from resources. // Import the private key into the session from resources.
{ {
HRSRC res = ::FindResource(NULL, MAKEINTRESOURCE(IDR_KEY_PRIVATE), RT_RCDATA); HRSRC res = ::FindResource(NULL, MAKEINTRESOURCE(IDR_KEY_PRIVATE), RT_RCDATA);
wxASSERT_MSG(res, wxT("private key not found")); if (!res) {
wxLogError(wxT("%s: error USX0005: Error locating private key.\n"));
return -1;
}
HGLOBAL res_handle = ::LoadResource(NULL, res); HGLOBAL res_handle = ::LoadResource(NULL, res);
wxASSERT_MSG(res_handle, wxT("loading resource failed")); if (!res_handle) {
wxLogError(wxT("%s: error USX0006: Error loading private key.\n"));
return -1;
}
wxCryptoKey ck; wxCryptoKey ck;
if (!ck.ImportPrivate(cs, ::LockResource(res_handle), ::SizeofResource(NULL, res))) if (!ck.ImportPrivate(cs, ::LockResource(res_handle), ::SizeofResource(NULL, res))) {
wxLogError(wxT("%s: error USX0007: Error importing private key.\n"));
return -1; return -1;
}
} }
// Hash the XML content. // Hash the XML content.