diff options
| author | Justin M. Forbes <jforbes@redhat.com> | 2016-01-18 15:41:06 -0600 |
|---|---|---|
| committer | Justin M. Forbes <jforbes@redhat.com> | 2016-01-18 15:41:06 -0600 |
| commit | 42aa4321c736d85b027e9cf2e595db174b3cc76b (patch) | |
| tree | 3fc92ac576466f28af32702beae313f365bb57fb /KEYS-Add-a-system-blacklist-keyring.patch | |
| parent | be7384caf21e1af784b74131e03dde2d19a4fa81 (diff) | |
| download | kernel-42aa4321c736d85b027e9cf2e595db174b3cc76b.tar.gz kernel-42aa4321c736d85b027e9cf2e595db174b3cc76b.tar.xz kernel-42aa4321c736d85b027e9cf2e595db174b3cc76b.zip | |
Linux v4.4-8606-g5807fca
Diffstat (limited to 'KEYS-Add-a-system-blacklist-keyring.patch')
| -rw-r--r-- | KEYS-Add-a-system-blacklist-keyring.patch | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/KEYS-Add-a-system-blacklist-keyring.patch b/KEYS-Add-a-system-blacklist-keyring.patch index be35564a6..469ac35ab 100644 --- a/KEYS-Add-a-system-blacklist-keyring.patch +++ b/KEYS-Add-a-system-blacklist-keyring.patch @@ -71,7 +71,7 @@ diff --git a/include/keys/system_keyring.h b/include/keys/system_keyring.h index b20cd885c1fd..51d8ddc60e0f 100644 --- a/include/keys/system_keyring.h +++ b/include/keys/system_keyring.h -@@ -35,4 +35,8 @@ extern int system_verify_data(const void *data, unsigned long len, +@@ -35,6 +35,10 @@ extern int system_verify_data(const void *data, unsigned long len, enum key_being_used_for usage); #endif @@ -79,7 +79,9 @@ index b20cd885c1fd..51d8ddc60e0f 100644 +extern struct key *system_blacklist_keyring; +#endif + - #endif /* _KEYS_SYSTEM_KEYRING_H */ + #ifdef CONFIG_IMA_MOK_KEYRING + extern struct key *ima_mok_keyring; + extern struct key *ima_blacklist_keyring; diff --git a/init/Kconfig b/init/Kconfig index 02da9f1fd9df..782d26f02885 100644 --- a/init/Kconfig |