[ros-diffs] [cwittich] 69401: [RAPPS] add support for SSL certificate pinning

Author: cwittich
Date: Mon Sep 28 14:09:09 2015
New Revision: 69401

URL: http://svn.reactos.org/svn/reactos?rev=69401&view=rev
Log:
[RAPPS]
add support for SSL certificate pinning

Modified:
    trunk/reactos/base/applications/rapps/CMakeLists.txt
    trunk/reactos/base/applications/rapps/lang/bg-BG.rc
    trunk/reactos/base/applications/rapps/lang/cs-CZ.rc
    trunk/reactos/base/applications/rapps/lang/de-DE.rc
    trunk/reactos/base/applications/rapps/lang/en-US.rc
    trunk/reactos/base/applications/rapps/lang/es-ES.rc
    trunk/reactos/base/applications/rapps/lang/fr-FR.rc
    trunk/reactos/base/applications/rapps/lang/he-IL.rc
    trunk/reactos/base/applications/rapps/lang/it-IT.rc
    trunk/reactos/base/applications/rapps/lang/ja-JP.rc
    trunk/reactos/base/applications/rapps/lang/no-NO.rc
    trunk/reactos/base/applications/rapps/lang/pl-PL.rc
    trunk/reactos/base/applications/rapps/lang/pt-BR.rc
    trunk/reactos/base/applications/rapps/lang/ro-RO.rc
    trunk/reactos/base/applications/rapps/lang/ru-RU.rc
    trunk/reactos/base/applications/rapps/lang/sk-SK.rc
    trunk/reactos/base/applications/rapps/lang/sq-AL.rc
    trunk/reactos/base/applications/rapps/lang/sv-SE.rc
    trunk/reactos/base/applications/rapps/lang/tr-TR.rc
    trunk/reactos/base/applications/rapps/lang/uk-UA.rc
    trunk/reactos/base/applications/rapps/lang/zh-CN.rc
    trunk/reactos/base/applications/rapps/lang/zh-TW.rc
    trunk/reactos/base/applications/rapps/loaddlg.c
    trunk/reactos/base/applications/rapps/rapps.h
    trunk/reactos/base/applications/rapps/resource.h

Modified: trunk/reactos/base/applications/rapps/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/CM…
==============================================================================
--- trunk/reactos/base/applications/rapps/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/rapps/CMakeLists.txt	[iso-8859-1] Mon Sep 28 14:09:09
2015
@@ -16,6 +16,7 @@
     winmain.c
     rapps.h)
 
