diff options
| author | Joseph Richey <joerichey94@gmail.com> | 2017-10-19 03:15:28 -0700 |
|---|---|---|
| committer | Joseph Richey <joerichey94@gmail.com> | 2017-10-19 03:34:51 -0700 |
| commit | b7de8535f899f2b88d61f4f1264fe6a272196536 (patch) | |
| tree | 4caf8a0e426caf45440b5115664baba12749a11f /crypto | |
| parent | 7885d63f644bb49d8da1d8313d5f4870d586a9c1 (diff) | |
util: Add better user lookup functions
When looking up users in fscrypt, we often want to proceed even if the
requested uid doesn't appear to be a valid user on the system. This
mainly occurs when a user is deleted, but they still have a login
protector on disk.
Thus, GetUser() with a bad uid creates a fake user with a pretty
placeholder name. The corresponding call sites of util.EffectiveUser are
changed (often simplifying logic). Various documentation is updated and
typos are fixed.
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/crypto_test.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/crypto_test.go b/crypto/crypto_test.go index 444f847..a353052 100644 --- a/crypto/crypto_test.go +++ b/crypto/crypto_test.go @@ -62,10 +62,10 @@ var ( fakeInvalidPolicyKey, _ = makeKey(42, metadata.PolicyKeyLen-1) fakeWrappingKey, _ = makeKey(17, metadata.InternalKeyLen) - testUser, _ = util.EffectiveUser() + testUser = util.CurrentUser() ) -// As the passpharase hashing function clears the passphrase, we need to make +// As the passphrase hashing function clears the passphrase, we need to make // a new passphrase key for each test func fakePassphraseKey() (*Key, error) { return NewFixedLengthKeyFromReader(bytes.NewReader(fakePassword), len(fakePassword)) @@ -613,7 +613,7 @@ func BenchmarkUnwrap(b *testing.B) { } } -func BenchmarkUnwrapNolock(b *testing.B) { +func BenchmarkUnwrapNoLock(b *testing.B) { b.StopTimer() UseMlock = false |