Commit Graph

1440 Commits

Author SHA1 Message Date
Sebastian Messmer
b5d5264016 Merge branch 'develop' of github.com:cryfs/cryfs into develop 2016-02-14 01:54:51 +01:00
Sebastian Messmer
6d3fe14c9e Fix fspp lstat tests on Mac OS X 2016-02-14 01:54:36 +01:00
Sebastian Messmer
fcf817fbdd Work around timing bug in OS X test cases 2016-02-14 01:18:19 +01:00
Sebastian Messmer
33c950e978 Fix Mock file system setup on Mac OS X 2016-02-14 01:01:59 +01:00
Sebastian Messmer
5363a397f8 Handle stopping the file system correctly on Mac OS X 2016-02-14 01:00:00 +01:00
Sebastian Messmer
6e5cdf0792 Merge branch 'develop' of github.com:cryfs/cryfs into develop 2016-02-13 21:23:16 +01:00
Sebastian Messmer
9e67952c95 Add fuse package as dependency instead of recommended package, because it is needed to actually mount a file system 2016-02-13 21:23:04 +01:00
Sebastian Messmer
fb3399ed00 Allow specifying -DCMAKE_BUILD_TYPE=RELEASE in addition to -DCMAKE_BUILD_TYPE=Release 2016-02-13 21:22:34 +01:00
Sebastian Messmer
e532885598 Fix crash on Mac OS X when parsing the command line parameters 2016-02-13 20:59:51 +01:00
Sebastian Messmer
53ef40ba46 Show correct umount command on Mac OS X 2016-02-13 20:50:50 +01:00
Sebastian Messmer
7453e83732 Fix crash on mac os X due to unimplemented statfs() 2016-02-13 20:47:15 +01:00
Sebastian Messmer
c0d0efd058 Fix compiler error in test cases on Mac OS X 2016-02-13 20:42:28 +01:00
Sebastian Messmer
2b9469cd20 Fix compiler error on Mac OS X 2016-02-13 16:13:25 +01:00
Sebastian Messmer
079d73a0ea Update spdlog: Allow syslog loggers on Mac 2016-02-13 15:54:01 +01:00
Sebastian Messmer
56ccf781eb Fix compiler warning on GCC 4.8 2016-02-13 15:26:16 +01:00
Sebastian Messmer
063e3917e3 Fixing ChangeLog 2016-02-13 15:17:49 +01:00
Sebastian Messmer
c81f99f00a Introduce version flags for file system entities to allow future CryFS versions to be backwards-compatible even if the format changes. 2016-02-13 15:06:33 +01:00
Sebastian Messmer
636445cd82 Introduce version flags for file system entities to allow future CryFS versions to be backwards-compatible even if the format changes. 2016-02-13 15:06:28 +01:00
Sebastian Messmer
1fd2cac9cd Adapt test cases to the removal of --extpass parameter 2016-02-13 11:38:56 +01:00
Sebastian Messmer
f433da7dc1 Remove --extpass parameter, because that encourages tool writers to do bad things like storing a password in a file and using --extpass="cat filename".
The password can now be passed in to stdin without problems, so tools should use that.
2016-02-13 10:46:05 +01:00
Sebastian Messmer
098f16a4fe Since Mac OS X doesn't support clock_gettime, implement it if running on Mac. 2016-02-13 02:46:00 +01:00
Sebastian Messmer
f749ad66f1 Fix a compiler error on Mac OS X 2016-02-13 02:19:31 +01:00
Sebastian Messmer
99abb65293 Add doc comment for cmake function 2016-02-13 02:10:20 +01:00
Sebastian Messmer
772fd12ed0 Require clang 3.5 2016-02-13 02:08:55 +01:00
Sebastian Messmer
3ff69b6a9f Allow specifying osxfuse include directory on command line using "cmake -DCMAKE_CXX_FLAGS=-I/path/to/osxfuse/include/dir". Furthermore, add some setup instructions for installing the requirements on Mac OS X. 2016-02-13 02:07:19 +01:00
Sebastian Messmer
f3ea142571 Merge branch 'develop' of github.com:cryfs/cryfs into develop 2016-02-12 23:55:18 +01:00
Sebastian Messmer
4f31b9ff4c Many supported systems don't have boost >= 1.56. Link it statically. 2016-02-12 23:55:08 +01:00
Sebastian Meßmer
380ce365fa Add zuluCrypt GUI notice to README 2016-02-12 23:29:44 +01:00
Sebastian Messmer
22bcc7f3bc Add password input fix to ChangeLog 2016-02-12 23:26:19 +01:00
Sebastian Messmer
ff62ef1b88 Don't use libc getpass() for asking the password anymore. It is deprecated and doesn't play nice with tools that want to pass in the password on stdin. Now we just use stdin. 2016-02-12 23:18:13 +01:00
Sebastian Messmer
aad7570222 Use parallel build of boost libraries on travis CI 2016-02-12 22:10:06 +01:00
Sebastian Messmer
0163029f3c In a release build, also compile scrypt library with optimization flags. 2016-02-12 21:58:37 +01:00
Sebastian Messmer
d4272ea442 Make scrypt compilation step work on 32bit 2016-02-12 21:22:08 +01:00
Sebastian Messmer
12e62a34d8 Fix CPU core count recognition on travis 2016-02-12 20:48:13 +01:00
Sebastian Messmer
2767c68222 Merge branch 'develop' into travistest 2016-02-12 18:29:56 +01:00
Sebastian Messmer
87be0e4477 Add libssl-dev dependency to README 2016-02-12 13:27:06 +01:00
Sebastian Messmer
59dbe54a75 Recognize number of CPU cores on Mac OS X travis 2016-02-12 13:17:35 +01:00
Sebastian Messmer
b5f14b81af Check number of CPU cores on travis 2016-02-12 13:11:11 +01:00
Sebastian Messmer
d05e3841bd Mountdir has correct ownership and permissions set. Fixes https://github.com/cryfs/cryfs/issues/10 2016-02-12 12:21:39 +01:00
Sebastian Messmer
3ecbef6d11 Fix CPack package generation 2016-02-12 11:12:14 +01:00
Sebastian Messmer
8f5e5640de Be more explicit in comment 2016-02-12 10:57:11 +01:00
Sebastian Messmer
41f215e5cb Since travis CI doesn't run "make package" anymore, we don't need the rpmbuild package anymore. 2016-02-12 10:47:40 +01:00
Sebastian Messmer
f5649f9dd2 Remove "make package" from travis. That would need a newer cmake version, but it is more important to test that cryfs compiles with the old cmake. 2016-02-12 10:44:05 +01:00
Sebastian Messmer
a26aa95683 Don't need to install newer cmake on travis anymore. 2016-02-12 10:29:44 +01:00
Sebastian Messmer
cbbe6448c4 Merge branch 'develop' into oldcmake2 2016-02-12 10:17:22 +01:00
Sebastian Messmer
19bc87ea30 Removed debug output 2016-02-12 10:16:52 +01:00
Sebastian Messmer
de4b2e60ad Allow cmake 2.8 2016-02-12 10:16:38 +01:00
Sebastian Messmer
ffcc343609 Install rpmbuild on travis CI 2016-02-12 09:50:44 +01:00
Sebastian Messmer
1b0d53056c Merge branch 'develop' of github.com:cryfs/cryfs into develop 2016-02-11 23:54:04 +01:00
Sebastian Messmer
7734566bbd Update gitversion 2016-02-11 23:53:23 +01:00