nihilist/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt synced 2024-11-28 14:03:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Windows: workaround for some cases where the system return ERROR_INVALID_PARAMETER when we try to write EFI bootloader files into ESP partition.

Browse Source
This commit is contained in:
Mounir IDRASSI 2017-07-03 01:54:24 +02:00
parent f78242fac6
commit 840756ead1
No known key found for this signature in database
GPG Key ID: DD0C382D5FCFB8FC
2 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/Common/BootEncryption.cpp
View File

@ -474,12 +474,12 @@ namespace VeraCrypt
#endif // SETUP #endif // SETUP
File::File (wstring path, bool readOnly, bool create) : Elevated (false), FileOpen (false), ReadOnly (readOnly), LastError(0) File::File (wstring path, bool readOnly, bool create, bool useNormalAttributes) : Elevated (false), FileOpen (false), ReadOnly (readOnly), LastError(0)
{ {
Handle = CreateFile (path.c_str(), Handle = CreateFile (path.c_str(),
readOnly ? GENERIC_READ : GENERIC_READ | GENERIC_WRITE, readOnly ? GENERIC_READ : GENERIC_READ | GENERIC_WRITE,
FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, create ? CREATE_ALWAYS : OPEN_EXISTING, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, create ? CREATE_ALWAYS : OPEN_EXISTING,
FILE_FLAG_RANDOM_ACCESS | FILE_FLAG_WRITE_THROUGH, NULL); useNormalAttributes? FILE_ATTRIBUTE_NORMAL : (FILE_FLAG_RANDOM_ACCESS | FILE_FLAG_WRITE_THROUGH), NULL);
if (Handle != INVALID_HANDLE_VALUE) if (Handle != INVALID_HANDLE_VALUE)
{ {
@ -2128,14 +2128,28 @@ namespace VeraCrypt
GetVolumeESP(pathESP); GetVolumeESP(pathESP);
if (szFilePath[0] != L'\\') if (szFilePath[0] != L'\\')
pathESP += L"\\"; pathESP += L"\\";
File f(pathESP + szFilePath, false, true);
fileContent.resize(dwSize); fileContent.resize(dwSize);
if (bAddUTF8BOM) if (bAddUTF8BOM)
memcpy (fileContent.data(), "\xEF\xBB\xBF", 3); memcpy (fileContent.data(), "\xEF\xBB\xBF", 3);
memcpy (&fileContent[dwOffset], pbData, dwDataLen); memcpy (&fileContent[dwOffset], pbData, dwDataLen);
try
{
File f(pathESP + szFilePath, false, true);
f.Write(fileContent.data(), dwSize); f.Write(fileContent.data(), dwSize);
f.Close(); f.Close();
} }
catch (SystemException &e)
{
if (e.ErrorCode != ERROR_INVALID_PARAMETER)
throw;
// try again with normal attributes
File f(pathESP + szFilePath, false, true, true);
f.Write(fileContent.data(), dwSize);
f.Close();
}
}
EfiBoot::EfiBoot() { EfiBoot::EfiBoot() {
ZeroMemory(EfiBootPartPath, sizeof(EfiBootPartPath)); ZeroMemory(EfiBootPartPath, sizeof(EfiBootPartPath));
@ -2422,10 +2436,23 @@ namespace VeraCrypt
void EfiBoot::SaveFile(const wchar_t* name, byte* data, DWORD size) { void EfiBoot::SaveFile(const wchar_t* name, byte* data, DWORD size) {
wstring path = EfiBootPartPath; wstring path = EfiBootPartPath;
path += name; path += name;
try
{
File f(path, false, true); File f(path, false, true);
f.Write(data, size); f.Write(data, size);
f.Close(); f.Close();
} }
catch (SystemException &e)
{
if (e.ErrorCode != ERROR_INVALID_PARAMETER)
throw;
// try again with normal attributes
File f(path, false, true, true);
f.Write(data, size);
f.Close();
}
}
void EfiBoot::GetFileSize(const wchar_t* name, unsigned __int64& size) { void EfiBoot::GetFileSize(const wchar_t* name, unsigned __int64& size) {
wstring path = EfiBootPartPath; wstring path = EfiBootPartPath;

2
src/Common/BootEncryption.h
View File

@ -37,7 +37,7 @@ namespace VeraCrypt
{ {
public: public:
File () : Elevated (false), FileOpen (false), ReadOnly (false), FilePointerPosition(0), Handle(INVALID_HANDLE_VALUE), IsDevice(false), LastError(0) { } File () : Elevated (false), FileOpen (false), ReadOnly (false), FilePointerPosition(0), Handle(INVALID_HANDLE_VALUE), IsDevice(false), LastError(0) { }
File (wstring path,bool readOnly = false, bool create = false); File (wstring path,bool readOnly = false, bool create = false, bool useNormalAttributes = false);
virtual ~File () { Close(); } virtual ~File () { Close(); }
void CheckOpened (const char* srcPos) { if (!FileOpen) { SetLastError (LastError); throw SystemException (srcPos);} } void CheckOpened (const char* srcPos) { if (!FileOpen) { SetLastError (LastError); throw SystemException (srcPos);} }