diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-02-11 02:24:00 +0300 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-02-11 02:24:00 +0300 |
commit | b2a3b193b7eb886e44f8a66cd41a26cc44c1e00d (patch) | |
tree | 8edbfe1daaa8d75214f6017070740d1f4acbafc5 /crypto/asymmetric_keys/pkcs7_parser.c | |
parent | c89f2682a39192433c296bf97b834fd2815a758b (diff) | |
parent | 6a0712f6f199e737aa5913d28ec4bd3a25de9660 (diff) | |
download | linux-b2a3b193b7eb886e44f8a66cd41a26cc44c1e00d.tar.xz |
Merge branch 'pm-opp' into pm-cpufreq
Diffstat (limited to 'crypto/asymmetric_keys/pkcs7_parser.c')
-rw-r--r-- | crypto/asymmetric_keys/pkcs7_parser.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/crypto/asymmetric_keys/pkcs7_parser.c b/crypto/asymmetric_keys/pkcs7_parser.c index 758acabf2d81..8f3056cd0399 100644 --- a/crypto/asymmetric_keys/pkcs7_parser.c +++ b/crypto/asymmetric_keys/pkcs7_parser.c @@ -547,9 +547,7 @@ int pkcs7_sig_note_set_of_authattrs(void *context, size_t hdrlen, struct pkcs7_signed_info *sinfo = ctx->sinfo; if (!test_bit(sinfo_has_content_type, &sinfo->aa_set) || - !test_bit(sinfo_has_message_digest, &sinfo->aa_set) || - (ctx->msg->data_type == OID_msIndirectData && - !test_bit(sinfo_has_ms_opus_info, &sinfo->aa_set))) { + !test_bit(sinfo_has_message_digest, &sinfo->aa_set)) { pr_warn("Missing required AuthAttr\n"); return -EBADMSG; } |