mirror of
https://github.com/reactos/reactos.git
synced 2024-09-28 21:44:31 +00:00
[0.4.13][RAPPS] "Let's encrypt" Certificate-Issuer-Update hamster-wheel
"Let's encrypt" certificate issuer string changed within last 24hours remotely. Update its name to make RAPPS stop complaining on DB update. And also fix a bug in rapps mixing A()/W() in the messagebox that informs about that cert check failure. Fix is port of 0.4.15-dev-1120-g12caaece25
0.4.15-dev-1617-gf77f5a30cf
Next time this happens I will relentlessly undefine CMakeLists.txt USE_CERT_PINNING
This commit is contained in:
parent
2ac9d98d3d
commit
52826608b2
|
@ -48,7 +48,8 @@
|
|||
#include "misc.h"
|
||||
|
||||
#ifdef USE_CERT_PINNING
|
||||
#define CERT_ISSUER_INFO "US\r\nLet's Encrypt\r\nLet's Encrypt Authority X3"
|
||||
#define CERT_ISSUER_INFO_OLD "US\r\nLet's Encrypt\r\nLet's Encrypt Authority X3"
|
||||
#define CERT_ISSUER_INFO_NEW "US\r\nLet's Encrypt\r\nR3"
|
||||
#define CERT_SUBJECT_INFO "rapps.reactos.org"
|
||||
#endif
|
||||
|
||||
|
@ -700,7 +701,7 @@ DWORD WINAPI CDownloadManager::ThreadFunc(LPVOID param)
|
|||
(wcscmp(InfoArray[iAppId].szUrl, APPLICATION_DATABASE_URL) == 0))
|
||||
{
|
||||
CLocalPtr subjectName, issuerName;
|
||||
CStringW szMsgText;
|
||||
CStringA szMsgText;
|
||||
bool bAskQuestion = false;
|
||||
if (!CertGetSubjectAndIssuer(hFile, subjectName, issuerName))
|
||||
{
|
||||
|
@ -710,7 +711,8 @@ DWORD WINAPI CDownloadManager::ThreadFunc(LPVOID param)
|
|||
else
|
||||
{
|
||||
if (strcmp(subjectName, CERT_SUBJECT_INFO) ||
|
||||
strcmp(issuerName, CERT_ISSUER_INFO))
|
||||
(strcmp(issuerName, CERT_ISSUER_INFO_OLD) &&
|
||||
strcmp(issuerName, CERT_ISSUER_INFO_NEW)))
|
||||
{
|
||||
szMsgText.Format(IDS_MISMATCH_CERT_INFO, (char*)subjectName, (const char*)issuerName);
|
||||
bAskQuestion = true;
|
||||
|
@ -719,7 +721,7 @@ DWORD WINAPI CDownloadManager::ThreadFunc(LPVOID param)
|
|||
|
||||
if (bAskQuestion)
|
||||
{
|
||||
if (MessageBoxW(hMainWnd, szMsgText.GetString(), NULL, MB_YESNO | MB_ICONERROR) != IDYES)
|
||||
if (MessageBoxA(hMainWnd, szMsgText.GetString(), NULL, MB_YESNO | MB_ICONERROR) != IDYES)
|
||||
{
|
||||
goto end;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue