From a14c0e8b896a1986bbd807ea60e3d7d05f5f6dfc Mon Sep 17 00:00:00 2001 From: Joe Richey Date: Tue, 29 Aug 2017 10:25:53 -0700 Subject: Fixed typos --- crypto/key.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'crypto/key.go') diff --git a/crypto/key.go b/crypto/key.go index 497a0ef..99efc1a 100644 --- a/crypto/key.go +++ b/crypto/key.go @@ -329,7 +329,7 @@ func ReadRecoveryCode(reader io.Reader) (*Key, error) { for blockStart := blockSize; blockStart < encodedLength; blockStart += blockSize { r.Read(inputSeparator) if r.Err() == nil && !bytes.Equal(separator, inputSeparator) { - err := errors.Wrapf(ErrRecoveryCode, "invalid seperator %q", inputSeparator) + err := errors.Wrapf(ErrRecoveryCode, "invalid separator %q", inputSeparator) return nil, err } -- cgit v1.2.3 From 7568ca2aab4a3266eb95cbda64298e2292743c7b Mon Sep 17 00:00:00 2001 From: Joe Richey Date: Tue, 29 Aug 2017 11:17:10 -0700 Subject: crypto: Handle when "ulimit -l" is too low --- crypto/key.go | 3 +++ 1 file changed, 3 insertions(+) (limited to 'crypto/key.go') diff --git a/crypto/key.go b/crypto/key.go index 99efc1a..ec37330 100644 --- a/crypto/key.go +++ b/crypto/key.go @@ -109,6 +109,9 @@ func newBlankKey(length int) (*Key, error) { // See MAP_ANONYMOUS in http://man7.org/linux/man-pages/man2/mmap.2.html data, err := unix.Mmap(-1, 0, length, keyProtection, flags) + if err == unix.EAGAIN { + return nil, ErrKeyLock + } if err != nil { log.Printf("unix.Mmap() with length=%d failed: %v", length, err) return nil, ErrKeyAlloc -- cgit v1.2.3