aboutsummaryrefslogtreecommitdiffstats
path: root/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 /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 'crypto')
-rw-r--r--crypto/sha256_generic.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/crypto/sha256_generic.c b/crypto/sha256_generic.c
index eafd10f9bf86..f2d7095d4f2d 100644
--- a/crypto/sha256_generic.c
+++ b/crypto/sha256_generic.c
@@ -13,7 +13,6 @@
#include <linux/mm.h>
#include <linux/types.h>
#include <crypto/sha.h>
-#include <crypto/sha256.h>
#include <crypto/sha256_base.h>
#include <asm/byteorder.h>
#include <asm/unaligned.h>