Commit Graph

442 Commits

Author SHA1 Message Date
10e26bf488 Resolve xattrs for symlinks (resolves #247, resolves #283) 2017-02-13 22:03:43 -08:00
424275208c Merge pull request #285 from dinoboy197/turn_on_all_integration_tests
Turn on all integration tests in Travis build
2017-02-12 12:11:45 +01:00
693d7f94aa Turn on all integration tests in Travis build 2017-02-11 21:38:48 -08:00
3b1b07fc14 Merge pull request #282 from rfjakob/issue280
Revert "-S" ABI change

Revert c3a7da5eff and enforce empty password ban.

Context:
https://github.com/tomm/cryptkeeper/issues/23
https://github.com/vgough/encfs/issues/280
2017-02-06 22:37:44 +01:00
5994b28542 Exit with a fatal error on empty password
The requirement that the password is not empty was not enforced
properly in all getUserKey() variants. Add the check to makeKey()
instead that is called in every code path.

This also fixes the crash desribed at https://github.com/vgough/encfs/issues/241 .
2017-02-05 14:06:19 +01:00
e9592fade4 Revert "Fix a segfault when password is zero length."
The change intended to fix a segfault when encfs is passed a zero-length
password (https://github.com/vgough/encfs/issues/241).

However, it also changed the CLI ABI which caused breakage in Cryptkeeper
(https://github.com/tomm/cryptkeeper/issues/23) and other third-party
projects that call EncFS.

Fixes https://github.com/vgough/encfs/issues/280 .

This reverts commit c3a7da5eff.
2017-02-05 14:05:36 +01:00
ac87a8ba0e Merge pull request #257 from charles-dyfis-net/shell-pedantry
Suggest "$@", not $*, in documentation
2017-01-07 22:55:37 -08:00
ecc364df0d Suggest "$@", not $*, in documentation
`$*` operates by:

- Concatenating all arguments with the first character in `IFS` (by default a space) into a single string
- Splitting that string on all characters found in `IFS` to join a list of words
- Expanding each of those words as a glob character

Thus, using `$*` in a wrapper means that an argument such as `"one word"` becomes two arguments, `one` and `word`, and an argument `'*.txt'` can be replaced with an entirely unknown number of arguments (`one.txt`, `two.txt`) despite its quoting.

Use `"$@"` to pass an argument vector through literally without any kind of expansion.
2016-12-22 16:37:15 -06:00
2be5bc7a11 Merge pull request #248 from Code7R/master
Declare minimum cmake version to have the Intl module
2016-12-15 15:08:01 -08:00
d9bd3d260e Merge pull request #251 from enodata/master
Fix misplaced namespace closing brace
2016-12-15 12:49:38 -08:00
afe67ab9a0 fix misplaced namespace closing brace 2016-12-10 09:59:03 -05:00
8509f26db8 Declare minimum cmake version to have the Intl module
Also mention Debian Backports where one can get a recent version and
also ninja-build as alternative to make (fixes #226)
2016-11-15 20:17:12 +01:00
559c30d01e Merge pull request #235 from rogeliodh/remove_deprecated_RAND_pseudo_bytes
remove usage of deprecated RAND_pseudo_bytes
2016-10-31 14:36:40 -07:00
2e41664562 Merge pull request #243 from ial0/ial_passwd_fix
Fix a segfault when password is zero length.
2016-10-31 14:36:01 -07:00
c3a7da5eff Fix a segfault when password is zero length.
if useStdin and configMode == Config_Prompt, default to Config_Standard,
otherwise we might read the password input at the wrong place.
2016-10-31 16:56:35 +00:00
b7fc9d09d9 remove usage of deprecated RAND_pseudo_bytes
Ignore the @strongRandom in SSL_Cipher::randomize because OpenSSL does not offer a "weak" random generator
2016-10-26 12:33:36 -05:00
bf3b31cb8e Merge pull request #233 from nckx/nckx/misc
Miscellaneous small man page fixes (mostly typos)
2016-10-23 13:28:26 -07:00
8d7ce724c9 Miscellaneous small man page fixes (mostly typos) 2016-10-20 17:24:59 +02:00
441fa20ed6 Merge pull request #230 from rogeliodh/openssl_1.1
build with openssl 1.1.0b
2016-10-17 15:46:21 -07:00
0573bc500c create OpenSSL < 1.1 compat header 2016-10-16 08:37:22 -05:00
323d57c53c Merge pull request #229 from rogeliodh/make_encfssh_executable
Obviously-good change, merging.
2016-10-16 15:17:57 +02:00
2574a77536 build with openssl 1.1.0b 2016-10-15 12:37:12 -05:00
0ae1d81b5e make encfssh script executable 2016-10-15 11:55:27 -05:00
656423f03f Merge pull request #223 from mtausig/fix/tmpfile_warning
Replace tmpnam with secure alternative.
2016-10-06 09:48:50 -07:00
65fa9f863b Replace tmpnam with secure alternative. (Issue #200) 2016-10-06 14:11:11 +02:00
644a0b2d78 Merge pull request #222 from thejinx0r/patch-1
CMakeList uses CMAKE_CURRENT_LIST_DIR
2016-10-03 10:52:26 -07:00
6dedd416dd CMakeList uses CMAKE_CURRENT_LIST_DIR
When including EncFS as a submodule in another project, encfs now use the paths relative to it self, rather than the parents path.
2016-10-03 08:08:17 -04:00
bf2cee54f5 cmake: use set instead of list to modify flags 2016-09-19 12:41:27 -07:00
a13a9f6af5 add changelog summary wqfor v1.9 series v1.9.1 2016-09-18 13:16:04 -07:00
9d998ca668 add filehandle null check 2016-09-18 13:03:37 -07:00
3497828816 bump version to 1.9.1 2016-09-15 17:14:26 -07:00
8abc7dbd92 Merge pull request #217 from vgough/elpp984
upgrade easylogging++ to v9.84, fix crash
2016-09-15 17:07:18 -07:00
f418b05ed5 prevent crash in elpp when verbose logging is enabled 2016-09-15 17:01:11 -07:00
b2a0e892c7 upgrade easylogging to v9.84 2016-09-15 16:55:16 -07:00
dc8871d7c5 Merge pull request #216 from vgough/logging-cruft
disable elpp default log file
2016-09-15 16:47:28 -07:00
259b4e5e11 disable elpp default log file 2016-09-15 16:41:09 -07:00
27ef3430f3 Merge pull request #215 from vgough/install-dir
add LIB_INSTALL_DIR override
2016-09-15 16:40:30 -07:00
3fa633fffe add LIB_INSTALL_DIR override, fixes #213 2016-09-15 16:34:03 -07:00
d83c40d6db Merge pull request #211 from vgough/cmake-osx
check for libintl when NLS is used
2016-09-13 13:19:41 -07:00
4443e99e35 check for libintl when NLS is used 2016-09-13 13:09:13 -07:00
aa8b5370ac add target to rebuild pot file v1.9 2016-09-09 15:43:06 +02:00
fe9bd84701 tweak docs, cleanup metadata 2016-09-09 14:23:04 +02:00
b69b162b99 Merge pull request #206 from vgough/coverity_scan
fix automated coverity scan
2016-09-09 11:07:36 +02:00
7c49fc560f fix coverity build command 2016-09-09 10:40:35 +02:00
5f65e68901 disable gcc build in travis 2016-09-09 10:27:44 +02:00
7e522a610c disable regular build during coverity run 2016-09-09 10:25:10 +02:00
6ba9d4af0f add travis build badge 2016-09-08 22:10:36 +02:00
9ff4aa36aa Merge pull request #205 from vgough/travis
fix travis build
2016-09-08 22:01:25 +02:00
788443e85d revert ci removal 2016-09-08 21:57:20 +02:00
4c8a97825c add c++11 flag default for clang 2016-09-08 21:50:12 +02:00