Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-21 16:04:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

[0.4.11][RAPPS] "Let's encrypt" Certificate-Issuer-Update hamster-wheel

Browse source 
"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-g 12caaece25
0.4.15-dev-1617-g f77f5a30cf

Next time this happens I will relentlessly undefine CMakeLists.txt USE_CERT_PINNING
This commit is contained in:
Joachim Henze 2021-01-11 21:27:36 +01:00
parent f32c82eda7
commit 37fb86792a
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
base/applications/rapps/loaddlg.cpp
View file

@ -47,7 +47,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
@ -783,7 +784,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))
{
@ -793,7 +794,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;
@ -802,7 +804,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;
}