Merge busybox into merge

Fix conflicts in reset and ash.

Redefine the new safe_read_key() as a reference to read_key().

Disable SHA256_HWACCEL.

2 files changed, 3 insertions, 1 deletions

diff --git a/archival/libarchive/decompress_bunzip2.c b/archival/libarchive/decompress_bunzip2.c
index 42e2b4f88..4a2b668aa 100644
--- a/archival/libarchive/decompress_bunzip2.c
+++ b/archival/libarchive/decompress_bunzip2.c
@@ -654,7 +654,7 @@ static int read_bunzip(bunzip_data *bd, char *outbuf, int len)
                                 /* Subtract the 1 copy we'd output anyway to get extras */
                                 --bd->writeCopies;
                         }
-                } /* for(;;) */
+                } /* for (;;) */
 
                 /* Decompression of this input block completed successfully */
                 bd->writeCRC = CRC = ~CRC;
diff --git a/archival/libarchive/get_header_tar.c b/archival/libarchive/get_header_tar.c
index d26868bf8..cc6f3f0ad 100644
--- a/archival/libarchive/get_header_tar.c
+++ b/archival/libarchive/get_header_tar.c
@@ -147,11 +147,13 @@ static void process_pax_hdr(archive_handle_t *archive_handle, unsigned sz, int g
 #endif
 }
 
+#if ENABLE_FEATURE_TAR_GNU_EXTENSIONS
 static void die_if_bad_fnamesize(off_t sz)
 {
         if ((uoff_t)sz > 0xfff) /* more than 4k?! no funny business please */
                 bb_simple_error_msg_and_die("bad archive");
 }
+#endif
 
 char FAST_FUNC get_header_tar(archive_handle_t *archive_handle)
 {