+add_definitions(-DUSE_CERT_PINNING)
 file(GLOB_RECURSE rapps_rc_deps res/*.*)
 add_rc_deps(rapps.rc ${rapps_rc_deps})
 add_executable(rapps ${SOURCE} rapps.rc)

Modified: trunk/reactos/base/applications/rapps/lang/bg-BG.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la…
==============================================================================
--- trunk/reactos/base/applications/rapps/lang/bg-BG.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/rapps/lang/bg-BG.rc	[iso-8859-1] Mon Sep 28 14:09:09
2015
@@ -201,4 +201,5 @@
     IDS_INFORMATION "Сведения"
     IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not
found!"
     IDS_UNABLE_TO_REMOVE "Премахването на данните за приложението от регистъра е
невъзможно!"
-END
+    IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed."    
+END

Modified: trunk/reactos/base/applications/rapps/lang/cs-CZ.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la…
==============================================================================
--- trunk/reactos/base/applications/rapps/lang/cs-CZ.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/rapps/lang/cs-CZ.rc	[iso-8859-1] Mon Sep 28 14:09:09
2015
@@ -202,4 +202,5 @@
     IDS_INFORMATION "Informace"
     IDS_UNABLE_TO_DOWNLOAD "Soubor se nepodařilo stáhnout! Adresa
nenalezena!"
     IDS_UNABLE_TO_REMOVE "Nepodařilo se odstranit data programu z registru!"
-END
+    IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed."
+END

Modified: trunk/reactos/base/applications/rapps/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la…
==============================================================================
--- trunk/reactos/base/applications/rapps/lang/de-DE.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/rapps/lang/de-DE.rc	[iso-8859-1] Mon Sep 28 14:09:09
2015
@@ -197,4 +197,5 @@
     IDS_INFORMATION "Informationen"
     IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not
found!"
     IDS_UNABLE_TO_REMOVE "Konnte die Daten nicht aus der Registry löschen!"
-END
+    IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed."
+END

Modified: trunk/reactos/base/applications/rapps/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la…
==============================================================================
--- trunk/reactos/base/applications/rapps/lang/en-US.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/rapps/lang/en-US.rc	[iso-8859-1] Mon Sep 28 14:09:09
2015
@@ -197,4 +197,5 @@
     IDS_INFORMATION "Information"
     IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not
found!"
     IDS_UNABLE_TO_REMOVE "Unable to remove data on the program from the
registry!"
-END
+    IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed."
+END

Modified: trunk/reactos/base/applications/rapps/lang/es-ES.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la…
==============================================================================
--- trunk/reactos/base/applications/rapps/lang/es-ES.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/rapps/lang/es-ES.rc	[iso-8859-1] Mon Sep 28 14:09:09
2015
@@ -200,4 +200,5 @@
     IDS_INFORMATION "Información"
     IDS_UNABLE_TO_DOWNLOAD "No se pudo descargar el paquete. No se ha encontrado la
dirección de Internet."
     IDS_UNABLE_TO_REMOVE "No se pudieron borrar del Registro los datos de
instalación del programa."
-END
+    IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed."    
+END

Modified: trunk/reactos/base/applications/rapps/lang/fr-FR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la…
==============================================================================
--- trunk/reactos/base/applications/rapps/lang/fr-FR.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/rapps/lang/fr-FR.rc	[iso-8859-1] Mon Sep 28 14:09:09
2015
@@ -197,4 +197,5 @@
     IDS_INFORMATION "Information"
     IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not
found!"
     IDS_UNABLE_TO_REMOVE "Impossible de supprimer les données du programme du
registre !"
-END
+    IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed."    
+END

Modified: trunk/reactos/base/applications/rapps/lang/he-IL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la…
==============================================================================
--- trunk/reactos/base/applications/rapps/lang/he-IL.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/rapps/lang/he-IL.rc	[iso-8859-1] Mon Sep 28 14:09:09
2015
@@ -199,4 +199,5 @@
     IDS_INFORMATION "מידע"
     IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not
found!"
     IDS_UNABLE_TO_REMOVE "Unable to remove data on the program from the
registry!"
-END
+    IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed."    
+END

Modified: trunk/reactos/base/applications/rapps/lang/it-IT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la…
==============================================================================
--- trunk/reactos/base/applications/rapps/lang/it-IT.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/rapps/lang/it-IT.rc	[iso-8859-1] Mon Sep 28 14:09:09
2015
@@ -197,4 +197,5 @@
     IDS_INFORMATION "Informazioni"
     IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not
found!"
     IDS_UNABLE_TO_REMOVE "Impossibile cancellare i dati dal registry!"
-END
+    IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed."    
+END

Modified: trunk/reactos/base/applications/rapps/lang/ja-JP.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la…
==============================================================================
--- trunk/reactos/base/applications/rapps/lang/ja-JP.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/rapps/lang/ja-JP.rc	[iso-8859-1] Mon Sep 28 14:09:09
2015
@@ -197,4 +197,5 @@
     IDS_INFORMATION "æƒ…å ±"
     IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not
found!"
     IDS_UNABLE_TO_REMOVE
"レジストリからこのプログラムに関するデータを削除できません!"
-END
+    IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed."    
+END

Modified: trunk/reactos/base/applications/rapps/lang/no-NO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la…
==============================================================================
--- trunk/reactos/base/applications/rapps/lang/no-NO.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/rapps/lang/no-NO.rc	[iso-8859-1] Mon Sep 28 14:09:09
2015
@@ -197,4 +197,5 @@
     IDS_INFORMATION "Information"
     IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not
found!"
     IDS_UNABLE_TO_REMOVE "Unable to remove data on the program from the
registry!"
-END
+    IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed."    
+END

Modified: trunk/reactos/base/applications/rapps/lang/pl-PL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la…
==============================================================================
--- trunk/reactos/base/applications/rapps/lang/pl-PL.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/rapps/lang/pl-PL.rc	[iso-8859-1] Mon Sep 28 14:09:09
2015
@@ -205,4 +205,5 @@
     IDS_INFORMATION "Informacja"
     IDS_UNABLE_TO_DOWNLOAD "Nie można pobrać pakietu! Nie znaleziono
adresu!"
     IDS_UNABLE_TO_REMOVE "Nie można było usunąć wpisu z rejestru!"
-END
+    IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed."    
+END

Modified: trunk/reactos/base/applications/rapps/lang/pt-BR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la…
==============================================================================
--- trunk/reactos/base/applications/rapps/lang/pt-BR.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/rapps/lang/pt-BR.rc	[iso-8859-1] Mon Sep 28 14:09:09
2015
@@ -199,4 +199,5 @@
     IDS_INFORMATION "Informações"
     IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not
found!"
     IDS_UNABLE_TO_REMOVE "Não foi possível remover as informações do programa do
registro!"
-END
+    IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed."    
+END

Modified: trunk/reactos/base/applications/rapps/lang/ro-RO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la…
==============================================================================
--- trunk/reactos/base/applications/rapps/lang/ro-RO.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/rapps/lang/ro-RO.rc	[iso-8859-1] Mon Sep 28 14:09:09
2015
@@ -203,4 +203,5 @@
     IDS_INFORMATION "Informație"
     IDS_UNABLE_TO_DOWNLOAD "Pachetul nu poate fi descărcat! Adresa nu este
găsită!"
     IDS_UNABLE_TO_REMOVE "Nu se pot elimina datele din registru pentru acest
program!"
-END
+    IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed."    
+END

Modified: trunk/reactos/base/applications/rapps/lang/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la…
==============================================================================
--- trunk/reactos/base/applications/rapps/lang/ru-RU.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/rapps/lang/ru-RU.rc	[iso-8859-1] Mon Sep 28 14:09:09
2015
@@ -197,4 +197,5 @@
     IDS_INFORMATION "Информация"
     IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not
found!"
     IDS_UNABLE_TO_REMOVE "Не удалось удалить данные о
программе из реестра!"
-END
+    IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed."    
+END

Modified: trunk/reactos/base/applications/rapps/lang/sk-SK.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la…
==============================================================================
--- trunk/reactos/base/applications/rapps/lang/sk-SK.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/rapps/lang/sk-SK.rc	[iso-8859-1] Mon Sep 28 14:09:09
2015
@@ -202,4 +202,5 @@
     IDS_INFORMATION "Informácie"
     IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not
found!"
     IDS_UNABLE_TO_REMOVE "Nie je možné odstrániť z registrov údaje o
programe!"
-END
+    IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed."    
+END

Modified: trunk/reactos/base/applications/rapps/lang/sq-AL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la…
==============================================================================
--- trunk/reactos/base/applications/rapps/lang/sq-AL.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/rapps/lang/sq-AL.rc	[iso-8859-1] Mon Sep 28 14:09:09
2015
@@ -201,4 +201,5 @@
     IDS_INFORMATION "Informacione"
     IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not
found!"
     IDS_UNABLE_TO_REMOVE "E pamundur te fshihen informacionet e programit nga
regjistri!"
-END
+    IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed."    
+END

Modified: trunk/reactos/base/applications/rapps/lang/sv-SE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la…
==============================================================================
--- trunk/reactos/base/applications/rapps/lang/sv-SE.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/rapps/lang/sv-SE.rc	[iso-8859-1] Mon Sep 28 14:09:09
2015
@@ -204,4 +204,5 @@
     IDS_INFORMATION "Information"
     IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not
found!"
     IDS_UNABLE_TO_REMOVE "Det gick ej att ta bort programmets data från
registret!"
-END
+    IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed."    
+END

Modified: trunk/reactos/base/applications/rapps/lang/tr-TR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la…
==============================================================================
--- trunk/reactos/base/applications/rapps/lang/tr-TR.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/rapps/lang/tr-TR.rc	[iso-8859-1] Mon Sep 28 14:09:09
2015
@@ -199,4 +199,5 @@
     IDS_INFORMATION "Bilgi"
     IDS_UNABLE_TO_DOWNLOAD "Paket indirilemez! Adres bulunamadı!"
     IDS_UNABLE_TO_REMOVE "İzlencenin girişi değer defterinden silinemiyor."
-END
+    IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed."    
+END

Modified: trunk/reactos/base/applications/rapps/lang/uk-UA.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la…
==============================================================================
--- trunk/reactos/base/applications/rapps/lang/uk-UA.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/rapps/lang/uk-UA.rc	[iso-8859-1] Mon Sep 28 14:09:09
2015
@@ -205,4 +205,5 @@
     IDS_INFORMATION "Інформація"
     IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not
found!"
     IDS_UNABLE_TO_REMOVE "Не вдалося видалити дані про
програму з реєстру!"
-END
+    IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed."    
+END

Modified: trunk/reactos/base/applications/rapps/lang/zh-CN.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la…
==============================================================================
--- trunk/reactos/base/applications/rapps/lang/zh-CN.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/rapps/lang/zh-CN.rc	[iso-8859-1] Mon Sep 28 14:09:09
2015
@@ -200,4 +200,5 @@
     IDS_INFORMATION "信息"
     IDS_UNABLE_TO_DOWNLOAD "æ— æ³•ä¸‹è½½è¯¥è½¯ä»¶åŒ… ！找不到网络的地址 ！"
     IDS_UNABLE_TO_REMOVE "æ— æ³•ä»Žæ³¨å†Œè¡¨åˆ é™¤è¯¥ç¨‹åºçš„æ•°æ®ï¼"
-END
+    IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed."    
+END

Modified: trunk/reactos/base/applications/rapps/lang/zh-TW.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la…
==============================================================================
--- trunk/reactos/base/applications/rapps/lang/zh-TW.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/rapps/lang/zh-TW.rc	[iso-8859-1] Mon Sep 28 14:09:09
2015
@@ -199,4 +199,5 @@
     IDS_INFORMATION "資訊"
     IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not
found!"
     IDS_UNABLE_TO_REMOVE "無法從登錄檔刪除該程式的資料！"
-END
+    IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed."    
+END

Modified: trunk/reactos/base/applications/rapps/loaddlg.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/lo…
==============================================================================
--- trunk/reactos/base/applications/rapps/loaddlg.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/rapps/loaddlg.c	[iso-8859-1] Mon Sep 28 14:09:09 2015
@@ -201,6 +201,58 @@
     return (IBindStatusCallback*) This;
 }
 
+#ifdef USE_CERT_PINNING
+static BOOL CertIsValid(HINTERNET hInternet, LPWSTR lpszHostName)
+{
+    HINTERNET hConnect;
+    HINTERNET hRequest;
+    DWORD certInfoLength;
+    BOOL Ret = FALSE;
+    INTERNET_CERTIFICATE_INFOW certInfo;
+
+    hConnect = InternetConnectW(hInternet, lpszHostName, INTERNET_DEFAULT_HTTPS_PORT,
NULL, NULL, INTERNET_SERVICE_HTTP, INTERNET_FLAG_SECURE, 0); 
+    if (hConnect)
+    {
+        hRequest = HttpOpenRequestW(hConnect, L"HEAD", NULL, NULL, NULL, NULL,
INTERNET_FLAG_SECURE, 0);
+        if (hRequest != NULL)
+        {  
+            Ret = HttpSendRequestW(hRequest, L"", 0, NULL, 0);
+            if (Ret) 
+            { 
+                certInfoLength = sizeof(INTERNET_CERTIFICATE_INFOW);
+                Ret = InternetQueryOptionW(hRequest,
+                                           INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT,
+                                           &certInfo,
+                                           &certInfoLength);
+                if (Ret)
+                {
+                    if (certInfo.lpszEncryptionAlgName) 
+                        LocalFree(certInfo.lpszEncryptionAlgName);
+                    if (certInfo.lpszIssuerInfo)
+                    {
+                        if (strcmp((LPSTR)certInfo.lpszIssuerInfo, CERT_ISSUER_INFO) !=
0)
+                            Ret = FALSE;
+                        LocalFree(certInfo.lpszIssuerInfo);
+                    }
+                    if (certInfo.lpszProtocolName) 
+                        LocalFree(certInfo.lpszProtocolName);
+                    if (certInfo.lpszSignatureAlgName) 
+                        LocalFree(certInfo.lpszSignatureAlgName);
+                    if (certInfo.lpszSubjectInfo) 
+                    {
+                        if (strcmp((LPSTR)certInfo.lpszSubjectInfo, CERT_SUBJECT_INFO) !=
0)
+                            Ret = FALSE;
+                        LocalFree(certInfo.lpszSubjectInfo);
+                    }
+                }
+            }
+            InternetCloseHandle(hRequest);
+        }
+    }
+    return Ret;
+}
+#endif
+
 static
 DWORD WINAPI
 ThreadFunc(LPVOID Context)
@@ -307,6 +359,8 @@
     
     urlComponents.dwSchemeLength = urlLength*sizeof(WCHAR);
     urlComponents.lpszScheme = malloc(urlComponents.dwSchemeLength);
+    urlComponents.dwHostNameLength = urlLength*sizeof(WCHAR);
+    urlComponents.lpszHostName = malloc(urlComponents.dwHostNameLength);
     
     if(!InternetCrackUrlW(AppInfo->szUrlDownload, urlLength+1, ICU_DECODE |
ICU_ESCAPE, &urlComponents))
         goto end;
@@ -317,7 +371,21 @@
     if(urlComponents.nScheme == INTERNET_SCHEME_FTP)
         dwContentLen = FtpGetFileSize(hFile, &dwStatus);
 
+#ifdef USE_CERT_PINNING
+    if ((urlComponents.nScheme == INTERNET_SCHEME_HTTPS) && (!CertIsValid(hOpen,
urlComponents.lpszHostName)))
+    {
+        WCHAR szMsgText[MAX_STR_LEN];
+
+        if (!LoadStringW(hInst, IDS_CERT_DOES_NOT_MATCH, szMsgText, sizeof(szMsgText) /
sizeof(WCHAR)))
+            goto end;
+
+        MessageBoxW(hMainWnd, szMsgText, NULL, MB_OK | MB_ICONERROR);
+        goto end;
+    }
+#endif
+
     free(urlComponents.lpszScheme);
+    free(urlComponents.lpszHostName);
 
     hOut = CreateFileW(path, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL,
CREATE_ALWAYS, 0, NULL);
 

Modified: trunk/reactos/base/applications/rapps/rapps.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra…
==============================================================================
--- trunk/reactos/base/applications/rapps/rapps.h	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/rapps/rapps.h	[iso-8859-1] Mon Sep 28 14:09:09 2015
@@ -25,6 +25,11 @@
 #include <rappsmsg.h>
 
 #include "resource.h"
+
+#ifdef USE_CERT_PINNING
+  #define CERT_ISSUER_INFO "BE\r\nGlobalSign nv-sa\r\nGlobalSign Domain Validation
CA - SHA256 - G2"
+  #define CERT_SUBJECT_INFO "Domain Control Validated\r\n*.reactos.org"
+#endif
 
 #define APPLICATION_DATABASE_URL
L"https://svn.reactos.org/packages/rappmgr.cab"
 

Modified: trunk/reactos/base/applications/rapps/resource.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re…
==============================================================================
--- trunk/reactos/base/applications/rapps/resource.h	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/rapps/resource.h	[iso-8859-1] Mon Sep 28 14:09:09
2015
@@ -96,6 +96,7 @@
 #define IDS_INFORMATION          117
 #define IDS_UNABLE_TO_REMOVE     118
 #define IDS_UNABLE_TO_DOWNLOAD   119
+#define IDS_CERT_DOES_NOT_MATCH  120
 
 /* Tooltips */
 #define IDS_TOOLTIP_INSTALL      200