diff options
| author | James Morris <james.morris@microsoft.com> | 2018-03-23 08:26:16 +1100 |
|---|---|---|
| committer | James Morris <james.morris@microsoft.com> | 2018-03-23 08:26:16 +1100 |
| commit | 8e2a5844b7a26cb7d5349ba7343dbcf99de4e547 (patch) | |
| tree | 89cf28b0e13c85f0a04d216121cbdafdf9668ba0 /crypto/asymmetric_keys/pkcs7_trust.c | |
| parent | 45ce5d915020b8c76238e123748e0eb6e9ddd6ad (diff) | |
| parent | 249b6bae56fc18f4512fe5bc085f71cc235c0735 (diff) | |
| download | linux-crypto-8e2a5844b7a26cb7d5349ba7343dbcf99de4e547.tar.gz linux-crypto-8e2a5844b7a26cb7d5349ba7343dbcf99de4e547.zip | |
Merge tag 'v4.16-rc6' into next-general
Merge to Linux 4.16-rc6 at the request of Jarkko, for his TPM updates.
Diffstat (limited to 'crypto/asymmetric_keys/pkcs7_trust.c')
| -rw-r--r-- | crypto/asymmetric_keys/pkcs7_trust.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/asymmetric_keys/pkcs7_trust.c b/crypto/asymmetric_keys/pkcs7_trust.c index 1f4e25f1..598906b1 100644 --- a/crypto/asymmetric_keys/pkcs7_trust.c +++ b/crypto/asymmetric_keys/pkcs7_trust.c @@ -106,6 +106,7 @@ static int pkcs7_validate_trust_one(struct pkcs7_message *pkcs7, pr_devel("sinfo %u: Direct signer is key %x\n", sinfo->index, key_serial(key)); x509 = NULL; + sig = sinfo->sig; goto matched; } if (PTR_ERR(key) != -ENOKEY) |