Merge commit 'b5aa1d95a158683d936ea41eed0513aa20ed2e74'

Conflicts:
	libbb/Kbuild.src

2 files changed, 2 insertions, 2 deletions

diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src
index 9597bcbd3..e3866e456 100644
--- a/libbb/Kbuild.src
+++ b/libbb/Kbuild.src
@@ -53,9 +53,9 @@ lib-y += last_char_is.o
 lib-y += lineedit.o lineedit_ptr_hack.o
 lib-y += llist.o
 lib-y += make_directory.o
-# Alternative (disabled) implementation
+lib-y += hash_md5_sha.o
+# Alternative (disabled) MD5 implementation
 #lib-y += hash_md5prime.o
-lib-y += hash_sha.o
 lib-y += messages.o
 lib-y += mode_string.o
 lib-y += obscure.o
diff --git a/libbb/hash_sha.c b/libbb/hash_md5_sha.c
index 3e708ef7e..3e708ef7e 100644
--- a/libbb/hash_sha.c
+++ b/libbb/hash_md5_sha.c