Merge branch 'busybox' into merge

7 files changed, 8 insertions, 8 deletions

diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src
index d6394fe27..80fe8fef0 100644
--- a/libbb/Kbuild.src
+++ b/libbb/Kbuild.src
@@ -45,11 +45,11 @@ lib-y += lineedit.o lineedit_ptr_hack.o
 lib-y += llist.o
 lib-y += make_directory.o
 lib-y += hash_md5_sha.o
-lib-y += hash_md5_sha_x86-64.o
-lib-y += hash_md5_sha_x86-64_shaNI.o
-lib-y += hash_md5_sha_x86-32_shaNI.o
-lib-y += hash_md5_sha256_x86-64_shaNI.o
-lib-y += hash_md5_sha256_x86-32_shaNI.o
+lib-y += hash_sha1_x86-64.o
+lib-y += hash_sha1_hwaccel_x86-64.o
+lib-y += hash_sha1_hwaccel_x86-32.o
+lib-y += hash_sha256_hwaccel_x86-64.o
+lib-y += hash_sha256_hwaccel_x86-32.o
 # Alternative (disabled) MD5 implementation
 #lib-y += hash_md5prime.o
 lib-y += messages.o
diff --git a/libbb/hash_md5_sha_x86-32_shaNI.S b/libbb/hash_sha1_hwaccel_x86-32.S
index 7455a29f0..7455a29f0 100644
--- a/libbb/hash_md5_sha_x86-32_shaNI.S
+++ b/libbb/hash_sha1_hwaccel_x86-32.S
diff --git a/libbb/hash_md5_sha_x86-64_shaNI.S b/libbb/hash_sha1_hwaccel_x86-64.S
index 2f03e1ce4..2f03e1ce4 100644
--- a/libbb/hash_md5_sha_x86-64_shaNI.S
+++ b/libbb/hash_sha1_hwaccel_x86-64.S
diff --git a/libbb/hash_md5_sha_x86-64.S b/libbb/hash_sha1_x86-64.S
index 2cdd22015..b1968fff6 100644
--- a/libbb/hash_md5_sha_x86-64.S
+++ b/libbb/hash_sha1_x86-64.S
@@ -1,4 +1,4 @@
-### Generated by hash_md5_sha_x86-64.S.sh ###
+### Generated by hash_sha1_x86-64.S.sh ###
 
 #if CONFIG_SHA1_SMALL == 0 && defined(__GNUC__) && defined(__x86_64__)
 #ifdef __linux__
diff --git a/libbb/hash_md5_sha_x86-64.S.sh b/libbb/hash_sha1_x86-64.S.sh
index 653fe4989..3fc125d51 100755
--- a/libbb/hash_md5_sha_x86-64.S.sh
+++ b/libbb/hash_sha1_x86-64.S.sh
@@ -4,7 +4,7 @@
 # The reason is that the changes to generated code are difficult
 # to visualize by looking only at this script, it helps when the commit
 # also contains the diff of the generated file.
-exec >hash_md5_sha_x86-64.S
+exec >hash_sha1_x86-64.S
 
 # Based on http://arctic.org/~dean/crypto/sha1.html.
 # ("This SHA1 implementation is public domain.")
@@ -124,7 +124,7 @@ INTERLEAVE() {
 # ...but pshufb is a SSSE3 insn. Can't use it.
 
 echo \
-"### Generated by hash_md5_sha_x86-64.S.sh ###
+"### Generated by hash_sha1_x86-64.S.sh ###
 
 #if CONFIG_SHA1_SMALL == 0 && defined(__GNUC__) && defined(__x86_64__)
 #ifdef __linux__
diff --git a/libbb/hash_md5_sha256_x86-32_shaNI.S b/libbb/hash_sha256_hwaccel_x86-32.S
index a0e4a571a..a0e4a571a 100644
--- a/libbb/hash_md5_sha256_x86-32_shaNI.S
+++ b/libbb/hash_sha256_hwaccel_x86-32.S
diff --git a/libbb/hash_md5_sha256_x86-64_shaNI.S b/libbb/hash_sha256_hwaccel_x86-64.S
index 172c2eae2..172c2eae2 100644
--- a/libbb/hash_md5_sha256_x86-64_shaNI.S
+++ b/libbb/hash_sha256_hwaccel_x86-64.S