diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-06-02 07:58:11 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-06-02 07:58:11 +0200 |
commit | aa6ada71ee1fc8c9a06cff7195704f5bc06b65c8 (patch) | |
tree | 699edc93f7996ef5ede88bf43998af3f582ba592 /KEYS-Add-a-system-blacklist-keyring.patch | |
parent | 651697182b0b06fe2c9261ee1902068a95931020 (diff) | |
parent | 84558c957b3e0cdd17000affcbdbe22301443bfa (diff) | |
download | kernel-aa6ada71ee1fc8c9a06cff7195704f5bc06b65c8.tar.gz kernel-aa6ada71ee1fc8c9a06cff7195704f5bc06b65c8.tar.xz kernel-aa6ada71ee1fc8c9a06cff7195704f5bc06b65c8.zip |
merge stabilization branchkernel-4.6.1-300.vanilla.knurd.1.fc24kernel-4.6.1-300.vanilla.knurd.1.fc23kernel-4.6.1-300.vanilla.knurd.1.fc22
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 |