aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2022-07-09 14:18:48 -0700
committerHerbert Xu <herbert@gondor.apana.org.au>2022-07-15 16:43:59 +0800
commit463f74089ff9148e3e46af454a6977d40b98cd10 (patch)
treeb49a09ad5e1a284fe7bc3741a4b66e3d84d5bed9
parentcrypto: fips - make proc files report fips module name and version (diff)
downloadlinux-dev-463f74089ff9148e3e46af454a6977d40b98cd10.tar.xz
linux-dev-463f74089ff9148e3e46af454a6977d40b98cd10.zip
crypto: lib - move lib/sha1.c into lib/crypto/
SHA-1 is a crypto algorithm (or at least was intended to be -- it's not considered secure anymore), so move it out of the top-level library directory and into lib/crypto/. Signed-off-by: Eric Biggers <ebiggers@google.com> Reviewed-by: Jason A. Donenfeld <Jason@zx2c4.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r--lib/Makefile2
-rw-r--r--lib/crypto/Makefile2
-rw-r--r--lib/crypto/sha1.c (renamed from lib/sha1.c)0
3 files changed, 3 insertions, 1 deletions
diff --git a/lib/Makefile b/lib/Makefile
index f99bf61f8bbc..67482f5ec0e8 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -29,7 +29,7 @@ endif
lib-y := ctype.o string.o vsprintf.o cmdline.o \
rbtree.o radix-tree.o timerqueue.o xarray.o \
- idr.o extable.o sha1.o irq_regs.o argv_split.o \
+ idr.o extable.o irq_regs.o argv_split.o \
flex_proportions.o ratelimit.o show_mem.o \
is_single_threaded.o plist.o decompress.o kobject_uevent.o \
earlycpio.o seq_buf.o siphash.o dec_and_lock.o \
diff --git a/lib/crypto/Makefile b/lib/crypto/Makefile
index 26be2bbe09c5..d28111ba54fc 100644
--- a/lib/crypto/Makefile
+++ b/lib/crypto/Makefile
@@ -34,6 +34,8 @@ libpoly1305-y := poly1305-donna32.o
libpoly1305-$(CONFIG_ARCH_SUPPORTS_INT128) := poly1305-donna64.o
libpoly1305-y += poly1305.o
+obj-y += sha1.o
+
obj-$(CONFIG_CRYPTO_LIB_SHA256) += libsha256.o
libsha256-y := sha256.o
diff --git a/lib/sha1.c b/lib/crypto/sha1.c
index 0494766fc574..0494766fc574 100644
--- a/lib/sha1.c
+++ b/lib/crypto/sha1.c