Merge branch 'develop' of github.com:cryfs/cryfs into develop

src/cryfs/cli/Cli.cpp

@@ -209,8 +209,11 @@ namespace cryfs {
                 device.onFsAction(std::bind(&CallAfterTimeout::resetTimer, idleUnmounter->get()));
             }
 
+#ifdef __APPLE__
+            std::cout << "\nMounting filesystem. To unmount, call:\n$ umount " << options.mountDir() << "\n" << std::endl;
+#else
             std::cout << "\nMounting filesystem. To unmount, call:\n$ fusermount -u " << options.mountDir() << "\n" << std::endl;
-
+#endif
             vector<char *> fuseOptions = options.fuseOptions();
             fuse.run(fuseOptions.size(), fuseOptions.data());
         } catch (const std::exception &e) {

src/cryfs/filesystem/CryDevice.cpp

@@ -137,7 +137,7 @@ unique_ref<FsBlobRef> CryDevice::LoadBlob(const bf::path &path) {
 
 void CryDevice::statfs(const bf::path &path, struct statvfs *fsstat) {
   callFsActionCallbacks();
-  throw FuseErrnoException(ENOTSUP);
+  // TODO What should we report here?
 }
 
 unique_ref<FileBlobRef> CryDevice::CreateFileBlob() {

test/cryfs/config/CryConfigFileTest.cpp

@@ -2,7 +2,6 @@
 
 #include <cryfs/config/CryConfigFile.h>
 #include <cpp-utils/tempfile/TempFile.h>
-#include <boost/optional/optional_io.hpp>
 
 using namespace cryfs;
 using cpputils::TempFile;
@@ -17,10 +16,11 @@ namespace bf = boost::filesystem;
 namespace boost {
     inline std::ostream &operator<<(std::ostream &out, const CryConfigFile &file) {
         UNUSED(file);
-        out << "ConfigFile";
+        out << "ConfigFile()";
         return out;
     }
 }
+#include <boost/optional/optional_io.hpp>
 
 class CryConfigFileTest: public ::testing::Test {
 public:

test/cryfs/config/CryConfigLoaderTest.cpp

@@ -4,7 +4,6 @@
 #include <cpp-utils/tempfile/TempFile.h>
 #include <cpp-utils/random/Random.h>
 #include <cpp-utils/crypto/symmetric/ciphers.h>
-#include <boost/optional/optional_io.hpp>
 
 using cpputils::unique_ref;
 using cpputils::make_unique_ref;
@@ -25,6 +24,7 @@ namespace boost {
         return stream << "CryConfigFile()";
     }
 }
+#include <boost/optional/optional_io.hpp>
 
 //TODO Test loading with same/different --cipher argument
 

test/cryfs/config/crypto/CryConfigEncryptorFactoryTest.cpp

@@ -2,7 +2,6 @@
 #include <cryfs/config/crypto/CryConfigEncryptorFactory.h>
 #include <cpp-utils/crypto/symmetric/ciphers.h>
 #include <cpp-utils/data/DataFixture.h>
-#include <cpp-utils/pointer/unique_ref_boost_optional_gtest_workaround.h>
 
 using cpputils::SCrypt;
 using cpputils::AES256_GCM;
@@ -18,7 +17,7 @@ namespace boost {
         return stream << "CryConfigEncryptor::Decrypted()";
     }
 }
-
+#include <cpp-utils/pointer/unique_ref_boost_optional_gtest_workaround.h>
 
 class CryConfigEncryptorFactoryTest: public ::testing::Test {
 public:

test/cryfs/config/crypto/CryConfigEncryptorTest.cpp

@@ -1,7 +1,6 @@
 #include <gtest/gtest.h>
 #include <cpp-utils/data/DataFixture.h>
 #include <cpp-utils/crypto/symmetric/ciphers.h>
-#include <boost/optional/optional_io.hpp>
 #include <cryfs/config/crypto/CryConfigEncryptor.h>
 
 using std::ostream;
@@ -24,6 +23,7 @@ namespace boost {
         return stream << "CryConfigEncryptor::Decrypted()";
     }
 }
+#include <boost/optional/optional_io.hpp>
 
 class CryConfigEncryptorTest: public ::testing::Test {
 public:

test/cryfs/config/crypto/inner/ConcreteInnerEncryptorTest.cpp

@@ -2,7 +2,6 @@
 #include <cryfs/config/crypto/inner/ConcreteInnerEncryptor.h>
 #include <cpp-utils/crypto/symmetric/ciphers.h>
 #include <cpp-utils/data/DataFixture.h>
-#include <boost/optional/optional_io.hpp>
 
 using std::ostream;
 using boost::none;
@@ -21,6 +20,7 @@ namespace boost {
         return stream << "cpputils::Data()";
     }
 }
+#include <boost/optional/optional_io.hpp>
 
 class ConcreteInnerEncryptorTest : public ::testing::Test {
 public:

test/cryfs/config/crypto/inner/InnerConfigTest.cpp

@@ -1,6 +1,5 @@
 #include <gtest/gtest.h>
 #include <cpp-utils/data/DataFixture.h>
-#include <boost/optional/optional_io.hpp>
 #include <cryfs/config/crypto/inner/InnerConfig.h>
 
 using cpputils::Data;
@@ -15,6 +14,7 @@ namespace boost {
         return stream << "InnerConfig(" << config.cipherName << ", [data])";
     }
 }
+#include <boost/optional/optional_io.hpp>
 
 TEST(InnerConfigTest, SomeValues) {
     Data serialized = InnerConfig{"myciphername", DataFixture::generate(1024)}.serialize();

test/cryfs/config/crypto/outer/OuterConfigTest.cpp

@@ -1,6 +1,5 @@
 #include <gtest/gtest.h>
 #include <cpp-utils/data/DataFixture.h>
-#include <boost/optional/optional_io.hpp>
 #include <cryfs/config/crypto/outer/OuterConfig.h>
 
 using cpputils::Data;
@@ -16,6 +15,7 @@ namespace boost {
         return stream << "OuterConfig()";
     }
 }
+#include <boost/optional/optional_io.hpp>
 
 class OuterConfigTest: public ::testing::Test {
 public:

test/cryfs/config/crypto/outer/OuterEncryptorTest.cpp

@@ -2,7 +2,6 @@
 #include <cryfs/config/crypto/outer/OuterEncryptor.h>
 #include <cpp-utils/crypto/symmetric/ciphers.h>
 #include <cpp-utils/data/DataFixture.h>
-#include <boost/optional/optional_io.hpp>
 
 using std::ostream;
 using boost::none;
@@ -19,6 +18,7 @@ namespace boost {
         return stream << "cpputils::Data()";
     }
 }
+#include <boost/optional/optional_io.hpp>
 
 class OuterEncryptorTest : public ::testing::Test {
 public: