*: trim trailing whitespace

This commit is contained in:
a1346054 2021-08-31 17:05:38 +00:00 committed by rfjakob
parent 6cb03b54fe
commit 7c2255be90
7 changed files with 14 additions and 17 deletions

View File

@ -191,7 +191,7 @@ Show all invalid filenames:
Create a control socket at the specified location. The socket can be Create a control socket at the specified location. The socket can be
used to decrypt and encrypt paths inside the filesystem. When using used to decrypt and encrypt paths inside the filesystem. When using
this option, make sure that the directory you place the socket in is this option, make sure that the directory you place the socket in is
not world-accessible. For example, `/run/user/UID/my.socket` would not world-accessible. For example, `/run/user/UID/my.socket` would
be suitable. be suitable.
#### -dev, -nodev #### -dev, -nodev
@ -257,7 +257,7 @@ filesystem that doesn't properly support UNIX ownership and permissions.
#### -forcedecode #### -forcedecode
Force decode of encrypted files even if the integrity check fails, instead of Force decode of encrypted files even if the integrity check fails, instead of
failing with an IO error. Warning messages are still printed to syslog if corrupted failing with an IO error. Warning messages are still printed to syslog if corrupted
files are encountered. files are encountered.
It can be useful to recover files from disks with bad sectors or other corrupted It can be useful to recover files from disks with bad sectors or other corrupted
media. It shall not be used if the origin of corruption is unknown, specially media. It shall not be used if the origin of corruption is unknown, specially

View File

