diff options
| author | James Morris <james.l.morris@oracle.com> | 2017-11-24 11:54:11 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2017-11-24 11:54:11 +1100 |
| commit | 65cb3654889e0b748abc7756260ca267705aee14 (patch) | |
| tree | 7aef00d973ddaeace8916dca0d2a5b5b33cd28de /crypto/asymmetric_keys/pkcs7_parser.c | |
| parent | 64144cc773c0c9168ae5a49f1c2928f7498d4f57 (diff) | |
| parent | 484a3151473c059d44f33a89811c97914a070c74 (diff) | |
| download | linux-crypto-65cb3654889e0b748abc7756260ca267705aee14.tar.gz linux-crypto-65cb3654889e0b748abc7756260ca267705aee14.zip | |
Merge tag 'keys-next-20171123' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next-keys
Merge keys subsystem changes from David Howells, for v4.15.
Diffstat (limited to 'crypto/asymmetric_keys/pkcs7_parser.c')
| -rw-r--r-- | crypto/asymmetric_keys/pkcs7_parser.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/crypto/asymmetric_keys/pkcs7_parser.c b/crypto/asymmetric_keys/pkcs7_parser.c index d140d8bb..c1ca1e86 100644 --- a/crypto/asymmetric_keys/pkcs7_parser.c +++ b/crypto/asymmetric_keys/pkcs7_parser.c @@ -11,6 +11,7 @@ #define pr_fmt(fmt) "PKCS7: "fmt #include <linux/kernel.h> +#include <linux/module.h> #include <linux/export.h> #include <linux/slab.h> #include <linux/err.h> @@ -19,6 +20,10 @@ #include "pkcs7_parser.h" #include "pkcs7-asn1.h" +MODULE_DESCRIPTION("PKCS#7 parser"); +MODULE_AUTHOR("Red Hat, Inc."); +MODULE_LICENSE("GPL"); + struct pkcs7_parse_context { struct pkcs7_message *msg; /* Message being constructed */ struct pkcs7_signed_info *sinfo; /* SignedInfo being constructed */ |