fscrypt: rename fscrypt_master_key to fscrypt_direct_key

Browse source

In preparation for introducing a filesystem-level keyring which will
contain fscrypt master keys, rename the existing 'struct
fscrypt_master_key' to 'struct fscrypt_direct_key'.  This is the
structure in the existing table of master keys that's maintained to
deduplicate the crypto transforms for v1 DIRECT_KEY policies.

I've chosen to keep this table as-is rather than make it automagically
add/remove the keys to/from the filesystem-level keyring, since that
would add a lot of extra complexity to the filesystem-level keyring.

Reviewed-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Eric Biggers <ebiggers@google.com>

...

This commit is contained in:

Eric Biggers 2019-08-04 19:35:45 -07:00

parent 59dc6a8e1f

commit a828daabb2

2 changed files with 68 additions and 69 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

7

fs/crypto/fscrypt_private.h

View file

130

fs/crypto/keyinfo.c

View file