Assorted spelling fixes.
Mostly detected with the 'codespell' utility, but also includes some manual grammar fixes.
This commit is contained in:
parent
4c2ff26457
commit
874eaf9734
2
.gitignore
vendored
2
.gitignore
vendored
@ -18,5 +18,5 @@ gocryptfs.1
|
|||||||
/vendor
|
/vendor
|
||||||
/_vendor-*
|
/_vendor-*
|
||||||
|
|
||||||
# Source tarball version. Should never be commited to git.
|
# Source tarball version. Should never be committed to git.
|
||||||
/VERSION
|
/VERSION
|
||||||
|
@ -98,5 +98,5 @@ Content of "change.txt":
|
|||||||
Further Reading
|
Further Reading
|
||||||
---------------
|
---------------
|
||||||
|
|
||||||
Additional exit codes that are unlikely to occour are defined in
|
Additional exit codes that are unlikely to occur are defined in
|
||||||
[exitcodes.go](../internal/exitcodes/exitcodes.go).
|
[exitcodes.go](../internal/exitcodes/exitcodes.go).
|
||||||
|
@ -13,8 +13,8 @@ What the extractloop stress test does is (top comment in `extractloop.bash`):
|
|||||||
# huge numbers of files.
|
# huge numbers of files.
|
||||||
```
|
```
|
||||||
|
|
||||||
Memory usage stabilises at 119MiB, we do not run of fds,
|
Memory usage stabilises at 119MiB, we do not run out of fds,
|
||||||
and the interation time is stable at 37 seconds. The test
|
and the iteration time is stable at 37 seconds. The test
|
||||||
runs slower in the beginning due to xfstests running in
|
runs slower in the beginning due to xfstests running in
|
||||||
parallel on the test machine.
|
parallel on the test machine.
|
||||||
|
|
||||||
|
@ -454,7 +454,7 @@ v0.7.2, 2016-01-19
|
|||||||
|
|
||||||
v0.7.1, 2016-01-09
|
v0.7.1, 2016-01-09
|
||||||
* Make the `build.bash` script compatible with Go 1.3
|
* Make the `build.bash` script compatible with Go 1.3
|
||||||
* Disable fallocate on OSX (system call not availabe)
|
* Disable fallocate on OSX (system call not available)
|
||||||
* Introduce pre-built binaries for Fedora 23 and Debian 8
|
* Introduce pre-built binaries for Fedora 23 and Debian 8
|
||||||
|
|
||||||
v0.7, 2015-12-20
|
v0.7, 2015-12-20
|
||||||
@ -502,7 +502,7 @@ v0.4, 2015-11-15
|
|||||||
* `-plaintextnames`: disables filename encryption, added on user request
|
* `-plaintextnames`: disables filename encryption, added on user request
|
||||||
* `-extpass`: calls an external program for prompting for the password
|
* `-extpass`: calls an external program for prompting for the password
|
||||||
* `-config`: allows to specify a custom gocryptfs.conf path
|
* `-config`: allows to specify a custom gocryptfs.conf path
|
||||||
* Add `FeatureFlags` gocryptfs.conf paramter
|
* Add `FeatureFlags` gocryptfs.conf parameter
|
||||||
* This is a config format change, hence the on-disk format is incremented
|
* This is a config format change, hence the on-disk format is incremented
|
||||||
* Used for ext4-style filesystem feature flags. This should help avoid future
|
* Used for ext4-style filesystem feature flags. This should help avoid future
|
||||||
format changes. The first user is `-plaintextnames`.
|
format changes. The first user is `-plaintextnames`.
|
||||||
|
6
fsck.go
6
fsck.go
@ -36,7 +36,7 @@ func (ck *fsckObj) markCorrupt(path string) {
|
|||||||
ck.corruptListLock.Unlock()
|
ck.corruptListLock.Unlock()
|
||||||
}
|
}
|
||||||
|
|
||||||
// Watch for mitigated corruptions that occour during OpenDir()
|
// Watch for mitigated corruptions that occur during OpenDir()
|
||||||
func (ck *fsckObj) watchMitigatedCorruptionsOpenDir(path string) {
|
func (ck *fsckObj) watchMitigatedCorruptionsOpenDir(path string) {
|
||||||
for {
|
for {
|
||||||
select {
|
select {
|
||||||
@ -95,7 +95,7 @@ func (ck *fsckObj) symlink(path string) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Watch for mitigated corruptions that occour during Read()
|
// Watch for mitigated corruptions that occur during Read()
|
||||||
func (ck *fsckObj) watchMitigatedCorruptionsRead(path string) {
|
func (ck *fsckObj) watchMitigatedCorruptionsRead(path string) {
|
||||||
for {
|
for {
|
||||||
select {
|
select {
|
||||||
@ -165,7 +165,7 @@ func (ck *fsckObj) file(path string) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Watch for mitigated corruptions that occour during ListXAttr()
|
// Watch for mitigated corruptions that occur during ListXAttr()
|
||||||
func (ck *fsckObj) watchMitigatedCorruptionsListXAttr(path string) {
|
func (ck *fsckObj) watchMitigatedCorruptionsListXAttr(path string) {
|
||||||
for {
|
for {
|
||||||
select {
|
select {
|
||||||
|
@ -151,7 +151,7 @@ func concatAD(blockNo uint64, fileID []byte) (aData []byte) {
|
|||||||
// DecryptBlock - Verify and decrypt GCM block
|
// DecryptBlock - Verify and decrypt GCM block
|
||||||
//
|
//
|
||||||
// Corner case: A full-sized block of all-zero ciphertext bytes is translated
|
// Corner case: A full-sized block of all-zero ciphertext bytes is translated
|
||||||
// to an all-zero plaintext block, i.e. file hole passtrough.
|
// to an all-zero plaintext block, i.e. file hole passthrough.
|
||||||
func (be *ContentEnc) DecryptBlock(ciphertext []byte, blockNo uint64, fileID []byte) ([]byte, error) {
|
func (be *ContentEnc) DecryptBlock(ciphertext []byte, blockNo uint64, fileID []byte) ([]byte, error) {
|
||||||
|
|
||||||
// Empty block?
|
// Empty block?
|
||||||
|
@ -5,12 +5,12 @@ type IntraBlock struct {
|
|||||||
// BlockNo is the block number in the file
|
// BlockNo is the block number in the file
|
||||||
BlockNo uint64
|
BlockNo uint64
|
||||||
// Skip is an offset into the block payload
|
// Skip is an offset into the block payload
|
||||||
// In forwared mode: block plaintext
|
// In forward mode: block plaintext
|
||||||
// In reverse mode: offset into block ciphertext. Takes the header into
|
// In reverse mode: offset into block ciphertext. Takes the header into
|
||||||
// account.
|
// account.
|
||||||
Skip uint64
|
Skip uint64
|
||||||
// Length of payload data in this block
|
// Length of payload data in this block
|
||||||
// In forwared mode: length of the plaintext
|
// In forward mode: length of the plaintext
|
||||||
// In reverse mode: length of the ciphertext. Takes header and trailer into
|
// In reverse mode: length of the ciphertext. Takes header and trailer into
|
||||||
// account.
|
// account.
|
||||||
Length uint64
|
Length uint64
|
||||||
|
@ -58,7 +58,7 @@ const (
|
|||||||
OpenConf = 23
|
OpenConf = 23
|
||||||
// WriteConf - could not write the gocryptfs.conf
|
// WriteConf - could not write the gocryptfs.conf
|
||||||
WriteConf = 24
|
WriteConf = 24
|
||||||
// Profiler - error occoured when trying to write cpu or memory profile or
|
// Profiler - error occurred when trying to write cpu or memory profile or
|
||||||
// execution trace
|
// execution trace
|
||||||
Profiler = 25
|
Profiler = 25
|
||||||
// FsckErrors - the filesystem check found errors
|
// FsckErrors - the filesystem check found errors
|
||||||
@ -68,7 +68,7 @@ const (
|
|||||||
// TrezorError - an error was encountered while interacting with a Trezor
|
// TrezorError - an error was encountered while interacting with a Trezor
|
||||||
// device
|
// device
|
||||||
TrezorError = 28
|
TrezorError = 28
|
||||||
// ExcludeError - an error occoured while processing "-exclude"
|
// ExcludeError - an error occurred while processing "-exclude"
|
||||||
ExcludeError = 29
|
ExcludeError = 29
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -31,9 +31,9 @@ type DirIVCache struct {
|
|||||||
rootDirIV []byte
|
rootDirIV []byte
|
||||||
|
|
||||||
// expiry is the time when the whole cache expires.
|
// expiry is the time when the whole cache expires.
|
||||||
// The cached entry my become out-of-date if the ciphertext directory is
|
// The cached entry might become out-of-date if the ciphertext directory is
|
||||||
// modifed behind the back of gocryptfs. Having an expiry time limits the
|
// modified behind the back of gocryptfs. Having an expiry time limits the
|
||||||
// inconstency to one second, like attr_timeout does for the kernel
|
// inconstancy to one second, like attr_timeout does for the kernel
|
||||||
// getattr cache.
|
// getattr cache.
|
||||||
expiry time.Time
|
expiry time.Time
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@ type NameTransform struct {
|
|||||||
emeCipher *eme.EMECipher
|
emeCipher *eme.EMECipher
|
||||||
longNames bool
|
longNames bool
|
||||||
DirIVCache dirivcache.DirIVCache
|
DirIVCache dirivcache.DirIVCache
|
||||||
// B64 = either base64.URLEncoding or base64.RawURLEncoding, depeding
|
// B64 = either base64.URLEncoding or base64.RawURLEncoding, depending
|
||||||
// on the Raw64 feature flag
|
// on the Raw64 feature flag
|
||||||
B64 *base64.Encoding
|
B64 *base64.Encoding
|
||||||
}
|
}
|
||||||
|
@ -26,7 +26,7 @@ func randBytes(n int) []byte {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// TestEncryptDecrypt encrypts and decrypts using both stupidgcm and Go's built-in
|
// TestEncryptDecrypt encrypts and decrypts using both stupidgcm and Go's built-in
|
||||||
// GCM implemenatation and verifies that the results are identical.
|
// GCM implementation and verifies that the results are identical.
|
||||||
func TestEncryptDecrypt(t *testing.T) {
|
func TestEncryptDecrypt(t *testing.T) {
|
||||||
key := randBytes(32)
|
key := randBytes(32)
|
||||||
sGCM := New(key, false)
|
sGCM := New(key, false)
|
||||||
|
@ -47,7 +47,7 @@ func Test1980Tar(t *testing.T) {
|
|||||||
// The sequence below caused an I/O error to be returned.
|
// The sequence below caused an I/O error to be returned.
|
||||||
func TestOpenTruncateRead(t *testing.T) {
|
func TestOpenTruncateRead(t *testing.T) {
|
||||||
fn := test_helpers.DefaultPlainDir + "/TestTruncateWrite"
|
fn := test_helpers.DefaultPlainDir + "/TestTruncateWrite"
|
||||||
// First FD is used for write and trucate.
|
// First FD is used for write and truncate.
|
||||||
writeFd, err := os.Create(fn)
|
writeFd, err := os.Create(fn)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
|
@ -316,7 +316,7 @@ func TestExampleFSv13MasterkeyStdin(t *testing.T) {
|
|||||||
|
|
||||||
// gocryptfs v1.3 introduced HKDF.
|
// gocryptfs v1.3 introduced HKDF.
|
||||||
// We check the md5 sum of the encrypted version of a file to make sure we don't
|
// We check the md5 sum of the encrypted version of a file to make sure we don't
|
||||||
// accidentially change the ciphertext generation.
|
// accidentally change the ciphertext generation.
|
||||||
// Create a full crypto round-trip by mounting two times:
|
// Create a full crypto round-trip by mounting two times:
|
||||||
// dirA -> reverse mount -> dirB -> forward mount -> dirC
|
// dirA -> reverse mount -> dirB -> forward mount -> dirC
|
||||||
func TestExampleFSv13reverse(t *testing.T) {
|
func TestExampleFSv13reverse(t *testing.T) {
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#!/bin/bash -eu
|
#!/bin/bash -eu
|
||||||
#
|
#
|
||||||
# Compatability wrapper around "fusermount" on Linux and "umount" on
|
# Compatibility wrapper around "fusermount" on Linux and "umount" on
|
||||||
# Mac OS X and friends.
|
# Mac OS X and friends.
|
||||||
#
|
#
|
||||||
# This script can be sourced or executed directly.
|
# This script can be sourced or executed directly.
|
||||||
|
@ -171,7 +171,7 @@ func TestAccess(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Opening a nonexistant file name should return ENOENT
|
// Opening a nonexistent file name should return ENOENT
|
||||||
// and not EBADMSG or EIO or anything else.
|
// and not EBADMSG or EIO or anything else.
|
||||||
func TestEnoent(t *testing.T) {
|
func TestEnoent(t *testing.T) {
|
||||||
fn := dirB + "/TestEnoent"
|
fn := dirB + "/TestEnoent"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user