diff options
| author | James Morris <james.l.morris@oracle.com> | 2015-12-26 16:06:53 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2015-12-26 16:06:53 +1100 |
| commit | 407d751d1bdecafd9d878231240e89076587d09e (patch) | |
| tree | bbc0c6bd506856a0647e9c2b2d87c58c29f278f5 /crypto | |
| parent | a80ce6d6d76522a720ff98f7a1877ff945d364bf (diff) | |
| parent | af103e020b7d8bd0bd4c9fe94cf4067cc2453ca9 (diff) | |
| download | linux-crypto-407d751d1bdecafd9d878231240e89076587d09e.tar.gz linux-crypto-407d751d1bdecafd9d878231240e89076587d09e.zip | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into next
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/asymmetric_keys/x509_public_key.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/asymmetric_keys/x509_public_key.c b/crypto/asymmetric_keys/x509_public_key.c index 2a44b375..9e9e5a6a 100644 --- a/crypto/asymmetric_keys/x509_public_key.c +++ b/crypto/asymmetric_keys/x509_public_key.c @@ -321,6 +321,8 @@ static int x509_key_preparse(struct key_preparsed_payload *prep) goto error_free_cert; } else if (!prep->trusted) { ret = x509_validate_trust(cert, get_system_trusted_keyring()); + if (ret) + ret = x509_validate_trust(cert, get_ima_mok_keyring()); if (!ret) prep->trusted = 1; } |