VeraCrypt
aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2017-05-27 18:07:06 (GMT)
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2017-05-27 22:04:29 (GMT)
commita8e511c212af9fff1f8d5b4d2520aeaf4ecb6e4c (patch)
tree38a806eecc056c40bd0655e1ce0283862e187a2d
parentf94ceb7a9772a4b68fa3d2eb95bb44c9aa8cc2fe (diff)
downloadVeraCrypt-a8e511c212af9fff1f8d5b4d2520aeaf4ecb6e4c.zip
VeraCrypt-a8e511c212af9fff1f8d5b4d2520aeaf4ecb6e4c.tar.gz
Fix wrong FAT32 jump opcode in its header
-rw-r--r--src/Common/Fat.c2
-rw-r--r--src/Core/FatFormatter.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Common/Fat.c b/src/Common/Fat.c
index 7625e86..9cf477c 100644
--- a/src/Common/Fat.c
+++ b/src/Common/Fat.c
@@ -139,7 +139,7 @@ PutBoot (fatparams * ft, unsigned char *boot)
int cnt = 0;
boot[cnt++] = 0xeb; /* boot jump */
- boot[cnt++] = 0x3c;
+ boot[cnt++] = (ft->size_fat == 32)? 0x58: 0x3c;
boot[cnt++] = 0x90;
memcpy (boot + cnt, "MSDOS5.0", 8); /* system id */
cnt += 8;
diff --git a/src/Core/FatFormatter.cpp b/src/Core/FatFormatter.cpp
index 9fb54ff..a882e7a 100644
--- a/src/Core/FatFormatter.cpp
+++ b/src/Core/FatFormatter.cpp
@@ -153,8 +153,8 @@ namespace VeraCrypt
{
int cnt = 0;
- boot[cnt++] = 0xeb; /* boot jump */
- boot[cnt++] = 0x3c;
+ boot[cnt++] = 0xeb; /* boot jump */
+ boot[cnt++] = (ft->size_fat == 32)? 0x58: 0x3c;
boot[cnt++] = 0x90;
memcpy (boot + cnt, "MSDOS5.0", 8); /* system id */
cnt += 8;