diff options
| author | John Johansen <john.johansen@canonical.com> | 2018-05-02 00:38:52 -0700 |
|---|---|---|
| committer | John Johansen <john.johansen@canonical.com> | 2018-05-02 00:38:52 -0700 |
| commit | db5c6566ee03e097b4b7f7e207189c0906e9d1aa (patch) | |
| tree | fb78e31032dcca2fcb0e9123cf11be12728f99c5 /crypto/asymmetric_keys/mscode_parser.c | |
| parent | 21864b027d847a6d91903a5ba219770403ba8aad (diff) | |
| parent | ef734472771a62ae9f901367a40a89382a991917 (diff) | |
| download | linux-crypto-db5c6566ee03e097b4b7f7e207189c0906e9d1aa.tar.gz linux-crypto-db5c6566ee03e097b4b7f7e207189c0906e9d1aa.zip | |
Merge tag 'v4.17-rc3' into apparmor-next
Linux v4.17-rc3
Merge in v4.17 for LSM updates
Signed-off-by: John Johansen <john.johansen@canonical.com>
Diffstat (limited to 'crypto/asymmetric_keys/mscode_parser.c')
| -rw-r--r-- | crypto/asymmetric_keys/mscode_parser.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/asymmetric_keys/mscode_parser.c b/crypto/asymmetric_keys/mscode_parser.c index 9492e1c2..83d2e9b3 100644 --- a/crypto/asymmetric_keys/mscode_parser.c +++ b/crypto/asymmetric_keys/mscode_parser.c @@ -16,7 +16,7 @@ #include <linux/oid_registry.h> #include <crypto/pkcs7.h> #include "verify_pefile.h" -#include "mscode-asn1.h" +#include "mscode.asn1.h" /* * Parse a Microsoft Individual Code Signing blob |