Commit Graph

2139 Commits

Author SHA1 Message Date
Sebastian Messmer
cab1c71cac Merge from develop 2017-02-04 19:18:00 +00:00
Sebastian Messmer
59afd50c28 Fix clang build 2017-02-04 19:17:17 +00:00
Sebastian Messmer
9292aab373 Merge from develop 2017-02-04 19:07:48 +00:00
Sebastian Messmer
54e0ffce2e Merge branch 'develop' of github.com:cryfs/cryfs into develop 2017-02-04 19:03:32 +00:00
Sebastian Messmer
9a304fc52b Upgrade spdlog to 0.11.0 2017-02-04 19:03:20 +00:00
Sebastian Messmer
596d9d0426 Merge from develop 2017-02-04 14:38:14 +00:00
Sebastian Messmer
7267bb5be4 Fix buid on Mac OS X 2017-02-04 14:21:00 +00:00
Nicolas Schneider
ffc2fe8eef print defaults for cipher and blocksize in cli help (#124)
Closes #94.
2017-01-23 00:23:51 +00:00
Sebastian Messmer
92776fe507 Merge branch 'develop' into next 2017-01-22 21:24:46 +00:00
Sebastian Meßmer
013be34150 Remove unneeded method 2017-01-22 19:46:47 +00:00
Sebastian Messmer
fa33896ee3 Remove dependency we no longer have 2017-01-22 01:32:23 +00:00
Sebastian Messmer
af24fa5402 Merge branch 'develop' into next 2017-01-22 01:11:36 +00:00
Sebastian Messmer
bbdfc5c234 Simplify FsppNodeTest 2017-01-22 01:11:26 +00:00
Sebastian Messmer
42765c6be6 Merge from develop 2017-01-21 20:24:09 +00:00
Sebastian Messmer
e37d84a3d6 fspp::Dir, fspp::File and fspp::Symlink don't inherit from fspp::Node anymore. This allows file systems to return a generic fspp::Node instead of a concrete subclass when the operation doesn't need to know what type of node it is. 2017-01-21 19:16:35 +00:00
Sebastian Messmer
002b1a2e23 Merge branch 'develop' of github.com:cryfs/cryfs into develop 2017-01-08 19:48:49 +00:00
Sebastian Messmer
a2fabac8da Upgrade to googletest 1.8.0 2017-01-08 18:51:01 +00:00
Sebastian Messmer
8c9cea6413 Fix nullversion recognition in gitversion 2016-12-31 16:22:57 +01:00
Sebastian Messmer
2367cea204 Merge branch 'develop' of github.com:cryfs/cryfs into develop 2016-10-26 13:50:28 -07:00
Sebastian Messmer
681f415272 Use curl_global_init/curl_global_cleanup for cleaner shutdown of executable 2016-10-26 13:50:20 -07:00
Sebastian Meßmer
62d5545051 Removed Crypto++ 5.6.4 warning from README 2016-10-25 16:24:09 -07:00
Sebastian Messmer
6180ff5a9f Merge branch 'develop' of github.com:cryfs/cryfs into develop 2016-10-25 16:22:20 -07:00
Sebastian Messmer
90076714d4 Don't allow CI failures for linux/clang anymore 2016-10-25 16:22:13 -07:00
Sebastian Meßmer
ff4186fb9f Update ChangeLog.txt 2016-10-25 16:06:28 -07:00
Sebastian Messmer
6e86116d36 When using clang on linux, don't use libc++, but libstdc++.
Workaround for https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=808086
2016-10-25 15:50:53 -07:00
Sebastian Messmer
b12c68e2af Merge branch 'develop' of github.com:cryfs/cryfs into develop 2016-10-20 10:35:42 +02:00
Sebastian Messmer
abae027538 Fix compiler error on FreeBSD 2016-10-20 10:35:29 +02:00
Ender Frias
7b4e0a2813 Fix formatting error in line 93-95 on README.md (#108)
Configuration parameter were not properly formatted.
2016-10-20 10:08:08 +02:00
Sebastian Messmer
fb123f8fd0 Removed fixed TODOs 2016-10-14 12:34:42 +02:00
Sebastian Messmer
890d9de0bd Fix cpack package generation 2016-10-14 02:02:50 +02:00
Sebastian Messmer
6216907500 Fix postinst script for cpack generated .deb package for Ubuntu 16.10 2016-10-14 01:02:18 +02:00
Sebastian Messmer
6ad8a203b5 Added a script to create archives 2016-10-13 20:00:59 +02:00
Sebastian Messmer
9d05b8571c Merge from develop 2016-10-13 18:30:27 +02:00
Sebastian Messmer
bbf6cb21c1 Mark version 0.9.6 as released 2016-10-13 17:37:03 +02:00
Sebastian Messmer
65804c6f43 Fix Travis CI 2016-10-05 10:05:02 +02:00
Sebastian Messmer
a32636842e For scrypt compilation, use the cpusupport-config.h created by the scrypt build 2016-10-05 09:07:37 +02:00
Sebastian Messmer
72b6874c12 Add fix for compiling the scrypt module under hardening-wrapper 2016-10-04 20:45:26 +02:00
Sebastian Messmer
bd74a5b762 More detailed error reporting if key derivation fails 2016-10-02 11:01:14 +02:00
Sebastian Messmer
2c4b9c84f9 Merge branch 'develop' of github.com:cryfs/cryfs into develop 2016-09-25 20:44:43 +02:00
Sebastian Messmer
ce218f264a Silence a static analysis warning 2016-09-25 20:36:35 +02:00
Sebastian Messmer
f0f4499200 Fix test cases 2016-09-25 20:05:38 +02:00
Sebastian Meßmer
90adf20483 Update ChangeLog.txt 2016-09-25 11:42:49 +02:00
Sebastian Messmer
58d6a454d7 Merge branch 'develop' into next 2016-09-25 11:41:33 +02:00
Sebastian Messmer
54fb6fbd89 Fix test cases 2016-09-25 11:41:21 +02:00
Sebastian Messmer
6464bfb4b7 Disable update checks in noninteractive mode 2016-09-25 11:40:01 +02:00
Sebastian Messmer
5ff51cb358 Merge branch 'develop' into next 2016-09-25 03:01:42 +02:00
Sebastian Messmer
8ae2dee7fc Fix test cases 2016-09-25 03:01:29 +02:00
Sebastian Messmer
e009040264 Merge from develop 2016-09-25 02:53:35 +02:00
Sebastian Messmer
443298844e Fix test cases 2016-09-25 02:50:28 +02:00
Sebastian Messmer
bcf9d3c55d Merge branch 'develop' into next 2016-09-24 20:48:47 +02:00