diff options
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | cli_args.go | 2 | ||||
| -rw-r--r-- | internal/contentenc/content.go | 2 | ||||
| -rw-r--r-- | internal/cryptocore/cryptocore.go | 2 |
4 files changed, 4 insertions, 4 deletions
@@ -283,7 +283,7 @@ v1.0, 2016-07-17 * Allows to pass mount options directly to the kernel * Add support for device files and suid binaries * Only works when running as root - * Must be explicitely enabled by passing "-o dev" or "-o suid" or "-o suid,dev" + * Must be explicitly enabled by passing "-o dev" or "-o suid" or "-o suid,dev" * Experimental Mac OS X support. See [ticket #15](https://github.com/rfjakob/gocryptfs/issues/15) for details. diff --git a/cli_args.go b/cli_args.go index 7f67fe3..836d29c 100644 --- a/cli_args.go +++ b/cli_args.go @@ -187,7 +187,7 @@ func parseCliOpts() (args argContainer) { tlog.Fatal.Printf("The reverse mode and the -forcedecode option are not compatible") os.Exit(exitcodes.Usage) } - // Has the user explicitely disabled openssl using "-openssl=false/0"? + // Has the user explicitly disabled openssl using "-openssl=false/0"? if !args.openssl && opensslAuto != "auto" { tlog.Fatal.Printf("-forcedecode requires openssl, but is disabled via command-line option") os.Exit(exitcodes.Usage) diff --git a/internal/contentenc/content.go b/internal/contentenc/content.go index 5d0ff49..6524ad4 100644 --- a/internal/contentenc/content.go +++ b/internal/contentenc/content.go @@ -108,7 +108,7 @@ func (be *ContentEnc) DecryptBlocks(ciphertext []byte, firstBlockNo uint64, file pBlock, err = be.DecryptBlock(cBlock, firstBlockNo, fileID) if err != nil { if be.forceDecode && err == stupidgcm.ErrAuth { - tlog.Warn.Printf("DecryptBlocks: authentication failure in block #%d, overriden by forcedecode", firstBlockNo) + tlog.Warn.Printf("DecryptBlocks: authentication failure in block #%d, overridden by forcedecode", firstBlockNo) } else { break } diff --git a/internal/cryptocore/cryptocore.go b/internal/cryptocore/cryptocore.go index aafe12b..9e25bfa 100644 --- a/internal/cryptocore/cryptocore.go +++ b/internal/cryptocore/cryptocore.go @@ -86,7 +86,7 @@ func New(key []byte, aeadType AEADTypeEnum, IVBitLen int, useHKDF bool, forceDec } // stupidgcm does not create a private copy of the key, so things // break when initFuseFrontend() overwrites it with zeros. Create - // a copy here. This is unneccessary when useHKDF == true, but + // a copy here. This is unnecessary when useHKDF == true, but // does no harm. var stupidgcmKey []byte stupidgcmKey = append(stupidgcmKey, gcmKey...) |