diff options
| author | Dmitry Kasatkin <d.kasatkin@samsung.com> | 2014-06-17 10:56:59 +0200 |
|---|---|---|
| committer | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2014-07-17 15:35:17 +0200 |
| commit | 32c4741cb66703a3c282f41d77deff4afd93342a (patch) | |
| tree | 63797ca87c02956f5dbc4552a0aa9dc058d6cd52 /Documentation/kernel-parameters.txt | |
| parent | KEYS: validate certificate trust only with selected key (diff) | |
| download | linux-32c4741cb66703a3c282f41d77deff4afd93342a.tar.xz linux-32c4741cb66703a3c282f41d77deff4afd93342a.zip | |
KEYS: validate certificate trust only with builtin keys
Instead of allowing public keys, with certificates signed by any
key on the system trusted keyring, to be added to a trusted keyring,
this patch further restricts the certificates to those signed only by
builtin keys on the system keyring.
This patch defines a new option 'builtin' for the kernel parameter
'keys_ownerid' to allow trust validation using builtin keys.
Simplified Mimi's "KEYS: define an owner trusted keyring" patch
Changelog v7:
- rename builtin_keys to use_builtin_keys
Signed-off-by: Dmitry Kasatkin <d.kasatkin@samsung.com>
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Diffstat (limited to 'Documentation/kernel-parameters.txt')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index bdb193afe176..90c12c591168 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -569,7 +569,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. ca_keys= [KEYS] This parameter identifies a specific key(s) on the system trusted keyring to be used for certificate trust validation. - format: id:<keyid> + format: { id:<keyid> | builtin } ccw_timeout_log [S390] See Documentation/s390/CommonIO for details. |