@ -61,7 +61,7 @@ Needs further analysis: `Too many open files`
## Full Test Output ## Full Test Output
``` ```
0 jakob@brikett:~/code/fuse-xfstests$ sudo ./check-gocryptfs 0 jakob@brikett:~/code/fuse-xfstests$ sudo ./check-gocryptfs
gocryptfs v1.7.1; go-fuse v2.0.2-4-g8458b8a; 2019-10-10 go1.12.9 linux/amd64 gocryptfs v1.7.1; go-fuse v2.0.2-4-g8458b8a; 2019-10-10 go1.12.9 linux/amd64
fuse-xfstests nlink0/dff383ab fuse-xfstests nlink0/dff383ab
Thu 10 Oct 2019 08:31:43 PM UTC Thu 10 Oct 2019 08:31:43 PM UTC
@ -146,12 +146,12 @@ generic/062 - output mismatch (see /home/jakob.donotbackup/code/fuse-xfstests/re
--- tests/generic/062.out 2018-01-20 14:29:39.067451950 +0100 --- tests/generic/062.out 2018-01-20 14:29:39.067451950 +0100
+++ /home/jakob.donotbackup/code/fuse-xfstests/results//generic/062.out.bad 2019-10-10 22:34:34.290196880 +0200 +++ /home/jakob.donotbackup/code/fuse-xfstests/results//generic/062.out.bad 2019-10-10 22:34:34.290196880 +0200
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
*** set/get one initially empty attribute *** set/get one initially empty attribute
# file: SCRATCH_MNT/reg # file: SCRATCH_MNT/reg
-user.name -user.name
+user.name="" +user.name=""
*** overwrite empty, set several new attributes *** overwrite empty, set several new attributes
... ...
(Run 'diff -u tests/generic/062.out /home/jakob.donotbackup/code/fuse-xfstests/results//generic/062.out.bad' to see the entire diff) (Run 'diff -u tests/generic/062.out /home/jakob.donotbackup/code/fuse-xfstests/results//generic/062.out.bad' to see the entire diff)
@ -190,7 +190,7 @@ generic/093 - output mismatch (see /home/jakob.donotbackup/code/fuse-xfstests/re
+++ /home/jakob.donotbackup/code/fuse-xfstests/results//generic/093.out.bad 2019-10-10 22:45:22.194059446 +0200 +++ /home/jakob.donotbackup/code/fuse-xfstests/results//generic/093.out.bad 2019-10-10 22:45:22.194059446 +0200
@@ -1,15 +1,22 @@ @@ -1,15 +1,22 @@
QA output created by 093 QA output created by 093
**** Verifying that appending to file clears capabilities **** **** Verifying that appending to file clears capabilities ****
-file = cap_chown+ep -file = cap_chown+ep
+Failed to set capabilities on file '/var/tmp/check-gocryptfs/testdir/093.file' (Operation not supported) +Failed to set capabilities on file '/var/tmp/check-gocryptfs/testdir/093.file' (Operation not supported)
@ -206,12 +206,12 @@ generic/097 - output mismatch (see /home/jakob.donotbackup/code/fuse-xfstests/re
+++ /home/jakob.donotbackup/code/fuse-xfstests/results//generic/097.out.bad 2019-10-10 22:45:23.382064979 +0200 +++ /home/jakob.donotbackup/code/fuse-xfstests/results//generic/097.out.bad 2019-10-10 22:45:23.382064979 +0200
@@ -110,18 +110,16 @@ @@ -110,18 +110,16 @@
*** Test out the trusted namespace *** *** Test out the trusted namespace ***
set EA <trusted:colour,marone>: set EA <trusted:colour,marone>:
+setfattr: TEST_DIR/foo: Operation not supported +setfattr: TEST_DIR/foo: Operation not supported
set EA <user:colour,beige>: set EA <user:colour,beige>:
... ...
(Run 'diff -u tests/generic/097.out /home/jakob.donotbackup/code/fuse-xfstests/results//generic/097.out.bad' to see the entire diff) (Run 'diff -u tests/generic/097.out /home/jakob.donotbackup/code/fuse-xfstests/results//generic/097.out.bad' to see the entire diff)
generic/098 1s ... 0s generic/098 1s ... 0s

View File

@ -169,9 +169,9 @@ Example for a CPU with AES-NI:
``` ```
$ ./gocryptfs -speed $ ./gocryptfs -speed
gocryptfs v2.0; go-fuse v2.1.1-0.20210508151621-62c5aa1919a7; 2021-06-06 go1.16.5 linux/amd64 gocryptfs v2.0; go-fuse v2.1.1-0.20210508151621-62c5aa1919a7; 2021-06-06 go1.16.5 linux/amd64
AES-GCM-256-OpenSSL 536.63 MB/s AES-GCM-256-OpenSSL 536.63 MB/s
AES-GCM-256-Go 831.84 MB/s (selected in auto mode) AES-GCM-256-Go 831.84 MB/s (selected in auto mode)
AES-SIV-512-Go 155.85 MB/s AES-SIV-512-Go 155.85 MB/s
XChaCha20-Poly1305-Go 700.02 MB/s (benchmark only, not selectable yet) XChaCha20-Poly1305-Go 700.02 MB/s (benchmark only, not selectable yet)
``` ```
@ -181,7 +181,7 @@ tarball, recursively listing and finally deleting it. The output will
look like this: look like this:
``` ```
$ ./benchmark.bash $ ./benchmark.bash
Testing gocryptfs at /tmp/benchmark.bash.xFD: gocryptfs v2.0; go-fuse v2.1.1-0.20210508151621-62c5aa1919a7; 2021-06-06 go1.16.5 linux/amd64 Testing gocryptfs at /tmp/benchmark.bash.xFD: gocryptfs v2.0; go-fuse v2.1.1-0.20210508151621-62c5aa1919a7; 2021-06-06 go1.16.5 linux/amd64
WRITE: 262144000 bytes (262 MB, 250 MiB) copied, 0,698174 s, 375 MB/s WRITE: 262144000 bytes (262 MB, 250 MiB) copied, 0,698174 s, 375 MB/s
READ: 262144000 bytes (262 MB, 250 MiB) copied, 0,268916 s, 975 MB/s READ: 262144000 bytes (262 MB, 250 MiB) copied, 0,268916 s, 975 MB/s
@ -314,7 +314,7 @@ v1.7.1, 2019-10-06
* Create `gocryptfs.diriv` files with 0440 permissions to make it easier to * Create `gocryptfs.diriv` files with 0440 permissions to make it easier to
share an encrypted folder via a network drive share an encrypted folder via a network drive
([#387](https://github.com/rfjakob/gocryptfs/issues/387)). ([#387](https://github.com/rfjakob/gocryptfs/issues/387)).
Note: as a security precaution, the owner must still manually Note: as a security precaution, the owner must still manually
`chmod gocryptfs.conf 0440` to allow mounting. `chmod gocryptfs.conf 0440` to allow mounting.
* Allow the `nofail` option in `/etc/fstab` * Allow the `nofail` option in `/etc/fstab`
* `-passwd` can now change the `-scryptn` parameter for existing filesystems * `-passwd` can now change the `-scryptn` parameter for existing filesystems

View File

@ -104,4 +104,3 @@ if [[ $DD_ONLY -eq 1 ]]; then
else else
./tests/canonical-benchmarks.bash "$MNT" ./tests/canonical-benchmarks.bash "$MNT"
fi fi

View File

@ -69,7 +69,7 @@ package_static_binary() {
local TARGZ local TARGZ
TARGZ=$TARBALL.gz TARGZ=$TARBALL.gz
tar --owner=root --group=root --create -vf "$TARBALL" gocryptfs tar --owner=root --group=root --create -vf "$TARBALL" gocryptfs
tar --owner=root --group=root --append -vf "$TARBALL" -C gocryptfs-xray gocryptfs-xray tar --owner=root --group=root --append -vf "$TARBALL" -C gocryptfs-xray gocryptfs-xray
tar --owner=root --group=root --append -vf "$TARBALL" -C Documentation gocryptfs.1 gocryptfs-xray.1 tar --owner=root --group=root --append -vf "$TARBALL" -C Documentation gocryptfs.1 gocryptfs-xray.1

View File

@ -20,4 +20,3 @@ dd if=/dev/zero of="$T/b/zero" bs=1M count=100
echo echo
echo "Hint: go tool trace $T/trace" echo "Hint: go tool trace $T/trace"

View File

@ -109,4 +109,3 @@ do
N=$((N+1)) N=$((N+1))
done done