VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Mount
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2016-01-02 16:54:55 (GMT)
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2016-01-02 23:15:05 (GMT)
commit5872be28a243acb3b5aafdf13248e07d30471893 (patch)
tree98e5d23a0b9965e7dd3b336d5349ff027d9570aa /src/Mount
parent6cb1eefc49dbac29fb5a5bd2bf42569b6882d9c7 (diff)
downloadVeraCrypt-5872be28a243acb3b5aafdf13248e07d30471893.zip
VeraCrypt-5872be28a243acb3b5aafdf13248e07d30471893.tar.gz
Windows: Fix Dll hijacking vulnerability affecting installer that allows arbitrary code execution with elevation of privilege (CVE-2016-1281)
Diffstat (limited to 'src/Mount')
-rw-r--r--src/Mount/Mount.c7
-rw-r--r--src/Mount/Mount.vcproj8
2 files changed, 7 insertions, 8 deletions
diff --git a/src/Mount/Mount.c b/src/Mount/Mount.c
index 6d88512..5902320 100644
--- a/src/Mount/Mount.c
+++ b/src/Mount/Mount.c
@@ -4286,8 +4286,8 @@ void BuildTree (HWND hwndDlg, HWND hTree)
return;
hBitmapMask = LoadBitmap (hInst, MAKEINTRESOURCE (IDB_DRIVEICON_MASK));
- hList = ImageList_Create (16, 12, ILC_COLOR8|ILC_MASK, 2, 2);
- if (ImageList_Add (hList, hBitmap, hBitmapMask) == -1)
+ hList = CreateImageList (16, 12, ILC_COLOR8|ILC_MASK, 2, 2);
+ if (AddBitmapToImageList (hList, hBitmap, hBitmapMask) == -1)
{
DeleteObject (hBitmap);
DeleteObject (hBitmapMask);
@@ -4306,7 +4306,7 @@ void BuildTree (HWND hwndDlg, HWND hTree)
return;
hBitmapMask = LoadBitmap (hInst, MAKEINTRESOURCE (IDB_SYS_DRIVEICON_MASK));
- if (ImageList_Add (hList, hBitmap, hBitmapMask) == -1)
+ if (AddBitmapToImageList (hList, hBitmap, hBitmapMask) == -1)
{
DeleteObject (hBitmap);
DeleteObject (hBitmapMask);
@@ -8663,7 +8663,6 @@ int WINAPI wWinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, wchar_t *lpsz
if (BootEncObj == NULL)
AbortProcess ("INIT_SYS_ENC");
- InitCommonControls ();
InitApp (hInstance, lpszCommandLine);
RegisterRedTick(hInstance);
diff --git a/src/Mount/Mount.vcproj b/src/Mount/Mount.vcproj
index 58a199b..260e304 100644
--- a/src/Mount/Mount.vcproj
+++ b/src/Mount/Mount.vcproj
@@ -74,7 +74,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="comctl32.lib setupapi.lib version.lib ..\Crypto\Debug\crypto.lib"
+ AdditionalDependencies="..\Crypto\Debug\crypto.lib"
OutputFile="$(OutDir)/VeraCrypt.exe"
LinkIncremental="2"
GenerateManifest="false"
@@ -166,7 +166,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="comctl32.lib setupapi.lib version.lib ..\Crypto\x64\Debug\crypto.lib"
+ AdditionalDependencies="..\Crypto\x64\Debug\crypto.lib"
OutputFile="$(OutDir)/VeraCrypt.exe"
LinkIncremental="2"
GenerateManifest="false"
@@ -254,7 +254,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="comctl32.lib setupapi.lib version.lib ..\Crypto\Release\crypto.lib"
+ AdditionalDependencies="..\Crypto\Release\crypto.lib"
OutputFile="$(OutDir)/VeraCrypt.exe"
LinkIncremental="1"
GenerateManifest="false"
@@ -345,7 +345,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="comctl32.lib setupapi.lib version.lib ..\Crypto\x64\Release\crypto.lib"
+ AdditionalDependencies="..\Crypto\x64\Release\crypto.lib"
OutputFile="$(OutDir)/VeraCrypt.exe"
LinkIncremental="1"
GenerateManifest="false"