diff options
author | Masanari Iida <standby24x7@gmail.com> | 2012-03-04 09:16:11 -0500 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2012-03-07 10:08:24 -0500 |
commit | 40e47125e6c5110383b0176d7b9d530f2936b1ae (patch) | |
tree | 9653ac1f586cbfe36286c2d987c9330078eb37ad /Documentation/security | |
parent | 4e70daaf05a181b6968e29e72e9f1c16a183e92c (diff) |
Documentation: Fix multiple typo in Documentation
Signed-off-by: Masanari Iida <standby24x7@gmail.com>
Acked-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'Documentation/security')
-rw-r--r-- | Documentation/security/Smack.txt | 2 | ||||
-rw-r--r-- | Documentation/security/keys-trusted-encrypted.txt | 2 | ||||
-rw-r--r-- | Documentation/security/keys.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/security/Smack.txt b/Documentation/security/Smack.txt index e9dab41c0fe0..d2f72ae66432 100644 --- a/Documentation/security/Smack.txt +++ b/Documentation/security/Smack.txt | |||
@@ -536,6 +536,6 @@ writing a single character to the /smack/logging file : | |||
536 | 3 : log denied & accepted | 536 | 3 : log denied & accepted |
537 | 537 | ||
538 | Events are logged as 'key=value' pairs, for each event you at least will get | 538 | Events are logged as 'key=value' pairs, for each event you at least will get |
539 | the subjet, the object, the rights requested, the action, the kernel function | 539 | the subject, the object, the rights requested, the action, the kernel function |
540 | that triggered the event, plus other pairs depending on the type of event | 540 | that triggered the event, plus other pairs depending on the type of event |
541 | audited. | 541 | audited. |
diff --git a/Documentation/security/keys-trusted-encrypted.txt b/Documentation/security/keys-trusted-encrypted.txt index c9e4855ed3d7..e105ae97a4f5 100644 --- a/Documentation/security/keys-trusted-encrypted.txt +++ b/Documentation/security/keys-trusted-encrypted.txt | |||
@@ -1,7 +1,7 @@ | |||
1 | Trusted and Encrypted Keys | 1 | Trusted and Encrypted Keys |
2 | 2 | ||
3 | Trusted and Encrypted Keys are two new key types added to the existing kernel | 3 | Trusted and Encrypted Keys are two new key types added to the existing kernel |
4 | key ring service. Both of these new types are variable length symmetic keys, | 4 | key ring service. Both of these new types are variable length symmetric keys, |
5 | and in both cases all keys are created in the kernel, and user space sees, | 5 | and in both cases all keys are created in the kernel, and user space sees, |
6 | stores, and loads only encrypted blobs. Trusted Keys require the availability | 6 | stores, and loads only encrypted blobs. Trusted Keys require the availability |
7 | of a Trusted Platform Module (TPM) chip for greater security, while Encrypted | 7 | of a Trusted Platform Module (TPM) chip for greater security, while Encrypted |
diff --git a/Documentation/security/keys.txt b/Documentation/security/keys.txt index 4d75931d2d79..fcbe7a703405 100644 --- a/Documentation/security/keys.txt +++ b/Documentation/security/keys.txt | |||
@@ -668,7 +668,7 @@ The keyctl syscall functions are: | |||
668 | 668 | ||
669 | If the kernel calls back to userspace to complete the instantiation of a | 669 | If the kernel calls back to userspace to complete the instantiation of a |
670 | key, userspace should use this call mark the key as negative before the | 670 | key, userspace should use this call mark the key as negative before the |
671 | invoked process returns if it is unable to fulfil the request. | 671 | invoked process returns if it is unable to fulfill the request. |
672 | 672 | ||
673 | The process must have write access on the key to be able to instantiate | 673 | The process must have write access on the key to be able to instantiate |
674 | it, and the key must be uninstantiated. | 674 | it, and the key must be uninstantiated. |