diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-01-10 13:13:45 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-01-10 13:13:45 +1100 |
| commit | e1f00eedbbaefd3248b7c7a34616e94f9b022650 (patch) | |
| tree | 0b824ea19292dfa4bb4b1a53d77de328300dde66 /Documentation | |
| parent | 951f8e8b400bdedf2fc9bd2bb5627d2e4e55a538 (diff) | |
| parent | 923b49ff69fcbffe6f8b2739de218c45544392a7 (diff) | |
Merge remote-tracking branch 'security/next'
Conflicts:
drivers/char/tpm/tpm_ppi.c
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/security/IMA-templates.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/security/IMA-templates.txt b/Documentation/security/IMA-templates.txt index a777e5f1df5b..a4e102dddfea 100644 --- a/Documentation/security/IMA-templates.txt +++ b/Documentation/security/IMA-templates.txt @@ -67,12 +67,14 @@ descriptors by adding their identifier to the format string - 'd-ng': the digest of the event, calculated with an arbitrary hash algorithm (field format: [<hash algo>:]digest, where the digest prefix is shown only if the hash algorithm is not SHA1 or MD5); - - 'n-ng': the name of the event, without size limitations. + - 'n-ng': the name of the event, without size limitations; + - 'sig': the file signature. Below, there is the list of defined template descriptors: - "ima": its format is 'd|n'; - - "ima-ng" (default): its format is 'd-ng|n-ng'. + - "ima-ng" (default): its format is 'd-ng|n-ng'; + - "ima-sig": its format is 'd-ng|n-ng|sig'. |