diff options
| author | Tom Rini <trini@konsulko.com> | 2020-05-19 10:51:43 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-05-19 10:51:43 -0400 |
| commit | c2279d784e35fa25ee3a9fa28a74a1ba545f8c1e (patch) | |
| tree | 158fd30f3d06142f6a99cbae6ed8ccb0f3be567b /lib/crypto | |
| parent | ed9a3aa6452f57af65eb74f73bd2a54c3a2f4b03 (diff) | |
| parent | cd93d625fd751d55c729c78b10f82109d56a5f1d (diff) | |
Merge branch '2020-05-18-reduce-size-of-common.h'
Bring in the latest round of Simon's changes to reduce what's in
<common.h> overall.
Diffstat (limited to 'lib/crypto')
| -rw-r--r-- | lib/crypto/asymmetric_type.c | 2 | ||||
| -rw-r--r-- | lib/crypto/pkcs7_parser.c | 1 | ||||
| -rw-r--r-- | lib/crypto/public_key.c | 1 | ||||
| -rw-r--r-- | lib/crypto/x509_cert_parser.c | 1 |
4 files changed, 5 insertions, 0 deletions
diff --git a/lib/crypto/asymmetric_type.c b/lib/crypto/asymmetric_type.c index 7aa55092ac7..1d0532d0f2e 100644 --- a/lib/crypto/asymmetric_type.c +++ b/lib/crypto/asymmetric_type.c @@ -7,12 +7,14 @@ * Written by David Howells (dhowells@redhat.com) */ #ifndef __UBOOT__ +#include <log.h> #include <dm/devres.h> #include <keys/asymmetric-subtype.h> #include <keys/asymmetric-parser.h> #endif #include <crypto/public_key.h> #ifdef __UBOOT__ +#include <linux/bug.h> #include <linux/compat.h> #include <linux/ctype.h> #include <linux/err.h> diff --git a/lib/crypto/pkcs7_parser.c b/lib/crypto/pkcs7_parser.c index 0ee207b6b1c..0b85fe8286c 100644 --- a/lib/crypto/pkcs7_parser.c +++ b/lib/crypto/pkcs7_parser.c @@ -7,6 +7,7 @@ #define pr_fmt(fmt) "PKCS7: "fmt #ifdef __UBOOT__ +#include <log.h> #include <dm/devres.h> #include <linux/bitops.h> #include <linux/compat.h> diff --git a/lib/crypto/public_key.c b/lib/crypto/public_key.c index 8b4821767aa..e12ebbb3d0c 100644 --- a/lib/crypto/public_key.c +++ b/lib/crypto/public_key.c @@ -10,6 +10,7 @@ #define pr_fmt(fmt) "PKEY: "fmt #ifdef __UBOOT__ #include <dm/devres.h> +#include <linux/bug.h> #include <linux/compat.h> #include <linux/err.h> #else diff --git a/lib/crypto/x509_cert_parser.c b/lib/crypto/x509_cert_parser.c index 18f5407a076..5f984b9dfda 100644 --- a/lib/crypto/x509_cert_parser.c +++ b/lib/crypto/x509_cert_parser.c @@ -6,6 +6,7 @@ */ #define pr_fmt(fmt) "X.509: "fmt +#include <log.h> #include <dm/devres.h> #include <linux/kernel.h> #ifndef __UBOOT__ |