aboutsummaryrefslogtreecommitdiffstats
path: root/lib/crypto
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2019-09-01 22:35:31 +0200
committerHerbert Xu <herbert@gondor.apana.org.au>2019-09-05 14:54:54 +1000
commit34d6245fbc81e764806a65fceaeb3ab3274a1e63 (patch)
treeec464144e0cea02d4d998e6d07777fcf78fa63d9 /lib/crypto
parentcrypto: n2 - Rename arrays to avoid conflict with crypto/sha256.h (diff)
downloadlinux-dev-34d6245fbc81e764806a65fceaeb3ab3274a1e63.tar.xz
linux-dev-34d6245fbc81e764806a65fceaeb3ab3274a1e63.zip
crypto: sha256 - Merge crypto/sha256.h into crypto/sha.h
The generic sha256 implementation from lib/crypto/sha256.c uses data structs defined in crypto/sha.h, so lets move the function prototypes there too. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'lib/crypto')
-rw-r--r--lib/crypto/sha256.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/crypto/sha256.c b/lib/crypto/sha256.c
index 42d75e490a97..220b74c2bbd8 100644
--- a/lib/crypto/sha256.c
+++ b/lib/crypto/sha256.c
@@ -15,7 +15,7 @@
#include <linux/export.h>
#include <linux/module.h>
#include <linux/string.h>
-#include <crypto/sha256.h>
+#include <crypto/sha.h>
#include <asm/unaligned.h>
static inline u32 Ch(u32 x, u32 y, u32 z)