octoleo
/
qpdf
mirror of https://github.com/qpdf/qpdf.git
2
1
Fork 0
Code Issues Releases Wiki Activity

Provide error message in Windows crypto code (fixes #286) 

Thanks to github user zdenop for supplying some additional
error-handling code.
This commit is contained in:
Jay Berkenbilt 2019-06-22 15:32:18 -04:00
parent 6c39aa8763
commit 7bd38a3eb3
2 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2019-06-22 Jay Berkenbilt <ejb@ql.org>
* Provided a more useful error message when Windows can't get
security context. Thanks to user zdenop for supplying some code.
Fixes #286.
* Favor PointerHolder over manual memory allocation in shippable
code where possible. Fixes #235.

33
libqpdf/SecureRandomDataProvider.cc
View File

@ -62,18 +62,21 @@ class WindowsCryptProvider
#endif
{
if (! CryptAcquireContext(&crypt_prov,
"Container",
NULL,
PROV_RSA_FULL,
CRYPT_NEWKEYSET))
"Container",
NULL,
PROV_RSA_FULL,
CRYPT_NEWKEYSET))
{
throw std::runtime_error(
"unable to acquire crypt context with new keyset");
"unable to acquire crypt context with new keyset: " +
getErrorMessage());
}
}
else
{
throw std::runtime_error("unable to acquire crypt context");
throw std::runtime_error(
"unable to acquire crypt context: " +
getErrorMessage());
}
}
}
@ -84,6 +87,24 @@ class WindowsCryptProvider
}
HCRYPTPROV crypt_prov;
private:
std::string getErrorMessage()
{
DWORD errorMessageID = ::GetLastError();
LPSTR messageBuffer = nullptr;
size_t size = FormatMessageA(
FORMAT_MESSAGE_ALLOCATE_BUFFER |
FORMAT_MESSAGE_FROM_SYSTEM |
FORMAT_MESSAGE_IGNORE_INSERTS, NULL, errorMessageID,
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
reinterpret_cast<LPSTR>(&messageBuffer), 0, NULL);
std::string message(messageBuffer, size);
LocalFree(messageBuffer);
return ("error number " +
QUtil::int_to_string_base(errorMessageID, 16) +
": " + message);
}
};
#endif