diff options
| author | Joseph Richey <joerichey@google.com> | 2017-08-29 19:06:26 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-29 19:06:26 -0700 |
| commit | fe92c00f897c2c6b20d841c8a8f83ef6a247d18c (patch) | |
| tree | 5c4f78346701a89a4aec632aa919ea8724083b80 /crypto/key.go | |
| parent | b7f0e79d7a1dc4ff196d59e19a665a346082b542 (diff) | |
| parent | d41bac581c56be1891e7b54d64c8e5d68edd8ca0 (diff) | |
Merge pull request #49 from google/misc
Fix a wide variety of small issues and update documentation
Diffstat (limited to 'crypto/key.go')
| -rw-r--r-- | crypto/key.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/crypto/key.go b/crypto/key.go index 497a0ef..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 @@ -329,7 +332,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 } |