diff options
| author | David Howells <dhowells@redhat.com> | 2016-04-06 16:14:26 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2016-04-11 22:44:15 +0100 |
| commit | 77f68bac9481ad440f4f34dda3d28c2dce6eb87b (patch) | |
| tree | 3366c0ab94b42cc67fdbe36a2af7ac6bc1a50467 /certs/system_keyring.c | |
| parent | a511e1af8b12f44c6e55786c463c9f093c214fb6 (diff) | |
| download | linux-stable-77f68bac9481ad440f4f34dda3d28c2dce6eb87b.tar.gz linux-stable-77f68bac9481ad440f4f34dda3d28c2dce6eb87b.tar.bz2 linux-stable-77f68bac9481ad440f4f34dda3d28c2dce6eb87b.zip | |
KEYS: Remove KEY_FLAG_TRUSTED and KEY_ALLOC_TRUSTED
Remove KEY_FLAG_TRUSTED and KEY_ALLOC_TRUSTED as they're no longer
meaningful. Also we can drop the trusted flag from the preparse structure.
Given this, we no longer need to pass the key flags through to
restrict_link().
Further, we can now get rid of keyring_restrict_trusted_only() also.
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'certs/system_keyring.c')
| -rw-r--r-- | certs/system_keyring.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/certs/system_keyring.c b/certs/system_keyring.c index 4e2fa8ab01d6..e460d00a7781 100644 --- a/certs/system_keyring.c +++ b/certs/system_keyring.c @@ -31,7 +31,6 @@ extern __initconst const unsigned long system_certificate_list_size; */ int restrict_link_by_builtin_trusted(struct key *keyring, const struct key_type *type, - unsigned long flags, const union key_payload *payload) { return restrict_link_by_signature(system_trusted_keyring, @@ -97,7 +96,6 @@ static __init int load_system_certificate_list(void) ((KEY_POS_ALL & ~KEY_POS_SETATTR) | KEY_USR_VIEW | KEY_USR_READ), KEY_ALLOC_NOT_IN_QUOTA | - KEY_ALLOC_TRUSTED | KEY_ALLOC_BUILT_IN | KEY_ALLOC_BYPASS_RESTRICTION); if (IS_ERR(key)) { |