diff mbox series

[1/2] crypto: move lib/sha1.c into lib/crypto/

Message ID 20220709211849.210850-2-ebiggers@kernel.org (mailing list archive)
State Not Applicable
Headers show
Series crypto: make the sha1 library optional | expand

Checks

Context Check Description
netdev/tree_selection success Not a local patch

Commit Message

Eric Biggers July 9, 2022, 9:18 p.m. UTC
From: Eric Biggers <ebiggers@google.com>

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>
---
 lib/Makefile            | 2 +-
 lib/crypto/Makefile     | 2 ++
 lib/{ => crypto}/sha1.c | 0
 3 files changed, 3 insertions(+), 1 deletion(-)
 rename lib/{ => crypto}/sha1.c (100%)

Comments

Jason A. Donenfeld July 11, 2022, 2:58 p.m. UTC | #1
On Sat, Jul 09, 2022 at 02:18:48PM -0700, Eric Biggers wrote:
> From: Eric Biggers <ebiggers@google.com>
> 
> 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>

Thanks for this.

Reviewed-by: Jason A. Donenfeld <Jason@zx2c4.com>
diff mbox series

Patch

diff --git a/lib/Makefile b/lib/Makefile
index f99bf61f8bbc67..67482f5ec0e899 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 26be2bbe09c59e..d28111ba54fcb2 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
similarity index 100%
rename from lib/sha1.c
rename to lib/crypto/sha1.c