summaryrefslogtreecommitdiff
path: root/internal
diff options
context:
space:
mode:
authorSebastian Lackner2018-12-27 12:03:00 +0100
committerrfjakob2018-12-27 15:19:55 +0100
commit874eaf9734cc10940e08f7b043652449e1e220b5 (patch)
tree1d58848741a2a78426b412fab51b22ee997d9f12 /internal
parent4c2ff26457471cd36b25c29fb3f982b27002ce3c (diff)
Assorted spelling fixes.
Mostly detected with the 'codespell' utility, but also includes some manual grammar fixes.
Diffstat (limited to 'internal')
-rw-r--r--internal/contentenc/content.go2
-rw-r--r--internal/contentenc/intrablock.go4
-rw-r--r--internal/exitcodes/exitcodes.go4
-rw-r--r--internal/nametransform/dirivcache/dirivcache.go6
-rw-r--r--internal/nametransform/names.go2
-rw-r--r--internal/stupidgcm/stupidgcm_test.go2
6 files changed, 10 insertions, 10 deletions
diff --git a/internal/contentenc/content.go b/internal/contentenc/content.go
index 57ad489..bda3fdc 100644
--- a/internal/contentenc/content.go
+++ b/internal/contentenc/content.go
@@ -151,7 +151,7 @@ func concatAD(blockNo uint64, fileID []byte) (aData []byte) {
// DecryptBlock - Verify and decrypt GCM block
//
// 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) {
// Empty block?
diff --git a/internal/contentenc/intrablock.go b/internal/contentenc/intrablock.go
index 3714e37..55b0841 100644
--- a/internal/contentenc/intrablock.go
+++ b/internal/contentenc/intrablock.go
@@ -5,12 +5,12 @@ type IntraBlock struct {
// BlockNo is the block number in the file
BlockNo uint64
// 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
// account.
Skip uint64
// 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
// account.
Length uint64
diff --git a/internal/exitcodes/exitcodes.go b/internal/exitcodes/exitcodes.go
index b8173c7..c4e18df 100644
--- a/internal/exitcodes/exitcodes.go
+++ b/internal/exitcodes/exitcodes.go
@@ -58,7 +58,7 @@ const (
OpenConf = 23
// WriteConf - could not write the gocryptfs.conf
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
Profiler = 25
// FsckErrors - the filesystem check found errors
@@ -68,7 +68,7 @@ const (
// TrezorError - an error was encountered while interacting with a Trezor
// device
TrezorError = 28
- // ExcludeError - an error occoured while processing "-exclude"
+ // ExcludeError - an error occurred while processing "-exclude"
ExcludeError = 29
)
diff --git a/internal/nametransform/dirivcache/dirivcache.go b/internal/nametransform/dirivcache/dirivcache.go
index c0eca6d..962ae37 100644
--- a/internal/nametransform/dirivcache/dirivcache.go
+++ b/internal/nametransform/dirivcache/dirivcache.go
@@ -31,9 +31,9 @@ type DirIVCache struct {
rootDirIV []byte
// expiry is the time when the whole cache expires.
- // The cached entry my become out-of-date if the ciphertext directory is
- // modifed behind the back of gocryptfs. Having an expiry time limits the
- // inconstency to one second, like attr_timeout does for the kernel
+ // The cached entry might become out-of-date if the ciphertext directory is
+ // modified behind the back of gocryptfs. Having an expiry time limits the
+ // inconstancy to one second, like attr_timeout does for the kernel
// getattr cache.
expiry time.Time
diff --git a/internal/nametransform/names.go b/internal/nametransform/names.go
index 65e6f06..22e639a 100644
--- a/internal/nametransform/names.go
+++ b/internal/nametransform/names.go
@@ -18,7 +18,7 @@ type NameTransform struct {
emeCipher *eme.EMECipher
longNames bool
DirIVCache dirivcache.DirIVCache
- // B64 = either base64.URLEncoding or base64.RawURLEncoding, depeding
+ // B64 = either base64.URLEncoding or base64.RawURLEncoding, depending
// on the Raw64 feature flag
B64 *base64.Encoding
}
diff --git a/internal/stupidgcm/stupidgcm_test.go b/internal/stupidgcm/stupidgcm_test.go
index b340179..18732df 100644
--- a/internal/stupidgcm/stupidgcm_test.go
+++ b/internal/stupidgcm/stupidgcm_test.go
@@ -26,7 +26,7 @@ func randBytes(n int) []byte {
}
// 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) {
key := randBytes(32)
sGCM := New(key, false)