summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Coelho <luciano.coelho@intel.com>2016-05-10 10:30:56 +0300
committerLuca Coelho <luciano.coelho@intel.com>2016-05-10 10:30:56 +0300
commitf60aa4cdc1ddda74c6f7cc7b526e07793a476db3 (patch)
treeeb8b2c8b4fb157367f047ae0db3a517c4f38311b
parent5b92592a375b8e3001c0350cd0bbd13ec92ea17f (diff)
parent6790562907c0ec32ea66e082ec901b5e35da5e2b (diff)
downloadlinux-crypto-f60aa4cdc1ddda74c6f7cc7b526e07793a476db3.tar.gz
linux-crypto-f60aa4cdc1ddda74c6f7cc7b526e07793a476db3.zip
Merge tag 'mac80211-next-for-davem-2016-04-13' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next into master
To synchronize with Kalle, here's just a big change that affects all drivers - removing the duplicated enum ieee80211_band and replacing it by enum nl80211_band. On top of that, just a small documentation update.
-rw-r--r--crypto/asymmetric_keys/pkcs7_trust.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/asymmetric_keys/pkcs7_trust.c b/crypto/asymmetric_keys/pkcs7_trust.c
index 3bbdcc79..7d7a39b4 100644
--- a/crypto/asymmetric_keys/pkcs7_trust.c
+++ b/crypto/asymmetric_keys/pkcs7_trust.c
@@ -178,6 +178,8 @@ int pkcs7_validate_trust(struct pkcs7_message *pkcs7,
int cached_ret = -ENOKEY;
int ret;
+ *_trusted = false;
+
for (p = pkcs7->certs; p; p = p->next)
p->seen = false;