Merge commit '06f719fd79fe15ce6fd5431bc58fcb22851de24d'

Conflicts:
	libbb/Kbuild.src

1 files changed, 3 insertions, 3 deletions

diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src
index 9ea3d735d..db0e382a8 100644
--- a/libbb/Kbuild.src
+++ b/libbb/Kbuild.src
@@ -52,9 +52,10 @@ lib-y += last_char_is.o
 lib-y += lineedit.o lineedit_ptr_hack.o
 lib-y += llist.o
 lib-y += make_directory.o
-lib-y += md5.o
+lib-y += hash_md5.o
 # Alternative (disabled) implementation
-#lib-y += md5prime.o
+#lib-y += hash_md5prime.o
+lib-y += hash_sha.o
 lib-y += messages.o
 lib-y += mode_string.o
 lib-y += obscure.o
@@ -81,7 +82,6 @@ lib-y += safe_poll.o
 lib-y += safe_strncpy.o
 lib-y += safe_write.o
 lib-y += setup_environment.o
-lib-y += sha1.o
 lib-y += simplify_path.o
 lib-y += single_argv.o
 lib-y += skip_whitespace.o