diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2019-08-17 16:24:31 +0200 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2019-08-22 14:57:35 +1000 |
| commit | ad767ee858b38af634c957a792cb001d54a7b981 (patch) | |
| tree | abc728ea04dca8c72d9529fbde034496d7aa5a28 | |
| parent | 1a01333d313447f0cdfcc2882ea3afe387a24be0 (diff) | |
crypto: sha256 - Move lib/sha256.c to lib/crypto
Generic crypto implementations belong under lib/crypto not directly in
lib, likewise the header should be in include/crypto, not include/linux.
Note that the code in lib/crypto/sha256.c is not yet available for
generic use after this commit, it is still only used by the s390 and x86
purgatory code. Making it suitable for generic use is done in further
patches in this series.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
| -rw-r--r-- | arch/s390/purgatory/Makefile | 2 | ||||
| -rw-r--r-- | arch/s390/purgatory/purgatory.c | 2 | ||||
| -rw-r--r-- | arch/x86/purgatory/Makefile | 2 | ||||
| -rw-r--r-- | arch/x86/purgatory/purgatory.c | 2 | ||||
| -rw-r--r-- | include/crypto/sha256.h (renamed from include/linux/sha256.h) | 2 | ||||
| -rw-r--r-- | lib/crypto/sha256.c (renamed from lib/sha256.c) | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/arch/s390/purgatory/Makefile b/arch/s390/purgatory/Makefile index dc1ae4ff79d7a..85b05c9e40f54 100644 --- a/arch/s390/purgatory/Makefile +++ b/arch/s390/purgatory/Makefile @@ -7,7 +7,7 @@ purgatory-y := head.o purgatory.o string.o sha256.o mem.o targets += $(purgatory-y) purgatory.lds purgatory purgatory.ro PURGATORY_OBJS = $(addprefix $(obj)/,$(purgatory-y)) -$(obj)/sha256.o: $(srctree)/lib/sha256.c FORCE +$(obj)/sha256.o: $(srctree)/lib/crypto/sha256.c FORCE $(call if_changed_rule,cc_o_c) $(obj)/mem.o: $(srctree)/arch/s390/lib/mem.S FORCE diff --git a/arch/s390/purgatory/purgatory.c b/arch/s390/purgatory/purgatory.c index 3528e6da4e879..a80c78da9985d 100644 --- a/arch/s390/purgatory/purgatory.c +++ b/arch/s390/purgatory/purgatory.c @@ -8,8 +8,8 @@ */ #include <linux/kexec.h> -#include <linux/sha256.h> #include <linux/string.h> +#include <crypto/sha256.h> #include <asm/purgatory.h> int verify_sha256_digest(void) diff --git a/arch/x86/purgatory/Makefile b/arch/x86/purgatory/Makefile index 3cf302b263322..026fa0006f0bf 100644 --- a/arch/x86/purgatory/Makefile +++ b/arch/x86/purgatory/Makefile @@ -6,7 +6,7 @@ purgatory-y := purgatory.o stack.o setup-x86_$(BITS).o sha256.o entry64.o string targets += $(purgatory-y) PURGATORY_OBJS = $(addprefix $(obj)/,$(purgatory-y)) -$(obj)/sha256.o: $(srctree)/lib/sha256.c FORCE +$(obj)/sha256.o: $(srctree)/lib/crypto/sha256.c FORCE $(call if_changed_rule,cc_o_c) LDFLAGS_purgatory.ro := -e purgatory_start -r --no-undefined -nostdlib -z nodefaultlib diff --git a/arch/x86/purgatory/purgatory.c b/arch/x86/purgatory/purgatory.c index 6d8d5a34c3772..7cd7a26181802 100644 --- a/arch/x86/purgatory/purgatory.c +++ b/arch/x86/purgatory/purgatory.c @@ -9,7 +9,7 @@ */ #include <linux/bug.h> -#include <linux/sha256.h> +#include <crypto/sha256.h> #include <asm/purgatory.h> #include "../boot/string.h" diff --git a/include/linux/sha256.h b/include/crypto/sha256.h index 26972b9e92dbd..b1f9c6781082c 100644 --- a/include/linux/sha256.h +++ b/include/crypto/sha256.h @@ -17,7 +17,7 @@ * kexec_file purgatory. In other cases you should use the implementation in * crypto/. * - * For details see lib/sha256.c + * For details see lib/crypto/sha256.c */ extern int sha256_init(struct sha256_state *sctx); diff --git a/lib/sha256.c b/lib/crypto/sha256.c index ba4dce0b37113..b8114028d06f7 100644 --- a/lib/sha256.c +++ b/lib/crypto/sha256.c @@ -12,8 +12,8 @@ */ #include <linux/bitops.h> -#include <linux/sha256.h> #include <linux/string.h> +#include <crypto/sha256.h> #include <asm/byteorder.h> static inline u32 Ch(u32 x, u32 y, u32 z) |