diff options
| author | James Morris <james.l.morris@oracle.com> | 2016-03-04 01:39:53 +0100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2016-03-04 01:39:53 +0100 |
| commit | 88a1b564a20e371e6be41b39b85673e9c1959491 (patch) | |
| tree | f70850f5242470d479711ddb816ac05f47b15642 /security/integrity/integrity.h | |
| parent | Merge branch 'stable-4.6' of git://git.infradead.org/users/pcmoore/selinux in... (diff) | |
| parent | X.509: Make algo identifiers text instead of enum (diff) | |
| download | linux-88a1b564a20e371e6be41b39b85673e9c1959491.tar.xz linux-88a1b564a20e371e6be41b39b85673e9c1959491.zip | |
Merge tag 'keys-next-20160303' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next
Diffstat (limited to 'security/integrity/integrity.h')
| -rw-r--r-- | security/integrity/integrity.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/integrity/integrity.h b/security/integrity/integrity.h index c7a111cc7d89..e08935cf343f 100644 --- a/security/integrity/integrity.h +++ b/security/integrity/integrity.h @@ -90,7 +90,7 @@ struct ima_digest_data { struct signature_v2_hdr { uint8_t type; /* xattr type */ uint8_t version; /* signature format version */ - uint8_t hash_algo; /* Digest algorithm [enum pkey_hash_algo] */ + uint8_t hash_algo; /* Digest algorithm [enum hash_algo] */ uint32_t keyid; /* IMA key identifier - not X509/PGP specific */ uint16_t sig_size; /* signature size */ uint8_t sig[0]; /* signature payload */ |