VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Core/Unix/MacOSX
diff options
context:
space:
mode:
authorThierry Lelegard <lelegard@users.noreply.github.com>2020-11-28 17:10:51 +0100
committerGitHub <noreply@github.com>2020-11-28 17:10:51 +0100
commit66e550d11f1cb1fc5c13e8acf608cf753f1fb2fc (patch)
tree88cd66d24668c2910044493e950ab57ce6833adb /src/Core/Unix/MacOSX
parent719f32fa7712ab411430377217aadce57f17f272 (diff)
downloadVeraCrypt-66e550d11f1cb1fc5c13e8acf608cf753f1fb2fc.tar.gz
VeraCrypt-66e550d11f1cb1fc5c13e8acf608cf753f1fb2fc.zip
Fixed macFUSE support for macOS 11 (Big Sur) (#699)
Diffstat (limited to 'src/Core/Unix/MacOSX')
-rw-r--r--src/Core/Unix/MacOSX/CoreMacOSX.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/Core/Unix/MacOSX/CoreMacOSX.cpp b/src/Core/Unix/MacOSX/CoreMacOSX.cpp
index c3809ef3..b596e6e8 100644
--- a/src/Core/Unix/MacOSX/CoreMacOSX.cpp
+++ b/src/Core/Unix/MacOSX/CoreMacOSX.cpp
@@ -123,13 +123,17 @@ namespace VeraCrypt
fuseVersionStringLength = MAXHOSTNAMELEN;
if ((status = sysctlbyname ("vfs.generic.osxfuse.version.number", fuseVersionString, &fuseVersionStringLength, NULL, 0)) != 0)
{
- throw HigherFuseVersionRequired (SRC_POS);
+ fuseVersionStringLength = MAXHOSTNAMELEN;
+ if ((status = sysctlbyname ("vfs.generic.macfuse.version.number", fuseVersionString, &fuseVersionStringLength, NULL, 0)) != 0)
+ {
+ throw HigherFuseVersionRequired (SRC_POS);
+ }
}
}
// look for OSXFuse dynamic library
struct stat sb;
- if (0 != stat("/usr/local/lib/libosxfuse_i64.2.dylib", &sb))
+ if (0 != stat("/usr/local/lib/libosxfuse_i64.2.dylib", &sb) && 0 != stat("/usr/local/lib/libfuse.dylib", &sb))
{
throw HigherFuseVersionRequired (SRC_POS);
}