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.

1 files changed, 2 insertions, 2 deletions

diff --git a/editors/vi.c b/editors/vi.c
index b973cc056..b30369302 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -1182,7 +1182,7 @@ static int readit(void) // read (maybe cursor) key from stdin
         // on nonblocking stdin.
         // Note: read_key sets errno to 0 on success.
  again:
-        c = read_key(STDIN_FILENO, readbuffer, /*timeout:*/ -1);
+        c = safe_read_key(STDIN_FILENO, readbuffer, /*timeout:*/ -1);
         if (c == -1) { // EOF/error
                 if (errno == EAGAIN) // paranoia
                         goto again;
@@ -4930,7 +4930,7 @@ static void edit_file(char *fn)
                 uint64_t k;
                 write1(ESC"[999;999H" ESC"[6n");
                 fflush_all();
-                k = read_key(STDIN_FILENO, readbuffer, /*timeout_ms:*/ 100);
+                k = safe_read_key(STDIN_FILENO, readbuffer, /*timeout_ms:*/ 100);
                 if ((int32_t)k == KEYCODE_CURSOR_POS) {
                         uint32_t rc = (k >> 32);
                         columns = (rc & 0x7fff);