133 files changed, 3349 insertions, 2815 deletions
diff --git a/AUTHORS b/AUTHORS
index fa58697f7..5c9a634c9 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -178,3 +178,6 @@ Mike Frysinger <vapier@gentoo.org>
 Jie Zhang <jie.zhang@analog.com>
    fixed two bugs in msh and hush (exitcode of killed processes)
+Maxime Coste <mawww@kakoune.org>
+    paste implementation
diff --git a/archival/dpkg.c b/archival/dpkg.c
index f133299e3..1cd45eda4 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -18,7 +18,7 @@
 * known difference between busybox dpkg and the official dpkg that i don't
 * consider important, its worth keeping a note of differences anyway, just to
 * make it easier to maintain.
- *  - the first value for the confflile: field isnt placed on a new line.
+ *  - the first value for the confflile: field isn't placed on a new line.
 *  - when installing a package the status: field is placed at the end of the
 *      section, rather than just after the package: field.
 *
@@ -110,7 +110,7 @@ typedef struct common_node_s {
        edge_t **edge;
 } common_node_t;
-/* Currently it doesnt store packages that have state-status of not-installed
+/* Currently it doesn't store packages that have state-status of not-installed
 * So it only really has to be the size of the maximum number of packages
 * likely to be installed at any one time, so there is a bit of leeway here */
 #define STATUS_HASH_PRIME 8191
@@ -205,7 +205,7 @@ static int search_name_hashtable(const char *key)
        return probe_address;
 }
-/* this DOESNT add the key to the hashtable
+/* this DOESN'T add the key to the hashtable
 * TODO make it consistent with search_name_hashtable
 */
 static unsigned search_status_hashtable(const char *key)
@@ -467,7 +467,7 @@ static void add_split_dependencies(common_node_t *parent_node, const char *whole
                        version = strchr(field2, '(');
                        if (version == NULL) {
                                edge->operator = VER_ANY;
-                                /* Get the versions hash number, adding it if the number isnt already in there */
+                                /* Get the versions hash number, adding it if the number isn't already in there */
                                edge->version = search_name_hashtable("ANY");
                        } else {
                                /* Skip leading ' ' or '(' */
@@ -496,7 +496,7 @@ static void add_split_dependencies(common_node_t *parent_node, const char *whole
                                /* Truncate version at trailing ' ' or ')' */
                                version[strcspn(version, " )")] = '\0';
-                                /* Get the versions hash number, adding it if the number isnt already in there */
+                                /* Get the versions hash number, adding it if the number isn't already in there */
                                edge->version = search_name_hashtable(version);
                        }
@@ -562,7 +562,7 @@ static int read_package_field(const char *package_buffer, char **field_name, cha
                                        offset_name_end = offset;
                                        offset_value_start = next_offset;
                                }
-                                /* TODO: Name might still have trailing spaces if ':' isnt
+                                /* TODO: Name might still have trailing spaces if ':' isn't
                                 * immediately after name */
                                break;
                        case '\n':
@@ -776,7 +776,7 @@ static void index_status_file(const char *filename)
                const unsigned package_num = fill_package_struct(control_buffer);
                if (package_num != -1) {
                        status_node = xmalloc(sizeof(status_node_t));
-                        /* fill_package_struct doesnt handle the status field */
+                        /* fill_package_struct doesn't handle the status field */
                        status_line = strstr(control_buffer, "Status:");
                        if (status_line != NULL) {
                                status_line += 7;
@@ -850,7 +850,7 @@ static void write_status_file(deb_file_t **deb_file)
                if (status_hashtable[status_num] != NULL) {
                        const char *status_from_hashtable = name_hashtable[status_hashtable[status_num]->status];
                        if (strcmp(status_from_file, status_from_hashtable) != 0) {
-                                /* New status isnt exactly the same as old status */
+                                /* New status isn't exactly the same as old status */
                                const int state_status = get_status(status_num, 3);
                                if ((strcmp("installed", name_hashtable[state_status]) == 0)
                                 || (strcmp("unpacked", name_hashtable[state_status]) == 0)
@@ -919,7 +919,7 @@ static void write_status_file(deb_file_t **deb_file)
                                }
                        }
                }
-                /* If the package from the status file wasnt handle above, do it now*/
+                /* If the package from the status file wasn't handle above, do it now*/
                if (!write_flag) {
                        fprintf(new_status_file, "%s\n\n", control_buffer);
                }
@@ -946,7 +946,7 @@ static void write_status_file(deb_file_t **deb_file)
                if (errno != ENOENT)
                        bb_error_msg_and_die("can't create backup status file");
                /* Its ok if renaming the status file fails because status
-                 * file doesnt exist, maybe we are starting from scratch */
+                 * file doesn't exist, maybe we are starting from scratch */
                bb_error_msg("no status file found, creating new one");
        }
@@ -1061,7 +1061,7 @@ static int check_deps(deb_file_t **deb_file, int deb_start /*, int dep_max_count
        }
-        /* Check dependendcies */
+        /* Check dependentcies */
        for (i = 0; i < PACKAGE_HASH_PRIME; i++) {
                int status_num = 0;
                int number_of_alternatives = 0;
@@ -1244,7 +1244,7 @@ static void run_package_script_or_die(const char *package_name, const char *scri
        script_path = xasprintf("/var/lib/dpkg/info/%s.%s", package_name, script_type);
-        /* If the file doesnt exist is isnt fatal */
+        /* If the file doesn't exist it isn't fatal */
        result = access(script_path, F_OK) ? EXIT_SUCCESS : system(script_path);
        free(script_path);
        if (result)
@@ -1839,7 +1839,7 @@ int dpkg_main(int argc UNUSED_PARAM, char **argv)
                                ) {
                                        status_node = xmalloc(sizeof(status_node_t));
                                        status_node->package = deb_file[deb_count]->package;
-                                        /* reinstreq isnt changed to "ok" until the package control info
+                                        /* reinstreq isn't changed to "ok" until the package control info
                                         * is written to the status file*/
                                        status_node->status = search_name_hashtable("install reinstreq not-installed");
                                        status_hashtable[status_num] = status_node;
diff --git a/archival/libarchive/Kbuild.src b/archival/libarchive/Kbuild.src
index eaf67451f..942e755b9 100644
--- a/archival/libarchive/Kbuild.src
+++ b/archival/libarchive/Kbuild.src
@@ -51,8 +51,8 @@ lib-$(CONFIG_LZOP)                      += lzo1x_1.o lzo1x_1o.o lzo1x_d.o
 lib-$(CONFIG_UNLZOP)                    += lzo1x_1.o lzo1x_1o.o lzo1x_d.o
 lib-$(CONFIG_LZOPCAT)                   += lzo1x_1.o lzo1x_1o.o lzo1x_d.o
 lib-$(CONFIG_LZOP_COMPR_HIGH)           += lzo1x_9x.o
-lib-$(CONFIG_BUNZIP2)                   += open_transformer.o decompress_bunzip2.o
+# 'bzip2 -d', bunzip2 or bzcat selects FEATURE_BZIP2_DECOMPRESS
-lib-$(CONFIG_BZCAT)                     += open_transformer.o decompress_bunzip2.o
+lib-$(CONFIG_FEATURE_BZIP2_DECOMPRESS)  += open_transformer.o decompress_bunzip2.o
 lib-$(CONFIG_FEATURE_UNZIP_BZIP2)       += open_transformer.o decompress_bunzip2.o
 lib-$(CONFIG_UNLZMA)                    += open_transformer.o decompress_unlzma.o
 lib-$(CONFIG_LZCAT)                     += open_transformer.o decompress_unlzma.o
@@ -62,8 +62,8 @@ lib-$(CONFIG_UNXZ)                      += open_transformer.o decompress_unxz.o
 lib-$(CONFIG_XZCAT)                     += open_transformer.o decompress_unxz.o
 lib-$(CONFIG_XZ)                        += open_transformer.o decompress_unxz.o
 lib-$(CONFIG_FEATURE_UNZIP_XZ)          += open_transformer.o decompress_unxz.o
-lib-$(CONFIG_GUNZIP)                    += open_transformer.o decompress_gunzip.o
+# 'gzip -d', gunzip or zcat selects FEATURE_GZIP_DECOMPRESS
-lib-$(CONFIG_ZCAT)                      += open_transformer.o decompress_gunzip.o
+lib-$(CONFIG_FEATURE_GZIP_DECOMPRESS)   += open_transformer.o decompress_gunzip.o
 lib-$(CONFIG_UNCOMPRESS)                += open_transformer.o decompress_uncompress.o
 lib-$(CONFIG_UNZIP)                     += open_transformer.o decompress_gunzip.o unsafe_prefix.o
 lib-$(CONFIG_RPM2CPIO)                  += open_transformer.o decompress_gunzip.o get_header_cpio.o
diff --git a/archival/libarchive/decompress_bunzip2.c b/archival/libarchive/decompress_bunzip2.c
index 4fb989c29..803702f75 100644
--- a/archival/libarchive/decompress_bunzip2.c
+++ b/archival/libarchive/decompress_bunzip2.c
@@ -308,7 +308,7 @@ static int get_next_block(bunzip_data *bd)
                base = hufGroup->base - 1;
                limit = hufGroup->limit - 1;
-                /* Calculate permute[].  Concurently, initialize temp[] and limit[]. */
+                /* Calculate permute[].  Concurrently, initialize temp[] and limit[]. */
                pp = 0;
                for (i = minLen; i <= maxLen; i++) {
                        int k;
diff --git a/archival/libarchive/unxz/xz_dec_lzma2.c b/archival/libarchive/unxz/xz_dec_lzma2.c
index 351251f7c..bca41e705 100644
--- a/archival/libarchive/unxz/xz_dec_lzma2.c
+++ b/archival/libarchive/unxz/xz_dec_lzma2.c
@@ -486,11 +486,11 @@ static __always_inline void XZ_FUNC rc_normalize(struct rc_dec *rc)
 }
 /*
- * Decode one bit. In some versions, this function has been splitted in three
+ * Decode one bit. In some versions, this function has been split in three
 * functions so that the compiler is supposed to be able to more easily avoid
 * an extra branch. In this particular version of the LZMA decoder, this
 * doesn't seem to be a good idea (tested with GCC 3.3.6, 3.4.6, and 4.3.3
- * on x86). Using a non-splitted version results in nicer looking code too.
+ * on x86). Using a non-split version results in nicer looking code too.
 *
 * NOTE: This must return an int. Do not make it return a bool or the speed
 * of the code generated by GCC 3.x decreases 10-15 %. (GCC 4.3 doesn't care,
diff --git a/archival/tar.c b/archival/tar.c
index 34e3052ce..be5838d0d 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -529,8 +529,8 @@ static int FAST_FUNC writeFileToTarball(const char *fileName, struct stat *statb
        /*
         * Check to see if we are dealing with a hard link.
         * If so -
-         * Treat the first occurance of a given dev/inode as a file while
+         * Treat the first occurrence of a given dev/inode as a file while
-         * treating any additional occurances as hard links.  This is done
+         * treating any additional occurrences as hard links.  This is done
         * by adding the file information to the HardLinkInfo linked list.
         */
        tbInfo->hlInfo = NULL;
diff --git a/archival/unzip.c b/archival/unzip.c
index 56989fa0b..986145d0f 100644
--- a/archival/unzip.c
+++ b/archival/unzip.c
@@ -242,7 +242,7 @@ static uint32_t find_cdf_offset(void)
                end = 0;
        dbg("Looking for cdf_offset starting from 0x%"OFF_FMT"x", end);
-        xlseek(zip_fd, end, SEEK_SET);
+        xlseek(zip_fd, end, SEEK_SET);
        buf = xzalloc(PEEK_FROM_END);
        full_read(zip_fd, buf, PEEK_FROM_END);
diff --git a/console-tools/reset.c b/console-tools/reset.c
index 57cebb4ea..587c0d11a 100644
--- a/console-tools/reset.c
+++ b/console-tools/reset.c
@@ -56,6 +56,8 @@ int reset_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 #if ENABLE_STTY
                return stty_main(2, (char**)args);
 #else
+                /* Make sure stdout gets drained before we execvp */
+                fflush_all();
                execvp("stty", (char**)args);
 #endif
        }
diff --git a/coreutils/cat.c b/coreutils/cat.c
index 65978887e..4d9147f8a 100644
--- a/coreutils/cat.c
+++ b/coreutils/cat.c
@@ -12,56 +12,168 @@
 //config:       help
 //config:         cat is used to concatenate files and print them to the standard
 //config:         output. Enable this option if you wish to enable the 'cat' utility.
+//config:
+//config:config FEATURE_CATV
+//config:       bool "cat -v[etA]"
+//config:       default y
+//config:       depends on CAT
+//config:       help
+//config:         Display nonprinting characters as escape sequences
-//applet:IF_CAT(APPLET_NOFORK(cat, cat, BB_DIR_BIN, BB_SUID_DROP, cat))
+//applet:IF_CAT(APPLET(cat, BB_DIR_BIN, BB_SUID_DROP))
-//kbuild:lib-$(CONFIG_CAT)     += cat.o
+//kbuild:lib-$(CONFIG_CAT) += cat.o
 /* BB_AUDIT SUSv3 compliant */
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/cat.html */
 //usage:#define cat_trivial_usage
-//usage:       "[FILE]..."
+//usage:       "[-nb"IF_FEATURE_CATV("vteA")"] [FILE]..."
 //usage:#define cat_full_usage "\n\n"
-//usage:       "Concatenate FILEs and print them to stdout"
+//usage:       "Print FILEs to stdout\n"
+//usage:     "\n        -n      Number output lines"
+//usage:     "\n        -b      Number nonempty lines"
+//usage:        IF_FEATURE_CATV(
+//usage:     "\n        -v      Show nonprinting characters as ^x or M-x"
+//usage:     "\n        -t      ...and tabs as ^I"
+//usage:     "\n        -e      ...and end lines with $"
+//usage:     "\n        -A      Same as -vte"
+//usage:        )
+/*
+  Longopts not implemented yet:
+      --number-nonblank    number nonempty output lines, overrides -n
+      --number             number all output lines
+      --show-nonprinting   use ^ and M- notation, except for LFD and TAB
+      --show-all           equivalent to -vet
+  Not implemented yet:
+  -E, --show-ends          display $ at end of each line (-e sans -v)
+  -T, --show-tabs          display TAB characters as ^I (-t sans -v)
+  -s, --squeeze-blank      suppress repeated empty output lines
+*/
 //usage:
 //usage:#define cat_example_usage
 //usage:       "$ cat /proc/uptime\n"
 //usage:       "110716.72 17.67"
 #include "libbb.h"
+#include "common_bufsiz.h"
-/* This is a NOFORK applet. Be very careful! */
+#if ENABLE_FEATURE_CATV
+/*
+ * cat -v implementation for busybox
-int bb_cat(char **argv)
+ *
+ * Copyright (C) 2006 Rob Landley <rob@landley.net>
+ *
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
+ */
+/* Rob had "cat -v" implemented as a separate applet, catv.
+ * See "cat -v considered harmful" at
+ * http://cm.bell-labs.com/cm/cs/doc/84/kp.ps.gz
+ * From USENIX Summer Conference Proceedings, 1983
+ * """
+ * The talk reviews reasons for UNIX's popularity and shows, using UCB cat
+ * as a primary example, how UNIX has grown fat. cat isn't for printing
+ * files with line numbers, it isn't for compressing multiple blank lines,
+ * it's not for looking at non-printing ASCII characters, it's for
+ * concatenating files.
+ * We are reminded that ls isn't the place for code to break a single column
+ * into multiple ones, and that mailnews shouldn't have its own more
+ * processing or joke encryption code.
+ * """
+ *
+ * I agree with the argument. Unfortunately, this ship has sailed (1983...).
+ * There are dozens of Linux distros and each of them has "cat" which supports -v.
+ * It's unrealistic for us to "reeducate" them to use our, incompatible way
+ * to achieve "cat -v" effect. The actuall effect would be "users pissed off
+ * by gratuitous incompatibility".
+ */
+#define CATV_OPT_e (1<<0)
+#define CATV_OPT_t (1<<1)
+#define CATV_OPT_v (1<<2)
+static int catv(unsigned opts, char **argv)
 {
-        int fd;
        int retval = EXIT_SUCCESS;
+        int fd;
-        if (!*argv)
+        BUILD_BUG_ON(CATV_OPT_e != VISIBLE_ENDLINE);
-                argv = (char**) &bb_argv_dash;
+        BUILD_BUG_ON(CATV_OPT_t != VISIBLE_SHOW_TABS);
+#if 0 /* These consts match, we can just pass "opts" to visible() */
+        if (opts & CATV_OPT_e)
+                flags |= VISIBLE_ENDLINE;
+        if (opts & CATV_OPT_t)
+                flags |= VISIBLE_SHOW_TABS;
+#endif
+        /* Read from stdin if there's nothing else to do. */
+        if (!argv[0])
+                *--argv = (char*)"-";
+#define read_buf bb_common_bufsiz1
+        setup_common_bufsiz();
        do {
                fd = open_or_warn_stdin(*argv);
-                if (fd >= 0) {
+                if (fd < 0) {
-                        /* This is not a xfunc - never exits */
+                        retval = EXIT_FAILURE;
-                        off_t r = bb_copyfd_eof(fd, STDOUT_FILENO);
+                        continue;
-                        if (fd != STDIN_FILENO)
-                                close(fd);
-                        if (r >= 0)
-                                continue;
                }
-                retval = EXIT_FAILURE;
+                for (;;) {
+                        int i, res;
+                        res = read(fd, read_buf, COMMON_BUFSIZE);
+                        if (res < 0)
+                                retval = EXIT_FAILURE;
+                        if (res <= 0)
+                                break;
+                        for (i = 0; i < res; i++) {
+                                unsigned char c = read_buf[i];
+                                char buf[sizeof("M-^c")];
+                                visible(c, buf, opts);
+                                fputs(buf, stdout);
+                        }
+                }
+                if (ENABLE_FEATURE_CLEAN_UP && fd)
+                        close(fd);
        } while (*++argv);
-        return retval;
+        fflush_stdout_and_exit(retval);
 }
+#endif
 int cat_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int cat_main(int argc UNUSED_PARAM, char **argv)
 {
-        getopt32(argv, "u");
+        struct number_state ns;
+        unsigned opts;
+        IF_FEATURE_CATV(opt_complementary = "Aetv"; /* -A == -vet */)
+        /* -u is ignored ("unbuffered") */
+        opts = getopt32(argv, IF_FEATURE_CATV("etvA")"nbu");
        argv += optind;
-        return bb_cat(argv);
+#if ENABLE_FEATURE_CATV
+        if (opts & 7)
+                return catv(opts, argv);
+//BUG: -v,-e,-t,-A ignore -nb
+        opts >>= 4;
+#endif
+#define CAT_OPT_n (1<<0)
+#define CAT_OPT_b (1<<1)
+#define CAT_OPT_u (1<<2)
+        if (!(opts & (CAT_OPT_n|CAT_OPT_b))) /* no -n or -b */
+                return bb_cat(argv);
+        if (!*argv)
+                *--argv = (char*)"-";
+        ns.width = 6;
+        ns.start = 1;
+        ns.inc = 1;
+        ns.sep = "\t";
+        ns.empty_str = "\n";
+        ns.all = !(opts & CAT_OPT_b); /* -n without -b */
+        ns.nonempty = (opts & CAT_OPT_b); /* -b (with or without -n) */
+        do {
+                print_numbered_lines(&ns, *argv);
+        } while (*++argv);
+        fflush_stdout_and_exit(EXIT_SUCCESS);
 }
diff --git a/coreutils/catv.c b/coreutils/catv.c
deleted file mode 100644
index 1aeebe1d9..000000000
--- a/coreutils/catv.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/* vi: set sw=4 ts=4: */
-/*
- * cat -v implementation for busybox
- *
- * Copyright (C) 2006 Rob Landley <rob@landley.net>
- *
- * Licensed under GPLv2 or later, see file LICENSE in this source tree.
- */
-/* See "Cat -v considered harmful" at
- * http://cm.bell-labs.com/cm/cs/doc/84/kp.ps.gz */
-//config:config CATV
-//config:       bool "catv"
-//config:       default y
-//config:       help
-//config:         Display nonprinting characters as escape sequences (like some
-//config:         implementations' cat -v option).
-//applet:IF_CATV(APPLET(catv, BB_DIR_BIN, BB_SUID_DROP))
-//kbuild:lib-$(CONFIG_CATV) += catv.o
-//usage:#define catv_trivial_usage
-//usage:       "[-etv] [FILE]..."
-//usage:#define catv_full_usage "\n\n"
-//usage:       "Display nonprinting characters as ^x or M-x\n"
-//usage:     "\n        -e      End each line with $"
-//usage:     "\n        -t      Show tabs as ^I"
-//usage:     "\n        -v      Don't use ^x or M-x escapes"
-#include "libbb.h"
-#include "common_bufsiz.h"
-#define CATV_OPT_e (1<<0)
-#define CATV_OPT_t (1<<1)
-#define CATV_OPT_v (1<<2)
-struct BUG_const_mismatch {
-        char BUG_const_mismatch[
-                CATV_OPT_e == VISIBLE_ENDLINE && CATV_OPT_t == VISIBLE_SHOW_TABS
-                ? 1 : -1
-        ];
-};
-int catv_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int catv_main(int argc UNUSED_PARAM, char **argv)
-{
-        int retval = EXIT_SUCCESS;
-        int fd;
-        unsigned opts;
-        opts = getopt32(argv, "etv");
-        argv += optind;
-#if 0 /* These consts match, we can just pass "opts" to visible() */
-        if (opts & CATV_OPT_e)
-                flags |= VISIBLE_ENDLINE;
-        if (opts & CATV_OPT_t)
-                flags |= VISIBLE_SHOW_TABS;
-#endif
-        /* Read from stdin if there's nothing else to do. */
-        if (!argv[0])
-                *--argv = (char*)"-";
-#define read_buf bb_common_bufsiz1
-        setup_common_bufsiz();
-        do {
-                fd = open_or_warn_stdin(*argv);
-                if (fd < 0) {
-                        retval = EXIT_FAILURE;
-                        continue;
-                }
-                for (;;) {
-                        int i, res;
-                        res = read(fd, read_buf, COMMON_BUFSIZE);
-                        if (res < 0)
-                                retval = EXIT_FAILURE;
-                        if (res <= 0)
-                                break;
-                        for (i = 0; i < res; i++) {
-                                unsigned char c = read_buf[i];
-                                if (opts & CATV_OPT_v) {
-                                        putchar(c);
-                                } else {
-                                        char buf[sizeof("M-^c")];
-                                        visible(c, buf, opts);
-                                        fputs(buf, stdout);
-                                }
-                        }
-                }
-                if (ENABLE_FEATURE_CLEAN_UP && fd)
-                        close(fd);
-        } while (*++argv);
-        fflush_stdout_and_exit(retval);
-}
diff --git a/coreutils/cksum.c b/coreutils/cksum.c
index aeec0188d..9034fc19a 100644
--- a/coreutils/cksum.c
+++ b/coreutils/cksum.c
@@ -17,9 +17,9 @@
 //kbuild:lib-$(CONFIG_CKSUM) += cksum.o
 //usage:#define cksum_trivial_usage
-//usage:       "FILES..."
+//usage:       "FILE..."
 //usage:#define cksum_full_usage "\n\n"
-//usage:       "Calculate the CRC32 checksums of FILES"
+//usage:       "Calculate the CRC32 checksums of FILEs"
 #include "libbb.h"
 #include "common_bufsiz.h"
diff --git a/coreutils/dd.c b/coreutils/dd.c
index 85152d8ce..2fccf9d8e 100644
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -543,11 +543,11 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
                        if (write_and_stats(ibuf, n, obs, outfile))
                                goto out_status;
                }
+        }
-                if (G.flags & FLAG_FSYNC) {
+        if (G.flags & FLAG_FSYNC) {
-                        if (fsync(ofd) < 0)
+                if (fsync(ofd) < 0)
-                                goto die_outfile;
+                        goto die_outfile;
-                }
        }
        if (ENABLE_FEATURE_DD_IBS_OBS && oc) {
diff --git a/coreutils/dos2unix.c b/coreutils/dos2unix.c
index 6d2347163..9d81ccca6 100644
--- a/coreutils/dos2unix.c
+++ b/coreutils/dos2unix.c
@@ -2,7 +2,7 @@
 /*
 * dos2unix for BusyBox
 *
- * dos2unix '\n' convertor 0.5.0
+ * dos2unix '\n' converter 0.5.0
 * based on Unix2Dos 0.9.0 by Peter Hanecak (made 19.2.1997)
 * Copyright 1997,.. by Peter Hanecak <hanecak@megaloman.sk>.
 * All rights reserved.
diff --git a/coreutils/factor.c b/coreutils/factor.c
new file mode 100644
index 000000000..205cdc053
--- /dev/null
+++ b/coreutils/factor.c
@@ -0,0 +1,219 @@
+/*
+ * Copyright (C) 2017 Denys Vlasenko <vda.linux@googlemail.com>
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
+ */
+//config:config FACTOR
+//config:       bool "factor"
+//config:       default y
+//config:       help
+//config:         factor factorizes integers
+//applet:IF_FACTOR(APPLET(factor, BB_DIR_USR_BIN, BB_SUID_DROP))
+//kbuild:lib-$(CONFIG_FACTOR) += factor.o
+//usage:#define factor_trivial_usage
+//usage:       "[NUMBER]..."
+//usage:#define factor_full_usage "\n\n"
+//usage:       "Print prime factors"
+#include "libbb.h"
+#if 0
+# define dbg(...) bb_error_msg(__VA_ARGS__)
+#else
+# define dbg(...) ((void)0)
+#endif
+typedef unsigned long long wide_t;
+#if ULLONG_MAX == (UINT_MAX * UINT_MAX + 2 * UINT_MAX)
+/* "unsigned" is half as wide as ullong */
+typedef unsigned half_t;
+#define HALF_MAX UINT_MAX
+#define HALF_FMT ""
+#elif ULLONG_MAX == (ULONG_MAX * ULONG_MAX + 2 * ULONG_MAX)
+/* long is half as wide as ullong */
+typedef unsigned long half_t;
+#define HALF_MAX ULONG_MAX
+#define HALF_FMT "l"
+#else
+#error Cant find an integer type which is half as wide as ullong
+#endif
+static half_t isqrt_odd(wide_t N)
+{
+        half_t s = isqrt(N);
+        /* Subtract 1 from even s, odd s won't change: */
+        /* (doesnt work for zero, but we know that s != 0 here) */
+        s = (s - 1) | 1;
+        return s;
+}
+static NOINLINE void factorize(wide_t N)
+{
+        half_t factor;
+        half_t max_factor;
+        // unsigned count3;
+        // unsigned count5;
+        // unsigned count7;
+        // ^^^^^^^^^^^^^^^ commented-out simple sieving code (easier to grasp).
+        // Faster sieving, using one word for potentially up to 6 counters:
+        // count upwards in each mask, counter "triggers" when it sets its mask to "100[0]..."
+        // 10987654321098765432109876543210 - bits 31-0 in 32-bit word
+        //    17777713333311111777775555333 - bit masks for counters for primes 3,5,7,11,13,17
+        //         100000100001000010001001 - value for adding 1 to each mask
+        //    10000010000010000100001000100 - value for checking that any mask reached msb
+        enum {
+                SHIFT_3 = 1 << 0,
+                SHIFT_5 = 1 << 3,
+                SHIFT_7 = 1 << 7,
+                INCREMENT_EACH = SHIFT_3 | SHIFT_5 | SHIFT_7,
+                MULTIPLE_OF_3 = 1 << 2,
+                MULTIPLE_OF_5 = 1 << 6,
+                MULTIPLE_OF_7 = 1 << 11,
+                MULTIPLE_DETECTED = MULTIPLE_OF_3 | MULTIPLE_OF_5 | MULTIPLE_OF_7,
+        };
+        unsigned sieve_word;
+        if (N < 4)
+                goto end;
+        while (!(N & 1)) {
+                printf(" 2");
+                N >>= 1;
+        }
+        /* The code needs to be optimized for the case where
+         * there are large prime factors. For example,
+         * this is not hard:
+         * 8262075252869367027 = 3 7 17 23 47 101 113 127 131 137 823
+         * (the largest factor to test is only ~sqrt(823) = 28)
+         * but this is:
+         * 18446744073709551601 = 53 348051774975651917
+         * the last factor requires testing up to
+         * 589959129 - about 100 million iterations.
+         * The slowest case (largest prime) for N < 2^64 is
+         * factor 18446744073709551557 (0xffffffffffffffc5).
+         */
+        max_factor = isqrt_odd(N);
+        // count3 = 3;
+        // count5 = 6;
+        // count7 = 9;
+        sieve_word = 0
+                /* initial count for SHIFT_n is (n-1)/2*3: */
+                + (MULTIPLE_OF_3 - 3 * SHIFT_3)
+                + (MULTIPLE_OF_5 - 6 * SHIFT_5)
+                + (MULTIPLE_OF_7 - 9 * SHIFT_7)
+                //+ (MULTIPLE_OF_11 - 15 * SHIFT_11)
+                //+ (MULTIPLE_OF_13 - 18 * SHIFT_13)
+                //+ (MULTIPLE_OF_17 - 24 * SHIFT_17)
+        ;
+        factor = 3;
+        for (;;) {
+                /* The division is the most costly part of the loop.
+                 * On 64bit CPUs, takes at best 12 cycles, often ~20.
+                 */
+                while ((N % factor) == 0) { /* not likely */
+                        N = N / factor;
+                        printf(" %"HALF_FMT"u", factor);
+                        max_factor = isqrt_odd(N);
+                }
+ next_factor:
+                if (factor >= max_factor)
+                        break;
+                factor += 2;
+                /* Rudimentary wheel sieving: skip multiples of 3, 5 and 7:
+                 * Every third odd number is divisible by three and thus isn't a prime:
+                 * 5 7 9 11 13 15 17 19 21 23 25 27 29 31 33 35 37 39 41 43 45 47...
+                 * ^ ^   ^  ^     ^  ^     ^  _     ^  ^     _  ^     ^  ^     ^
+                 * (^ = primes, _ = would-be-primes-if-not-divisible-by-5)
+                 * The numbers with space under them are excluded by sieve 3.
+                 */
+                // count7--;
+                // count5--;
+                // count3--;
+                // if (count3 && count5 && count7)
+                //      continue;
+                sieve_word += INCREMENT_EACH;
+                if (!(sieve_word & MULTIPLE_DETECTED))
+                        continue;
+                /*
+                 * "factor" is multiple of 3 33% of the time (count3 reached 0),
+                 * else, multiple of 5 13% of the time,
+                 * else, multiple of 7 7.6% of the time.
+                 * Cumulatively, with 3,5,7 sieving we are here 54.3% of the time.
+                 */
+                // if (count3 == 0)
+                //      count3 = 3;
+                if (sieve_word & MULTIPLE_OF_3)
+                        sieve_word -= SHIFT_3 * 3;
+                // if (count5 == 0)
+                //      count5 = 5;
+                if (sieve_word & MULTIPLE_OF_5)
+                        sieve_word -= SHIFT_5 * 5;
+                // if (count7 == 0)
+                //      count7 = 7;
+                if (sieve_word & MULTIPLE_OF_7)
+                        sieve_word -= SHIFT_7 * 7;
+                goto next_factor;
+        }
+ end:
+        if (N > 1)
+                printf(" %llu", N);
+        bb_putchar('\n');
+}
+static void factorize_numstr(const char *numstr)
+{
+        wide_t N;
+        /* Leading + is ok (coreutils compat) */
+        if (*numstr == '+')
+                numstr++;
+        N = bb_strtoull(numstr, NULL, 10);
+        if (errno)
+                bb_show_usage();
+        printf("%llu:", N);
+        factorize(N);
+}
+int factor_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int factor_main(int argc UNUSED_PARAM, char **argv)
+{
+        //// coreutils has undocumented option ---debug (three dashes)
+        //getopt32(argv, "");
+        //argv += optind;
+        argv++;
+        if (!*argv) {
+                /* Read from stdin, several numbers per line are accepted */
+                for (;;) {
+                        char *numstr, *line;
+                        line = xmalloc_fgetline(stdin);
+                        if (!line)
+                                return EXIT_SUCCESS;
+                        numstr = line;
+                        for (;;) {
+                                char *end;
+                                numstr = skip_whitespace(numstr);
+                                if (!numstr[0])
+                                        break;
+                                end = skip_non_whitespace(numstr);
+                                if (*end != '\0')
+                                        *end++ = '\0';
+                                factorize_numstr(numstr);
+                                numstr = end;
+                        }
+                        free(line);
+                }
+        }
+        do {
+                /* Leading spaces are ok (coreutils compat) */
+                factorize_numstr(skip_whitespace(*argv));
+        } while (*++argv);
+        return EXIT_SUCCESS;
+}
diff --git a/coreutils/ls.c b/coreutils/ls.c
index 6e0a52d75..6780057da 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -1067,17 +1067,19 @@ int ls_main(int argc UNUSED_PARAM, char **argv)
         * 'auto', 'tty', 'if-tty'
         * (and substrings: "--color=alwa" work too)
         */
-        static const char ls_longopts[] ALIGN1 =
-                "full-time\0" No_argument "\xff"
-                "group-directories-first\0" No_argument "\xfe"
-                "color\0" Optional_argument "\xfd"
-        ;
        static const char color_str[] ALIGN1 =
                "always\0""yes\0""force\0"
                "auto\0""tty\0""if-tty\0";
        /* need to initialize since --color has _an optional_ argument */
        const char *color_opt = color_str; /* "always" */
 #endif
+#if ENABLE_LONG_OPTS
+        static const char ls_longopts[] ALIGN1 =
+                "full-time\0" No_argument "\xff"
+                "group-directories-first\0" No_argument "\xfe"
+                "color\0" Optional_argument "\xfd"
+        ;
+#endif
        INIT_G();
@@ -1091,7 +1093,7 @@ int ls_main(int argc UNUSED_PARAM, char **argv)
 #endif
        /* process options */
-        IF_FEATURE_LS_COLOR(applet_long_options = ls_longopts;)
+        IF_LONG_OPTS(applet_long_options = ls_longopts;)
        opt_complementary =
                /* -n and -g imply -l */
                "nl:gl"
diff --git a/debianutils/mktemp.c b/coreutils/mktemp.c
index 65353697a..65353697a 100644
--- a/debianutils/mktemp.c
+++ b/coreutils/mktemp.c
diff --git a/coreutils/nl.c b/coreutils/nl.c
new file mode 100644
index 000000000..5c64923bb
--- /dev/null
+++ b/coreutils/nl.c
@@ -0,0 +1,101 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Copyright (C) 2017 Denys Vlasenko <vda.linux@googlemail.com>
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
+ */
+//config:config NL
+//config:       bool "nl"
+//config:       default y
+//config:       help
+//config:         nl is used to number lines of files.
+//applet:IF_NL(APPLET(nl, BB_DIR_USR_BIN, BB_SUID_DROP))
+//kbuild:lib-$(CONFIG_NL) += nl.o
+//usage:#define nl_trivial_usage
+//usage:       "[OPTIONS] [FILE]..."
+//usage:#define nl_full_usage "\n\n"
+//usage:       "Write FILEs to standard output with line numbers added\n"
+//usage:     "\n        -b STYLE        Which lines to number - a: all, t: nonempty, n: none"
+//^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^TODO: support "pBRE": number only lines thatmatch regexp BRE"
+////usage:     "\n      -f STYLE        footer lines"
+////usage:     "\n      -h STYLE        header lines"
+////usage:     "\n      -d CC           use CC for separating logical pages"
+//usage:     "\n        -i N            Line number increment"
+////usage:     "\n      -l NUMBER       group of NUMBER empty lines counted as one"
+////usage:     "\n      -n FORMAT       lneft justified, no leading zeros; rn or rz"
+////usage:     "\n      -p              do not reset line numbers at logical pages (huh?)"
+//usage:     "\n        -s STRING       Use STRING as line number separator"
+//usage:     "\n        -v N            Start from N"
+//usage:     "\n        -w N            Width of line numbers"
+/* By default, selects -v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn */
+#include "libbb.h"
+void FAST_FUNC print_numbered_lines(struct number_state *ns, const char *filename)
+{
+        FILE *fp = fopen_or_warn_stdin(filename);
+        unsigned N = ns->start;
+        char *line;
+        while ((line = xmalloc_fgetline(fp)) != NULL) {
+                if (ns->all
+                 || (ns->nonempty && line[0])
+                ) {
+                        printf("%*u%s%s\n", ns->width, N, ns->sep, line);
+                        N += ns->inc;
+                } else if (ns->empty_str)
+                        fputs(ns->empty_str, stdout);
+                free(line);
+        }
+        fclose(fp);
+}
+int nl_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int nl_main(int argc UNUSED_PARAM, char **argv)
+{
+        struct number_state ns;
+        const char *opt_b = "t";
+        enum {
+                OPT_p = (1 << 0),
+        };
+#if ENABLE_LONG_OPTS
+        static const char nl_longopts[] ALIGN1 =
+                "body-numbering\0"      Required_argument "b"
+        //      "footer-numbering\0"    Required_argument "f" - not implemented yet
+        //      "header-numbering\0"    Required_argument "h" - not implemented yet
+        //      "section-delimiter\0"   Required_argument "d" - not implemented yet
+                "line-increment\0"      Required_argument "i"
+        //      "join-blank-lines\0"    Required_argument "l" - not implemented yet
+        //      "number-format\0"       Required_argument "n" - not implemented yet
+                "no-renumber\0"         No_argument       "p" // no-op so far
+                "number-separator\0"    Required_argument "s"
+                "starting-line-number\0"Required_argument "v"
+                "number-width\0"        Required_argument "w"
+        ;
+        applet_long_options = nl_longopts;
+#endif
+        ns.width = 6;
+        ns.start = 1;
+        ns.inc = 1;
+        ns.sep = "\t";
+        getopt32(argv, "pw:+s:v:+i:+b:", &ns.width, &ns.sep, &ns.start, &ns.inc, &opt_b);
+        ns.all = (opt_b[0] == 'a');
+        ns.nonempty = (opt_b[0] == 't');
+        ns.empty_str = xasprintf("%*s\n", ns.width + (int)strlen(ns.sep), "");
+        argv += optind;
+        if (!*argv)
+                *--argv = (char*)"-";
+        do {
+                print_numbered_lines(&ns, *argv);
+        } while (*++argv);
+        fflush_stdout_and_exit(EXIT_SUCCESS);
+}
diff --git a/coreutils/nproc.c b/coreutils/nproc.c
new file mode 100644
index 000000000..d7c6a4ba1
--- /dev/null
+++ b/coreutils/nproc.c
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2017 Denys Vlasenko <vda.linux@googlemail.com>
+ *
+ * Licensed under GPLv2, see LICENSE in this source tree
+ */
+//config:config NPROC
+//config:       bool "nproc"
+//config:       default y
+//config:       help
+//config:         Print number of CPUs
+//applet:IF_NPROC(APPLET(nproc, BB_DIR_USR_BIN, BB_SUID_DROP))
+//kbuild:lib-$(CONFIG_NPROC) += nproc.o
+//usage:#define nproc_trivial_usage
+//usage:        ""
+//TODO: "[--all] [--ignore=N]"
+//usage:#define nproc_full_usage "\n\n"
+//usage:        "Print number of CPUs"
+#include <sched.h>
+#include "libbb.h"
+int nproc_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int nproc_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
+{
+        unsigned long mask[1024];
+        unsigned i, count = 0;
+        //applet_long_options = ...;
+        //getopt32(argv, "");
+        //if --all, count /sys/devices/system/cpu/cpuN dirs, else:
+        if (sched_getaffinity(0, sizeof(mask), (void*)mask) == 0) {
+                for (i = 0; i < ARRAY_SIZE(mask); i++) {
+                        unsigned long m = mask[i];
+                        while (m) {
+                                if (m & 1)
+                                        count++;
+                                m >>= 1;
+                        }
+                }
+        }
+        if (count == 0)
+                count++;
+        printf("%u\n", count);
+        return 0;
+}
diff --git a/coreutils/paste.c b/coreutils/paste.c
new file mode 100644
index 000000000..3920859d6
--- /dev/null
+++ b/coreutils/paste.c
@@ -0,0 +1,140 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * paste.c - implementation of the posix paste command
+ *
+ * Written by Maxime Coste <mawww@kakoune.org>
+ *
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
+ */
+//config:config PASTE
+//config:       bool "paste"
+//config:       default y
+//config:       help
+//config:         paste is used to paste lines of different files together
+//config:         and write the result to stdout
+//applet:IF_PASTE(APPLET_NOEXEC(paste, paste, BB_DIR_USR_BIN, BB_SUID_DROP, paste))
+//kbuild:lib-$(CONFIG_PASTE) += paste.o
+//usage:#define paste_trivial_usage
+//usage:       "[OPTIONS] [FILE]..."
+//usage:#define paste_full_usage "\n\n"
+//usage:       "Paste lines from each input file, separated with tab\n"
+//usage:     "\n        -d LIST Use delimiters from LIST, not tab"
+//usage:     "\n        -s      Serial: one file at a time"
+//usage:
+//usage:#define paste_example_usage
+//usage:       "# write out directory in four columns\n"
+//usage:       "$ ls | paste - - - -\n"
+//usage:       "# combine pairs of lines from a file into single lines\n"
+//usage:       "$ paste -s -d '\\t\\n' file\n"
+#include "libbb.h"
+static void paste_files(FILE** files, int file_cnt, char* delims, int del_cnt)
+{
+        char *line;
+        char delim;
+        int active_files = file_cnt;
+        int i;
+        while (active_files > 0) {
+                int del_idx = 0;
+                for (i = 0; i < file_cnt; ++i) {
+                        if (files[i] == NULL)
+                                continue;
+                        line = xmalloc_fgetline(files[i]);
+                        if (!line) {
+                                fclose_if_not_stdin(files[i]);
+                                files[i] = NULL;
+                                --active_files;
+                                continue;
+                        }
+                        fputs(line, stdout);
+                        free(line);
+                        delim = '\n';
+                        if (i != file_cnt - 1) {
+                                delim = delims[del_idx++];
+                                if (del_idx == del_cnt)
+                                        del_idx = 0;
+                        }
+                        if (delim != '\0')
+                                fputc(delim, stdout);
+                }
+        }
+}
+static void paste_files_separate(FILE** files, char* delims, int del_cnt)
+{
+        char *line, *next_line;
+        char delim;
+        int i;
+        for (i = 0; files[i]; ++i) {
+                int del_idx = 0;
+                line = NULL;
+                while ((next_line = xmalloc_fgetline(files[i])) != NULL) {
+                        if (line) {
+                                fputs(line, stdout);
+                                free(line);
+                                delim = delims[del_idx++];
+                                if (del_idx == del_cnt)
+                                        del_idx = 0;
+                                if (delim != '\0')
+                                        fputc(delim, stdout);
+                        }
+                        line = next_line;
+                }
+                if (line) {
+                        /* coreutils adds \n even if this is a final line
+                         * of the last file and it was not \n-terminated.
+                         */
+                        printf("%s\n", line);
+                        free(line);
+                }
+                fclose_if_not_stdin(files[i]);
+        }
+}
+#define PASTE_OPT_DELIMITERS (1 << 0)
+#define PASTE_OPT_SEPARATE   (1 << 1)
+int paste_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int paste_main(int argc UNUSED_PARAM, char **argv)
+{
+        char *delims = (char*)"\t";
+        int del_cnt = 1;
+        unsigned opt;
+        int i;
+        opt = getopt32(argv, "d:s", &delims);
+        argv += optind;
+        if (opt & PASTE_OPT_DELIMITERS) {
+                if (!delims[0])
+                        bb_error_msg_and_die("-d '' is not supported");
+                /* unknown mappings are not changed: "\z" -> '\\' 'z' */
+                /* trailing backslash, if any, is preserved */
+                del_cnt = strcpy_and_process_escape_sequences(delims, delims) - delims;
+                /* note: handle NUL properly (do not stop at it!): try -d'\t\0\t' */
+        }
+        if (!argv[0])
+                (--argv)[0] = (char*) "-";
+        for (i = 0; argv[i]; ++i) {
+                argv[i] = (void*) fopen_or_warn_stdin(argv[i]);
+                if (!argv[i])
+                        xfunc_die();
+        }
+        if (opt & PASTE_OPT_SEPARATE)
+                paste_files_separate((FILE**)argv, delims, del_cnt);
+        else
+                paste_files((FILE**)argv, i, delims, del_cnt);
+        fflush_stdout_and_exit(0);
+}
diff --git a/coreutils/shred.c b/coreutils/shred.c
new file mode 100644
index 000000000..b3c009539
--- /dev/null
+++ b/coreutils/shred.c
@@ -0,0 +1,106 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Copyright (C) 2017 Denys Vlasenko <vda.linux@googlemail.com>
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
+ */
+//config:config SHRED
+//config:       bool "shred"
+//config:       default y
+//config:       help
+//config:         Overwrite a file to hide its contents, and optionally delete it
+//applet:IF_SHRED(APPLET(shred, BB_DIR_USR_BIN, BB_SUID_DROP))
+//kbuild:lib-$(CONFIG_SHRED) += shred.o
+//usage:#define shred_trivial_usage
+//usage:       "FILE..."
+//usage:#define shred_full_usage "\n\n"
+//usage:       "Overwrite/delete FILEs\n"
+//usage:     "\n        -f      Chmod to ensure writability"
+//usage:     "\n        -n N    Overwrite N times (default 3)"
+//usage:     "\n        -z      Final overwrite with zeros"
+//usage:     "\n        -u      Remove file"
+//-x and -v are accepted but have no effect
+/* shred (GNU coreutils) 8.25:
+-f, --force             change permissions to allow writing if necessary
+-u                      truncate and remove file after overwriting
+-z, --zero              add a final overwrite with zeros to hide shredding
+-n, --iterations=N      overwrite N times instead of the default (3)
+-v, --verbose           show progress
+-x, --exact             do not round file sizes up to the next full block; this is the default for non-regular files
+--random-source=FILE    get random bytes from FILE
+-s, --size=N            shred this many bytes (suffixes like K, M, G accepted)
+--remove[=HOW]          like -u but give control on HOW to delete;  See below
+*/
+#include "libbb.h"
+int shred_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int shred_main(int argc UNUSED_PARAM, char **argv)
+{
+        int rand_fd = rand_fd; /* for compiler */
+        int zero_fd;
+        unsigned num_iter = 3;
+        unsigned opt;
+        enum {
+                OPT_f = (1 << 0),
+                OPT_u = (1 << 1),
+                OPT_z = (1 << 2),
+                OPT_n = (1 << 3),
+                OPT_v = (1 << 4),
+                OPT_x = (1 << 5),
+        };
+        opt = getopt32(argv, "fuzn:+vx", &num_iter);
+        argv += optind;
+        zero_fd = xopen("/dev/zero", O_RDONLY);
+        if (num_iter != 0)
+                rand_fd = xopen("/dev/urandom", O_RDONLY);
+        if (!*argv)
+                bb_show_usage();
+        for (;;) {
+                struct stat sb;
+                const char *fname;
+                unsigned i;
+                int fd;
+                fname = *argv++;
+                if (!fname)
+                        break;
+                fd = -1;
+                if (opt & OPT_f) {
+                        fd = open(fname, O_WRONLY);
+                        if (fd < 0)
+                                chmod(fname, 0666);
+                }
+                if (fd < 0)
+                        fd = xopen(fname, O_WRONLY);
+                if (fstat(fd, &sb) == 0 && sb.st_size > 0) {
+                        off_t size = sb.st_size;
+                        for (i = 0; i < num_iter; i++) {
+                                bb_copyfd_size(rand_fd, fd, size);
+                                fdatasync(fd);
+                                xlseek(fd, 0, SEEK_SET);
+                        }
+                        if (opt & OPT_z) {
+                                bb_copyfd_size(zero_fd, fd, size);
+                                fdatasync(fd);
+                        }
+                        if (opt & OPT_u) {
+                                ftruncate(fd, 0);
+                                xunlink(fname);
+                        }
+                        xclose(fd);
+                }
+        }
+        return EXIT_SUCCESS;
+}
diff --git a/miscutils/timeout.c b/coreutils/timeout.c
index f29dc8a9c..f29dc8a9c 100644
--- a/miscutils/timeout.c
+++ b/coreutils/timeout.c
diff --git a/coreutils/uniq.c b/coreutils/uniq.c
index be550b5cd..2b62ad3ae 100644
--- a/coreutils/uniq.c
+++ b/coreutils/uniq.c
@@ -26,6 +26,7 @@
 //usage:     "\n        -c      Prefix lines by the number of occurrences"
 //usage:     "\n        -d      Only print duplicate lines"
 //usage:     "\n        -u      Only print unique lines"
+//usage:     "\n        -i      Ignore case"
 //usage:     "\n        -f N    Skip first N fields"
 //usage:     "\n        -s N    Skip first N chars (after any skipped fields)"
 //usage:     "\n        -w N    Compare N characters in line"
@@ -54,12 +55,13 @@ int uniq_main(int argc UNUSED_PARAM, char **argv)
                OPT_f = 0x8,
                OPT_s = 0x10,
                OPT_w = 0x20,
+                OPT_i = 0x40,
        };
        skip_fields = skip_chars = 0;
        max_chars = INT_MAX;
-        opt = getopt32(argv, "cduf:+s:+w:+", &skip_fields, &skip_chars, &max_chars);
+        opt = getopt32(argv, "cduf:+s:+w:+i", &skip_fields, &skip_chars, &max_chars);
        argv += optind;
        input_filename = argv[0];
@@ -106,7 +108,12 @@ int uniq_main(int argc UNUSED_PARAM, char **argv)
                                ++cur_compare;
                        }
-                        if (!old_line || strncmp(old_compare, cur_compare, max_chars)) {
+                        if (!old_line)
+                                break;
+                        if ((opt & OPT_i)
+                                ? strncasecmp(old_compare, cur_compare, max_chars)
+                                : strncmp(old_compare, cur_compare, max_chars)
+                        ) {
                                break;
                        }
diff --git a/coreutils/who.c b/coreutils/who.c
index e6179bb00..4adead77e 100644
--- a/coreutils/who.c
+++ b/coreutils/who.c
@@ -23,6 +23,14 @@
 //config:      help
 //config:        who is used to show who is logged on.
 //config:
+// procps-ng has this variation of "who":
+//config:config W
+//config:      bool "w"
+//config:      default y
+//config:      depends on FEATURE_UTMP
+//config:      help
+//config:        w is used to show who is logged on.
+//config:
 //config:config USERS
 //config:      bool "users"
 //config:      default y
@@ -32,10 +40,12 @@
 //                APPLET_ODDNAME:name   main location        suid_type     help
 //applet:IF_USERS(APPLET_ODDNAME(users, who, BB_DIR_USR_BIN, BB_SUID_DROP, users))
-//applet:IF_WHO(APPLET(who, BB_DIR_USR_BIN, BB_SUID_DROP))
+//applet:IF_W(    APPLET_ODDNAME(w,     who, BB_DIR_USR_BIN, BB_SUID_DROP, w))
+//applet:IF_WHO(  APPLET(        who,        BB_DIR_USR_BIN, BB_SUID_DROP))
 //kbuild:lib-$(CONFIG_USERS) += who.o
-//kbuild:lib-$(CONFIG_WHO) += who.o
+//kbuild:lib-$(CONFIG_W)     += who.o
+//kbuild:lib-$(CONFIG_WHO)   += who.o
 /* BB_AUDIT SUSv3 _NOT_ compliant -- missing options -b, -d, -l, -m, -p, -q, -r, -s, -t, -T, -u; Missing argument 'file'.  */
@@ -44,6 +54,31 @@
 //usage:#define users_full_usage "\n\n"
 //usage:       "Print the users currently logged on"
+//usage:#define w_trivial_usage
+//usage:       ""
+//usage:#define w_full_usage "\n\n"
+//usage:       "Show who is logged on"
+//
+// procps-ng 3.3.10:
+//           "\n        -h, --no-header"
+//           "\n        -u, --no-current"
+//      Ignores the username while figuring out the current process
+//      and cpu times.  To demonstrate this, do a "su" and do a "w" and a "w -u".
+//           "\n        -s, --short"
+//      Short format.  Don't print the login time, JCPU or PCPU times.
+//           "\n        -f, --from"
+//      Toggle printing the from (remote hostname) field.
+//      The default is for the from field to not be printed
+//           "\n        -i, --ip-addr"
+//      Display IP address instead of hostname for from field.
+//           "\n        -o, --old-style"
+//      Old style output. Prints blank space for idle times less than one minute.
+// Example output:
+//  17:28:00 up 4 days, 22:41,  4 users,  load average: 0.84, 0.97, 0.90
+// USER     TTY        LOGIN@   IDLE   JCPU   PCPU WHAT
+// root     tty1      Thu18    4days  4:33m  0.07s /bin/sh /etc/xdg/xfce4/xinitrc -- vt
+// root     pts/1     Mon13    3:24m  1:01   0.01s w
 //usage:#define who_trivial_usage
 //usage:       "[-a]"
 //usage:#define who_full_usage "\n\n"
@@ -74,14 +109,17 @@ static void idle_string(char *str6, time_t t)
 int who_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int who_main(int argc UNUSED_PARAM, char **argv)
 {
+#define CNT_APPLET (ENABLE_USERS + ENABLE_W + ENABLE_WHO)
+        int do_users = (ENABLE_USERS && (CNT_APPLET == 1 || applet_name[0] == 'u'));
+        int do_w     = (ENABLE_W     && (CNT_APPLET == 1 || applet_name[1] == '\0'));
+        int do_who   = (ENABLE_WHO   && (CNT_APPLET == 1 || applet_name[1] == 'h'));
        struct utmpx *ut;
        unsigned opt;
-        int do_users = (ENABLE_USERS && (!ENABLE_WHO || applet_name[0] == 'u'));
        const char *fmt = "%s";
        opt_complementary = "=0";
-        opt = getopt32(argv, do_users ? "" : "aH");
+        opt = getopt32(argv, do_who ? "aH" : "");
-        if (opt & 2) // -H
+        if ((opt & 2) || do_w) /* -H or we are w */
                puts("USER\t\tTTY\t\tIDLE\tTIME\t\t HOST");
        setutxent();
@@ -115,6 +153,9 @@ int who_main(int argc UNUSED_PARAM, char **argv)
                                                (int)sizeof(ut->ut_user), ut->ut_user,
                                                (int)sizeof(ut->ut_line), ut->ut_line,
                                                str6,
+// TODO: with LANG=en_US.UTF-8, who from coreutils 8.25 shows
+// TIME col as "2017-04-06 18:47" (the default format is "Apr  6 18:47").
+// The former format looks saner to me. Switch to it unconditionally?
                                                ctime(&seconds) + 4,
                                                (int)sizeof(ut->ut_host), ut->ut_host
                                );
diff --git a/docs/posix_conformance.txt b/docs/posix_conformance.txt
index c0582dc23..8b9112020 100644
--- a/docs/posix_conformance.txt
+++ b/docs/posix_conformance.txt
@@ -22,7 +22,7 @@ POSIX Tools supported only as shell built-ins (ash shell):
 POSIX Tools not supported:
  asa, at, batch, bc, c99, command, compress, csplit, ex, fc, file,
  gencat, getconf, iconv, join, link, locale, localedef, lp, m4,
-  mailx, newgrp, nl, paste, pathchk, pax, pr, qalter, qdel, qhold, qmove,
+  mailx, newgrp, nl, pathchk, pax, pr, qalter, qdel, qhold, qmove,
  qmsg, qrerun, qrls, qselect, qsig, qstat, qsub, tabs, talk, tput,
  tsort, unlink, uucp, uustat, uux
@@ -469,6 +469,12 @@ od POSIX options
  -x              |  no    | no        |
 od Busybox specific options: None
+paste POSIX options
+ option           | exists | compliant | remarks
+  -d list         |  yes   | yes       |
+  -s              |  yes   | yes       |
+paste Busybox specific options: None
 patch POSIX options
 option           | exists | compliant | remarks
  -D define       |  no    | no        |
diff --git a/docs/sigint.htm b/docs/sigint.htm
index e230f4df7..d656aeb8c 100644
--- a/docs/sigint.htm
+++ b/docs/sigint.htm
@@ -45,7 +45,7 @@ intention.
 </td></tr><tr><th valign=top align=left>Required knowledge: </th>
 <td valign=top align=left>You have to know what it means to catch SIGINT or SIGQUIT and how
-processes are waiting for other processes (childs) they spawned.
+processes are waiting for other processes (children) they spawned.
 </td></tr></table>
@@ -366,7 +366,7 @@ signal, it has to take care of communicating the signal status
 itself.
 <p>Some programs don't do this. On SIGINT, they do cleanup and exit
-immediatly, but the calling shell isn't told about the non-normal exit
+immediately, but the calling shell isn't told about the non-normal exit
 and it will call the next program in the script.
 <p>As a result, the user hits SIGINT and while one program exits, the
@@ -446,7 +446,7 @@ handlers, so it is portable.
 <code>trap</code> command. Here, the same as for C programs apply.  If
 the intention of SIGINT is to end your program, you have to exit in a
 way that the calling programs "sees" that you have been killed.  If
-you don't catch SIGINT, this happend automatically, but of you catch
+you don't catch SIGINT, this happened automatically, but of you catch
 SIGINT, i.e. to do cleanup work, you have to end the program by
 killing yourself, not by calling exit.
@@ -466,7 +466,7 @@ files (which isn't really portable in C, though).
 bourne shell. Every language implementation that lets you catch SIGINT
 should also give you the option to reset the signal and kill yourself.
-<P>It is always desireable to exit the right way, even if you don't
+<P>It is always desirable to exit the right way, even if you don't
 expect your usual callers to depend on it, some unusual one will come
 along. This proper exit status will be needed for WCE and will not
 hurt when the calling shell uses IUE or WUE.
@@ -565,7 +565,7 @@ comments the scripts echo.
 <th>What happens when a shellscript called emacs, the user did not use
 <code>C-c</code> and the script has additional commands in it?</th>
 <th>What happens if a non-interactive child catches SIGINT?</th>
-<th>To behave properly, childs must do what?</th>
+<th>To behave properly, children must do what?</th>
 </tr>
 <tr valign=top align=left>
diff --git a/docs/style-guide.txt b/docs/style-guide.txt
index 10ed893dc..9eed7f125 100644
--- a/docs/style-guide.txt
+++ b/docs/style-guide.txt
@@ -329,7 +329,7 @@ With "const int" compiler may fail to optimize it out and will reserve
 a real storage in rodata for it! (Hopefully, newer gcc will get better
 at it...).  With "define", you have slight risk of polluting namespace
 (#define doesn't allow you to redefine the name in the inner scopes),
-and complex "define" are evaluated each time they uesd, not once
+and complex "define" are evaluated each time they used, not once
 at declarations like enums. Also, the preprocessor does _no_ type checking
 whatsoever, making it much more error prone.
diff --git a/editors/diff.c b/editors/diff.c
index f2eeb8257..975bc4603 100644
--- a/editors/diff.c
+++ b/editors/diff.c
@@ -295,17 +295,6 @@ static int search(const int *c, int k, int y, const struct cand *list)
        }
 }
-static unsigned isqrt(unsigned n)
-{
-        unsigned x = 1;
-        while (1) {
-                const unsigned y = x;
-                x = ((n / x) + x) >> 1;
-                if (x <= (y + 1) && x >= (y - 1))
-                        return x;
-        }
-}
 static void stone(const int *a, int n, const int *b, int *J, int pref)
 {
        const unsigned isq = isqrt(n);
@@ -730,9 +719,19 @@ static int diffreg(char *file[2])
        fp[0] = stdin;
        fp[1] = stdin;
        for (i = 0; i < 2; i++) {
-                int fd = open_or_warn_stdin(file[i]);
+                int fd = STDIN_FILENO;
-                if (fd == -1)
+                if (!LONE_DASH(file[i])) {
-                        goto out;
+                        if (!(option_mask32 & FLAG(N))) {
+                                fd = open_or_warn(file[i], O_RDONLY);
+                                if (fd == -1)
+                                        goto out;
+                        } else {
+                                /* -N: if some file does not exist compare it like empty */
+                                fd = open(file[i], O_RDONLY);
+                                if (fd == -1)
+                                        fd = xopen("/dev/null", O_RDONLY);
+                        }
+                }
                /* Our diff implementation is using seek.
                 * When we meet non-seekable file, we must make a temp copy.
                 */
@@ -1010,17 +1009,23 @@ int diff_main(int argc UNUSED_PARAM, char **argv)
        argv += optind;
        while (L_arg)
                label[!!label[0]] = llist_pop(&L_arg);
+        /* Compat: "diff file name_which_doesnt_exist" exits with 2 */
        xfunc_error_retval = 2;
        for (i = 0; i < 2; i++) {
                file[i] = argv[i];
-                /* Compat: "diff file name_which_doesnt_exist" exits with 2 */
                if (LONE_DASH(file[i])) {
                        fstat(STDIN_FILENO, &stb[i]);
                        gotstdin++;
-                } else
+                } else if (option_mask32 & FLAG(N)) {
+                        if (stat(file[i], &stb[i]))
+                                xstat("/dev/null", &stb[i]);
+                } else {
                        xstat(file[i], &stb[i]);
+                }
        }
        xfunc_error_retval = 1;
        if (gotstdin && (S_ISDIR(stb[0].st_mode) || S_ISDIR(stb[1].st_mode)))
                bb_error_msg_and_die("can't compare stdin to a directory");
diff --git a/editors/sed.c b/editors/sed.c
index 86230ea42..b2c7ba829 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -337,7 +337,7 @@ static int get_address(const char *my_str, int *linenum, regex_t ** regex)
        if (isdigit(*my_str)) {
                *linenum = strtol(my_str, (char**)&pos, 10);
-                /* endstr shouldnt ever equal NULL */
+                /* endstr shouldn't ever equal NULL */
        } else if (*my_str == '$') {
                *linenum = -1;
                pos++;
@@ -444,7 +444,7 @@ static int parse_subst_cmd(sed_cmd_t *sed_cmd, const char *substr)
                        free(fname);
                        break;
                }
-                /* Ignore case (gnu exension) */
+                /* Ignore case (gnu extension) */
                case 'i':
                case 'I':
                        cflags |= REG_ICASE;
@@ -587,7 +587,7 @@ static const char *parse_cmd_args(sed_cmd_t *sed_cmd, const char *cmdstr)
                free(match);
                free(replace);
        }
-        /* if it wasnt a single-letter command that takes no arguments
+        /* if it wasn't a single-letter command that takes no arguments
         * then it must be an invalid command.
         */
        else if (idx >= IDX_nul) { /* not d,D,g,G,h,H,l,n,N,p,P,q,x,=,{,} */
@@ -751,7 +751,7 @@ static void do_subst_w_backrefs(char *line, char *replace)
                                continue;
                        }
                        /* I _think_ it is impossible to get '\' to be
-                         * the last char in replace string. Thus we dont check
+                         * the last char in replace string. Thus we don't check
                         * for replace[i] == NUL. (counterexample anyone?) */
                        /* if we find a backslash escaped character, print the character */
                        pipe_putc(replace[i]);
diff --git a/editors/vi.c b/editors/vi.c
index e5ca3adfa..900b41cb5 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -715,14 +715,6 @@ static int init_text_buffer(char *fn)
 {
        int rc;
-        flush_undo_data();
-        modified_count = 0;
-        last_modified_count = -1;
-#if ENABLE_FEATURE_VI_YANKMARK
-        /* init the marks */
-        memset(mark, 0, sizeof(mark));
-#endif
        /* allocate/reallocate text buffer */
        free(text);
        text_size = 10240;
@@ -737,6 +729,14 @@ static int init_text_buffer(char *fn)
                // file doesnt exist. Start empty buf with dummy line
                char_insert(text, '\n', NO_UNDO);
        }
+        flush_undo_data();
+        modified_count = 0;
+        last_modified_count = -1;
+#if ENABLE_FEATURE_VI_YANKMARK
+        /* init the marks */
+        memset(mark, 0, sizeof(mark));
+#endif
        return rc;
 }
@@ -1034,7 +1034,9 @@ static void colon(char *buf)
         || strncmp(p, "wn", cnt) == 0
         || (p[0] == 'x' && !p[1])
        ) {
-                cnt = file_write(current_filename, text, end - 1);
+                if (modified_count != 0 || p[0] != 'x') {
+                        cnt = file_write(current_filename, text, end - 1);
+                }
                if (cnt < 0) {
                        if (cnt == -1)
                                status_line_bold("Write error: %s", strerror(errno));
@@ -1045,8 +1047,9 @@ static void colon(char *buf)
                                current_filename,
                                count_lines(text, end - 1), cnt
                        );
-                        if (p[0] == 'x' || p[1] == 'q' || p[1] == 'n'
+                        if (p[0] == 'x'
-                         || p[0] == 'X' || p[1] == 'Q' || p[1] == 'N'
+                         || p[1] == 'q' || p[1] == 'n'
+                         || p[1] == 'Q' || p[1] == 'N'
                        ) {
                                editing = 0;
                        }
@@ -1476,16 +1479,19 @@ static void colon(char *buf)
                        goto ret;
                }
 #endif
-                // how many lines in text[]?
-                li = count_lines(q, r);
-                size = r - q + 1;
                //if (useforce) {
                        // if "fn" is not write-able, chmod u+w
                        // sprintf(syscmd, "chmod u+w %s", fn);
                        // system(syscmd);
                        // forced = TRUE;
                //}
-                l = file_write(fn, q, r);
+                if (modified_count != 0 || cmd[0] != 'x') {
+                        size = r - q + 1;
+                        l = file_write(fn, q, r);
+                } else {
+                        size = 0;
+                        l = 0;
+                }
                //if (useforce && forced) {
                        // chmod u-w
                        // sprintf(syscmd, "chmod u-w %s", fn);
@@ -1496,17 +1502,20 @@ static void colon(char *buf)
                        if (l == -1)
                                status_line_bold_errno(fn);
                } else {
+                        // how many lines written
+                        li = count_lines(q, q + l - 1);
                        status_line("'%s' %dL, %dC", fn, li, l);
-                        if (q == text && r == end - 1 && l == size) {
+                        if (l == size) {
-                                modified_count = 0;
+                                if (q == text && q + l == end) {
-                                last_modified_count = -1;
+                                        modified_count = 0;
-                        }
+                                        last_modified_count = -1;
-                        if ((cmd[0] == 'x' || cmd[1] == 'q' || cmd[1] == 'n'
+                                }
-                            || cmd[0] == 'X' || cmd[1] == 'Q' || cmd[1] == 'N'
+                                if (cmd[0] == 'x'
-                            )
+                                 || cmd[1] == 'q' || cmd[1] == 'n'
-                         && l == size
+                                 || cmd[1] == 'Q' || cmd[1] == 'N'
-                        ) {
+                                ) {
-                                editing = 0;
+                                        editing = 0;
+                                }
                        }
                }
 #if ENABLE_FEATURE_VI_YANKMARK
@@ -2816,8 +2825,15 @@ static int readit(void) // read (maybe cursor) key from stdin
        int c;
        fflush_all();
-        c = read_key(STDIN_FILENO, readbuffer, /*timeout off:*/ -2);
+        // Wait for input. TIMEOUT = -1 makes read_key wait even
+        // on nonblocking stdin.
+        // Note: read_key sets errno to 0 on success.
+ again:
+        c = read_key(STDIN_FILENO, readbuffer, /*timeout:*/ -1);
        if (c == -1) { // EOF/error
+                if (errno == EAGAIN) // paranoia
+                        goto again;
                go_bottom_and_clear_to_eol();
                cookmode(); // terminal to "cooked"
                bb_error_msg_and_die("can't read user input");
diff --git a/examples/udhcp/sample.bound b/examples/udhcp/sample.bound
index 7c9d857e0..efd98cf15 100755
--- a/examples/udhcp/sample.bound
+++ b/examples/udhcp/sample.bound
@@ -18,11 +18,18 @@ then
        metric=0
        for i in $router
        do
+                if [ "$subnet" = "255.255.255.255" ]; then
+                        # special case for /32 subnets:
+                        # /32 instructs kernel to always use routing for all outgoing packets
+                        # (they can never be sent to local subnet - there is no local subnet for /32).
+                        # Used in datacenters, avoids the need for private ip-addresses between two hops.
+                        /sbin/ip route add $i dev $interface
+                fi
                /sbin/route add default gw $i dev $interface metric $((metric++))
        done
 fi
-# Only replace resolv.conf is we have at least one DNS server
+# Only replace resolv.conf if we have at least one DNS server
 if [ -n "$dns" ]
 then
        echo -n > $RESOLV_CONF
diff --git a/examples/udhcp/sample.renew b/examples/udhcp/sample.renew
index 4dce8486a..efd98cf15 100755
--- a/examples/udhcp/sample.renew
+++ b/examples/udhcp/sample.renew
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Sample udhcpc bound script
+# Sample udhcpc renew script
 RESOLV_CONF="/etc/udhcpc/resolv.conf"
@@ -18,11 +18,18 @@ then
        metric=0
        for i in $router
        do
+                if [ "$subnet" = "255.255.255.255" ]; then
+                        # special case for /32 subnets:
+                        # /32 instructs kernel to always use routing for all outgoing packets
+                        # (they can never be sent to local subnet - there is no local subnet for /32).
+                        # Used in datacenters, avoids the need for private ip-addresses between two hops.
+                        /sbin/ip route add $i dev $interface
+                fi
                /sbin/route add default gw $i dev $interface metric $((metric++))
        done
 fi
-# Only replace resolv.conf is we have at least one DNS server
+# Only replace resolv.conf if we have at least one DNS server
 if [ -n "$dns" ]
 then
        echo -n > $RESOLV_CONF
diff --git a/examples/udhcp/simple.script b/examples/udhcp/simple.script
index 2a917eb6c..e4c1f2d76 100755
--- a/examples/udhcp/simple.script
+++ b/examples/udhcp/simple.script
@@ -29,8 +29,14 @@ case "$1" in
                        metric=0
                        for i in $router ; do
                                echo "Adding router $i"
-                                route add default gw $i dev $interface metric $metric
+                                if [ "$subnet" = "255.255.255.255" ]; then
-                                : $(( metric += 1 ))
+        # special case for /32 subnets:
+        # /32 instructs kernel to always use routing for all outgoing packets
+        # (they can never be sent to local subnet - there is no local subnet for /32).
+        # Used in datacenters, avoids the need for private ip-addresses between two hops.
+                                        ip route add $i dev $interface
+                                fi
+                                route add default gw $i dev $interface metric $((metric++))
                        done
                fi
diff --git a/examples/var_service/dhcp_if/dhcp_handler b/examples/var_service/dhcp_if/dhcp_handler
index 3d2a5cb79..3d44a6022 100755
--- a/examples/var_service/dhcp_if/dhcp_handler
+++ b/examples/var_service/dhcp_if/dhcp_handler
@@ -21,7 +21,7 @@
 # ntpsrv=10.34.32.125 10.34.255.7
 #
 # renew: lease is renewed. Environment is similar to "bound".
-# The IP address does not change, however, the other DHCP paramaters,
+# The IP address does not change, however, the other DHCP parameters,
 # such as the default gateway, subnet mask, and dns server may change.
 #
 # nak: udhcpc received a NAK message.
diff --git a/findutils/find.c b/findutils/find.c
index 67aa40b21..0596c0059 100644
--- a/findutils/find.c
+++ b/findutils/find.c
@@ -182,7 +182,7 @@
 //config:       default y
 //config:       depends on FIND
 //config:       help
-//config:         If the file is a directory, dont descend into it. Useful for
+//config:         If the file is a directory, don't descend into it. Useful for
 //config:         exclusion .svn and CVS directories.
 //config:
 //config:config FEATURE_FIND_DELETE
diff --git a/findutils/grep.c b/findutils/grep.c
index 8b6e29874..b115d9a1d 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -39,7 +39,7 @@
 //config:config FEATURE_GREP_CONTEXT
 //config:       bool "Enable before and after context flags (-A, -B and -C)"
 //config:       default y
-//config:       depends on GREP || EGREP
+//config:       depends on GREP || EGREP || FGREP
 //config:       help
 //config:         Print the specified number of leading (-B) and/or trailing (-A)
 //config:         context surrounding our matching lines.
@@ -523,7 +523,7 @@ static int grep_file(FILE *file)
                                if (option_mask32 & OPT_o) {
                                        if (FGREP_FLAG) {
                                                /* -Fo just prints the pattern
-                                                 * (unless -v: -Fov doesnt print anything at all) */
+                                                 * (unless -v: -Fov doesn't print anything at all) */
                                                if (found)
                                                        print_line(gl->pattern, strlen(gl->pattern), linenum, ':');
                                        } else while (1) {
@@ -831,7 +831,7 @@ int grep_main(int argc UNUSED_PARAM, char **argv)
 grep_done: ;
        } while (*argv && *++argv);
-        /* destroy all the elments in the pattern list */
+        /* destroy all the elements in the pattern list */
        if (ENABLE_FEATURE_CLEAN_UP) {
                while (pattern_head) {
                        llist_t *pattern_head_ptr = pattern_head;
diff --git a/include/libbb.h b/include/libbb.h
index 1f5b211c1..9313a557a 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -353,6 +353,8 @@ extern int *const bb_errno;
 uint64_t bb_bswap_64(uint64_t x) FAST_FUNC;
 #endif
+unsigned long FAST_FUNC isqrt(unsigned long long N);
 unsigned long long monotonic_ns(void) FAST_FUNC;
 unsigned long long monotonic_us(void) FAST_FUNC;
 unsigned long long monotonic_ms(void) FAST_FUNC;
@@ -1193,6 +1195,26 @@ extern const char *applet_long_options;
 #endif
 extern uint32_t option_mask32;
 extern uint32_t getopt32(char **argv, const char *applet_opts, ...) FAST_FUNC;
+/* BSD-derived getopt() functions require that optind be set to 1 in
+ * order to reset getopt() state.  This used to be generally accepted
+ * way of resetting getopt().  However, glibc's getopt()
+ * has additional getopt() state beyond optind (specifically, glibc
+ * extensions such as '+' and '-' at the start of the string), and requires
+ * that optind be set to zero to reset its state.  BSD-derived versions
+ * of getopt() misbehaved if optind is set to 0 in order to reset getopt(),
+ * and glibc's getopt() used to coredump if optind is set 1 in order
+ * to reset getopt().
+ * Then BSD introduced additional variable "optreset" which should be
+ * set to 1 in order to reset getopt().  Sigh.  Standards, anyone?
+ *
+ * By ~2008, OpenBSD 3.4 was changed to survive glibc-like optind = 0
+ * (to interpret it as if optreset was set).
+ */
+#if defined(__GLIBC__) || ENABLE_PLATFORM_MINGW32
+#define GETOPT_RESET() (optind = 0)
+#else /* BSD style */
+#define GETOPT_RESET() (optind = 1)
+#endif
 /* Having next pointer as a first member allows easy creation
@@ -1264,7 +1286,7 @@ extern void bb_logenv_override(void) FAST_FUNC;
 /* Applets which are useful from another applets */
-int bb_cat(char** argv);
+int bb_cat(char** argv) FAST_FUNC;
 /* If shell needs them, they exist even if not enabled as applets */
 int echo_main(int argc, char** argv) IF_ECHO(MAIN_EXTERNALLY_VISIBLE);
 int printf_main(int argc, char **argv) IF_PRINTF(MAIN_EXTERNALLY_VISIBLE);
@@ -1290,6 +1312,16 @@ int bunzip2_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 void bb_displayroutes(int noresolve, int netstatfmt) FAST_FUNC;
 #endif
+struct number_state {
+        unsigned width;
+        unsigned start;
+        unsigned inc;
+        const char *sep;
+        const char *empty_str;
+        smallint all, nonempty;
+};
+void print_numbered_lines(struct number_state *ns, const char *filename) FAST_FUNC;
 /* Networking */
 /* This structure defines protocol families and their handlers. */
@@ -1348,10 +1380,15 @@ extern int get_linux_version_code(void) FAST_FUNC;
 extern char *query_loop(const char *device) FAST_FUNC;
 extern int del_loop(const char *device) FAST_FUNC;
-/* If *devname is not NULL, use that name, otherwise try to find free one,
+/*
+ * If *devname is not NULL, use that name, otherwise try to find free one,
 * malloc and return it in *devname.
- * return value: 1: read-only loopdev was setup, 0: rw, < 0: error */
+ * return value is the opened fd to the loop device, or < on error
-extern int set_loop(char **devname, const char *file, unsigned long long offset, int ro) FAST_FUNC;
+ */
+extern int set_loop(char **devname, const char *file, unsigned long long offset, unsigned flags) FAST_FUNC;
+/* These constants match linux/loop.h (without BB_ prefix): */
+#define BB_LO_FLAGS_READ_ONLY 1
+#define BB_LO_FLAGS_AUTOCLEAR 4
 /* Like bb_ask below, but asks on stdin with no timeout.  */
 char *bb_ask_stdin(const char * prompt) FAST_FUNC;
@@ -1463,6 +1500,12 @@ extern void selinux_or_die(void) FAST_FUNC;
 #define SETUP_ENV_NO_CHDIR  (1 << 4)
 void setup_environment(const char *shell, int flags, const struct passwd *pw) FAST_FUNC;
 void nuke_str(char *str) FAST_FUNC;
+#if ENABLE_FEATURE_SECURETTY && !ENABLE_PAM
+int is_tty_secure(const char *short_tty) FAST_FUNC;
+#else
+static ALWAYS_INLINE int is_tty_secure(const char *short_tty UNUSED_PARAM) { return 1; }
+#endif
+#define CHECKPASS_PW_HAS_EMPTY_PASSWORD 2
 int check_password(const struct passwd *pw, const char *plaintext) FAST_FUNC;
 int ask_and_check_password_extended(const struct passwd *pw, int timeout, const char *prompt) FAST_FUNC;
 int ask_and_check_password(const struct passwd *pw) FAST_FUNC;
diff --git a/init/init.c b/init/init.c
index 833759341..4d6355167 100644
--- a/init/init.c
+++ b/init/init.c
@@ -73,6 +73,10 @@
 //config:       bool "Enable init to write to syslog"
 //config:       default y
 //config:       depends on INIT || LINUXRC
+//config:       help
+//config:         If selected, some init messages are sent to syslog.
+//config:         Otherwise, they are sent to VT #5 if linux virtual tty is detected
+//config:         (if not, no separate logging is done).
 //config:
 //config:config FEATURE_INIT_QUIET
 //config:       bool "Be quiet on boot (no 'init started:' message)"
@@ -212,7 +216,9 @@ struct init_action {
 static struct init_action *init_action_list = NULL;
+#if !ENABLE_FEATURE_INIT_SYSLOG
 static const char *log_console = VC_5;
+#endif
 enum {
        L_LOG = 0x1,
@@ -251,17 +257,16 @@ static void message(int where, const char *fmt, ...)
        msg[l++] = '\n';
        msg[l] = '\0';
 #else
-        {
+        msg[l++] = '\n';
-                static int log_fd = -1;
+        msg[l] = '\0';
+        if (where & L_LOG) {
-                msg[l++] = '\n';
-                msg[l] = '\0';
                /* Take full control of the log tty, and never close it.
                 * It's mine, all mine!  Muhahahaha! */
+                static int log_fd = -1;
                if (log_fd < 0) {
-                        if (!log_console) {
+                        log_fd = STDERR_FILENO;
-                                log_fd = STDERR_FILENO;
+                        if (log_console) {
-                        } else {
                                log_fd = device_open(log_console, O_WRONLY | O_NONBLOCK | O_NOCTTY);
                                if (log_fd < 0) {
                                        bb_error_msg("can't log to %s", log_console);
@@ -271,11 +276,9 @@ static void message(int where, const char *fmt, ...)
                                }
                        }
                }
-                if (where & L_LOG) {
+                full_write(log_fd, msg, l);
-                        full_write(log_fd, msg, l);
+                if (log_fd == STDERR_FILENO)
-                        if (log_fd == STDERR_FILENO)
+                        return; /* don't print dup messages */
-                                return; /* don't print dup messages */
-                }
        }
 #endif
@@ -325,8 +328,9 @@ static void console_init(void)
                 * if TERM is set to linux (the default) */
                if (!s || strcmp(s, "linux") == 0)
                        putenv((char*)"TERM=vt102");
-                if (!ENABLE_FEATURE_INIT_SYSLOG)
+# if !ENABLE_FEATURE_INIT_SYSLOG
-                        log_console = NULL;
+                log_console = NULL;
+# endif
        } else
 #endif
        if (!s)
@@ -541,8 +545,8 @@ static pid_t run(const struct init_action *a)
        }
        /* Log the process name and args */
-        message(L_LOG, "starting pid %d, tty '%s': '%s'",
+        message(L_LOG, "starting pid %u, tty '%s': '%s'",
-                        getpid(), a->terminal, a->command);
+                        (int)getpid(), a->terminal, a->command);
        /* Now run it.  The new program will take over this PID,
         * so nothing further in init.c should be run. */
@@ -757,7 +761,7 @@ static void run_shutdown_and_kill_processes(void)
        /* Send signals to every process _except_ pid 1 */
        kill(-1, SIGTERM);
-        message(L_CONSOLE | L_LOG, "Sent SIG%s to all processes", "TERM");
+        message(L_CONSOLE, "Sent SIG%s to all processes", "TERM");
        sync();
        sleep(1);
diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src
index fc9371db1..0d7dd2a2c 100644
--- a/libbb/Kbuild.src
+++ b/libbb/Kbuild.src
@@ -77,6 +77,7 @@ lib-y += safe_gethostname.o
 lib-y += safe_poll.o
 lib-y += safe_strncpy.o
 lib-y += safe_write.o
+lib-y += securetty.o
 lib-y += setup_environment.o
 lib-y += simplify_path.o
 lib-y += single_argv.o
diff --git a/libbb/bb_cat.c b/libbb/bb_cat.c
new file mode 100644
index 000000000..0a4a350fb
--- /dev/null
+++ b/libbb/bb_cat.c
@@ -0,0 +1,33 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
+ */
+//kbuild:lib-y += bb_cat.o
+#include "libbb.h"
+int FAST_FUNC bb_cat(char **argv)
+{
+        int fd;
+        int retval = EXIT_SUCCESS;
+        if (!*argv)
+                argv = (char**) &bb_argv_dash;
+        do {
+                fd = open_or_warn_stdin(*argv);
+                if (fd >= 0) {
+                        /* This is not a xfunc - never exits */
+                        off_t r = bb_copyfd_eof(fd, STDOUT_FILENO);
+                        if (fd != STDIN_FILENO)
+                                close(fd);
+                        if (r >= 0)
+                                continue;
+                }
+                retval = EXIT_FAILURE;
+        } while (*++argv);
+        return retval;
+}
diff --git a/libbb/correct_password.c b/libbb/correct_password.c
index 513c93028..f4635a5bc 100644
--- a/libbb/correct_password.c
+++ b/libbb/correct_password.c
@@ -63,7 +63,7 @@ static const char *get_passwd(const struct passwd *pw, char buffer[SHADOW_BUFSIZ
 }
 /*
- * Return 1 if PW has an empty password.
+ * Return CHECKPASS_PW_HAS_EMPTY_PASSWORD if PW has an empty password.
 * Return 1 if the user gives the correct password for entry PW,
 * 0 if not.
 * NULL pw means "just fake it for login with bad username"
@@ -77,7 +77,7 @@ int FAST_FUNC check_password(const struct passwd *pw, const char *plaintext)
        pw_pass = get_passwd(pw, buffer);
        if (!pw_pass[0]) { /* empty password field? */
-                return 1;
+                return CHECKPASS_PW_HAS_EMPTY_PASSWORD;
        }
        encrypted = pw_encrypt(plaintext, /*salt:*/ pw_pass, 1);
@@ -88,7 +88,7 @@ int FAST_FUNC check_password(const struct passwd *pw, const char *plaintext)
 /* Ask the user for a password.
- * Return 1 without asking if PW has an empty password.
+ * Return CHECKPASS_PW_HAS_EMPTY_PASSWORD without asking if PW has an empty password.
 * Return -1 on EOF, error while reading input, or timeout.
 * Return 1 if the user gives the correct password for entry PW,
 * 0 if not.
@@ -105,7 +105,7 @@ int FAST_FUNC ask_and_check_password_extended(const struct passwd *pw,
        pw_pass = get_passwd(pw, buffer);
        if (!pw_pass[0]) /* empty password field? */
-                return 1;
+                return CHECKPASS_PW_HAS_EMPTY_PASSWORD;
        plaintext = bb_ask(STDIN_FILENO, timeout, prompt);
        if (!plaintext) {
diff --git a/libbb/getopt32.c b/libbb/getopt32.c
index 03fca3493..b87b83538 100644
--- a/libbb/getopt32.c
+++ b/libbb/getopt32.c
@@ -128,7 +128,7 @@ const char *opt_complementary
 "abc"  If groups of two or more chars are specified, the first char
        is the main option and the other chars are secondary options.
        Their flags will be turned on if the main option is found even
-        if they are not specifed on the command line.  For example:
+        if they are not specified on the command line.  For example:
        opt_complementary = "abc";
        flags = getopt32(argv, "abcd")
@@ -576,13 +576,7 @@ getopt32(char **argv, const char *applet_opts, ...)
         * run_nofork_applet() does this, but we might end up here
         * also via gunzip_main() -> gzip_main(). Play safe.
         */
-#if defined(__GLIBC__) || ENABLE_PLATFORM_MINGW32
+        GETOPT_RESET();
-        optind = 0;
-#else /* BSD style */
-        optind = 1;
-        /* optreset = 1; */
-#endif
-        /* optarg = NULL; opterr = 0; optopt = 0; - do we need this?? */
        /* Note: just "getopt() <= 0" will not work well for
         * "fake" short options, like this one:
diff --git a/libbb/isqrt.c b/libbb/isqrt.c
new file mode 100644
index 000000000..817b7d036
--- /dev/null
+++ b/libbb/isqrt.c
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2017 Denys Vlasenko <vda.linux@googlemail.com>
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
+ */
+//kbuild:lib-y += isqrt.o
+#ifndef ISQRT_TEST
+# include "libbb.h"
+#else
+/* gcc -DISQRT_TEST -Wall -O2 isqrt.c -oisqrt && ./isqrt $((RANDOM*RANDOM)) */
+# include <stdlib.h>
+# include <stdio.h>
+# include <time.h>
+# define FAST_FUNC /* nothing */
+#endif
+/* Returns such x that x+1 > sqrt(N) */
+unsigned long FAST_FUNC isqrt(unsigned long long N)
+{
+        unsigned long x;
+        unsigned shift;
+#define LL_WIDTH_BITS (unsigned)(sizeof(N)*8)
+        shift = LL_WIDTH_BITS - 2;
+        x = 0;
+        do {
+                x = (x << 1) + 1;
+                if ((unsigned long long)x * x > (N >> shift))
+                        x--; /* whoops, that +1 was too much */
+                shift -= 2;
+        } while ((int)shift >= 0);
+        return x;
+}
+#ifdef ISQRT_TEST
+int main(int argc, char **argv)
+{
+        unsigned long long n = argv[1] ? strtoull(argv[1], NULL, 0) : time(NULL);
+        for (;;) {
+                unsigned long h;
+                n--;
+                h = isqrt(n);
+                if (!(n & 0xffff))
+                        printf("isqrt(%llx)=%lx\n", n, h);
+                if ((unsigned long long)h * h > n) {
+                        printf("BAD1: isqrt(%llx)=%lx\n", n, h);
+                        return 1;
+                }
+                h++;
+                if ((unsigned long long)h * h != 0 /* this can overflow to 0 - not a bug */
+                 && (unsigned long long)h * h <= n)
+                {
+                        printf("BAD2: isqrt(%llx)=%lx\n", n, h);
+                        return 1;
+                }
+        }
+}
+#endif
diff --git a/libbb/loop.c b/libbb/loop.c
index d30b378d7..f0d4296ae 100644
--- a/libbb/loop.c
+++ b/libbb/loop.c
@@ -78,22 +78,24 @@ int FAST_FUNC del_loop(const char *device)
        return rc;
 }
-/* Returns 0 if mounted RW, 1 if mounted read-only, <0 for error.
+/* Returns opened fd to the loop device, <0 on error.
-   *device is loop device to use, or if *device==NULL finds a loop device to
+ * *device is loop device to use, or if *device==NULL finds a loop device to
-   mount it on and sets *device to a strdup of that loop device name.  This
+ * mount it on and sets *device to a strdup of that loop device name.  This
-   search will re-use an existing loop device already bound to that
+ * search will re-use an existing loop device already bound to that
-   file/offset if it finds one.
+ * file/offset if it finds one.
 */
-int FAST_FUNC set_loop(char **device, const char *file, unsigned long long offset, int ro)
+int FAST_FUNC set_loop(char **device, const char *file, unsigned long long offset, unsigned flags)
 {
        char dev[LOOP_NAMESIZE];
        char *try;
        bb_loop_info loopinfo;
        struct stat statbuf;
-        int i, dfd, ffd, mode, rc = -1;
+        int i, dfd, ffd, mode, rc;
+        rc = dfd = -1;
        /* Open the file.  Barf if this doesn't work.  */
-        mode = ro ? O_RDONLY : O_RDWR;
+        mode = (flags & BB_LO_FLAGS_READ_ONLY) ? O_RDONLY : O_RDWR;
 open_ffd:
        ffd = open(file, mode);
        if (ffd < 0) {
@@ -144,20 +146,35 @@ int FAST_FUNC set_loop(char **device, const char *file, unsigned long long offse
                /* If device is free, claim it.  */
                if (rc && errno == ENXIO) {
-                        memset(&loopinfo, 0, sizeof(loopinfo));
-                        safe_strncpy((char *)loopinfo.lo_file_name, file, LO_NAME_SIZE);
-                        loopinfo.lo_offset = offset;
                        /* Associate free loop device with file.  */
                        if (ioctl(dfd, LOOP_SET_FD, ffd) == 0) {
-                                if (ioctl(dfd, BB_LOOP_SET_STATUS, &loopinfo) == 0)
+                                memset(&loopinfo, 0, sizeof(loopinfo));
-                                        rc = 0;
+                                safe_strncpy((char *)loopinfo.lo_file_name, file, LO_NAME_SIZE);
-                                else
+                                loopinfo.lo_offset = offset;
+                                /*
+                                 * Used by mount to set LO_FLAGS_AUTOCLEAR.
+                                 * LO_FLAGS_READ_ONLY is not set because RO is controlled by open type of the file.
+                                 * Note that closing LO_FLAGS_AUTOCLEARed dfd before mount
+                                 * is wrong (would free the loop device!)
+                                 */
+                                loopinfo.lo_flags = (flags & ~BB_LO_FLAGS_READ_ONLY);
+                                rc = ioctl(dfd, BB_LOOP_SET_STATUS, &loopinfo);
+                                if (rc != 0 && (loopinfo.lo_flags & BB_LO_FLAGS_AUTOCLEAR)) {
+                                        /* Old kernel, does not support LO_FLAGS_AUTOCLEAR? */
+                                        /* (this code path is not tested) */
+                                        loopinfo.lo_flags -= BB_LO_FLAGS_AUTOCLEAR;
+                                        rc = ioctl(dfd, BB_LOOP_SET_STATUS, &loopinfo);
+                                }
+                                if (rc != 0) {
                                        ioctl(dfd, LOOP_CLR_FD, 0);
+                                }
                        }
                } else {
                        rc = -1;
                }
-                close(dfd);
+                if (rc != 0) {
+                        close(dfd);
+                }
 try_again:
                if (*device) break;
        }
@@ -165,7 +182,7 @@ int FAST_FUNC set_loop(char **device, const char *file, unsigned long long offse
        if (rc == 0) {
                if (!*device)
                        *device = xstrdup(dev);
-                return (mode == O_RDONLY); /* 1:ro, 0:rw */
+                return dfd;
        }
        return rc;
 }
diff --git a/libbb/print_numbered_lines.c b/libbb/print_numbered_lines.c
new file mode 100644
index 000000000..702aed1ea
--- /dev/null
+++ b/libbb/print_numbered_lines.c
@@ -0,0 +1,29 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Copyright (C) 2017 Denys Vlasenko <vda.linux@googlemail.com>
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
+ */
+//kbuild:lib-y += print_numbered_lines.o
+#include "libbb.h"
+void FAST_FUNC print_numbered_lines(struct number_state *ns, const char *filename)
+{
+        FILE *fp = fopen_or_warn_stdin(filename);
+        unsigned N = ns->start;
+        char *line;
+        while ((line = xmalloc_fgetline(fp)) != NULL) {
+                if (ns->all
+                 || (ns->nonempty && line[0])
+                ) {
+                        printf("%*u%s%s\n", ns->width, N, ns->sep, line);
+                        N += ns->inc;
+                } else if (ns->empty_str)
+                        fputs(ns->empty_str, stdout);
+                free(line);
+        }
+        fclose(fp);
+}
diff --git a/libbb/recursive_action.c b/libbb/recursive_action.c
index b5cf7c0ab..8f2b8b932 100644
--- a/libbb/recursive_action.c
+++ b/libbb/recursive_action.c
@@ -30,24 +30,37 @@ static int FAST_FUNC true_action(const char *fileName UNUSED_PARAM,
        return TRUE;
 }
-/* fileAction return value of 0 on any file in directory will make
+/* fileName is (l)stat'ed (depending on ACTION_FOLLOWLINKS[_L0]).
- * recursive_action() return 0, but it doesn't stop directory traversal
+ *
+ * If it is a file: fileAction in run on it, its return value is returned.
+ *
+ * In case we are in a recursive invocation (see below):
+ * normally, fileAction should return 1 (TRUE) to indicate that
+ * everything is okay and processing should continue.
+ * fileAction return value of 0 (FALSE) on any file in directory will make
+ * recursive_action() also return 0, but it doesn't stop directory traversal
 * (fileAction/dirAction will be called on each file).
 *
- * If !ACTION_RECURSE, dirAction is called on the directory and its
+ * [TODO: maybe introduce -1 to mean "stop traversal NOW and return"]
+ *
+ * If it is a directory:
+ *
+ * If !ACTION_RECURSE, dirAction is called and its
 * return value is returned from recursive_action(). No recursion.
 *
- * If ACTION_RECURSE, recursive_action() is called on each directory.
+ * If ACTION_RECURSE, directory is opened, and recursive_action() is called
+ * on each file/subdirectory.
 * If any one of these calls returns 0, current recursive_action() returns 0.
 *
+ * If !ACTION_DEPTHFIRST, dirAction is called before recurse.
+ * Return value of 0 (FALSE) is an error: prevents recursion,
+ * the warning is printed (unless ACTION_QUIET) and recursive_action() returns 0.
+ * Return value of 2 (SKIP) prevents recursion, instead recursive_action()
+ * returns 1 (TRUE, no error).
+ *
 * If ACTION_DEPTHFIRST, dirAction is called after recurse.
 * If it returns 0, the warning is printed and recursive_action() returns 0.
 *
- * If !ACTION_DEPTHFIRST, dirAction is called before we recurse.
- * Return value of 0 (FALSE) or 2 (SKIP) prevents recursion
- * into that directory, instead recursive_action() returns 0 (if FALSE)
- * or 1 (if SKIP)
- *
 * ACTION_FOLLOWLINKS mainly controls handling of links to dirs.
 * 0: lstat(statbuf). Calls fileAction on link name even if points to dir.
 * 1: stat(statbuf). Calls dirAction and optionally recurse on link to dir.
@@ -105,7 +118,7 @@ int FAST_FUNC recursive_action(const char *fileName,
        if (!(flags & ACTION_DEPTHFIRST)) {
                status = dirAction(fileName, &statbuf, userData, depth);
-                if (!status)
+                if (status == FALSE)
                        goto done_nak_warn;
                if (status == SKIP)
                        return TRUE;
@@ -121,24 +134,23 @@ int FAST_FUNC recursive_action(const char *fileName,
        status = TRUE;
        while ((next = readdir(dir)) != NULL) {
                char *nextFile;
+                int s;
                nextFile = concat_subpath_file(fileName, next->d_name);
                if (nextFile == NULL)
                        continue;
                /* process every file (NB: ACTION_RECURSE is set in flags) */
-                if (!recursive_action(nextFile, flags, fileAction, dirAction,
+                s = recursive_action(nextFile, flags, fileAction, dirAction,
-                                                userData, depth + 1))
+                                                userData, depth + 1);
+                if (s == FALSE)
                        status = FALSE;
-//              s = recursive_action(nextFile, flags, fileAction, dirAction,
-//                                              userData, depth + 1);
                free(nextFile);
-//#define RECURSE_RESULT_ABORT 3
+//#define RECURSE_RESULT_ABORT -1
 //              if (s == RECURSE_RESULT_ABORT) {
 //                      closedir(dir);
 //                      return s;
 //              }
-//              if (s == FALSE)
-//                      status = FALSE;
        }
        closedir(dir);
diff --git a/libbb/securetty.c b/libbb/securetty.c
new file mode 100644
index 000000000..21354e2fa
--- /dev/null
+++ b/libbb/securetty.c
@@ -0,0 +1,26 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * /etc/securetty checking.
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
+ */
+#include "libbb.h"
+#if ENABLE_FEATURE_SECURETTY && !ENABLE_PAM
+int FAST_FUNC is_tty_secure(const char *short_tty)
+{
+        char *buf = (char*)"/etc/securetty"; /* any non-NULL is ok */
+        parser_t *parser = config_open2("/etc/securetty", fopen_for_read);
+        while (config_read(parser, &buf, 1, 1, "# \t", PARSE_NORMAL)) {
+                if (strcmp(buf, short_tty) == 0)
+                        break;
+                buf = NULL;
+        }
+        config_close(parser);
+        /* buf != NULL here if config file was not found, empty
+         * or line was found which equals short_tty.
+         * In all these cases, we report "this tty is secure".
+         */
+        return buf != NULL;
+}
+#endif
diff --git a/libbb/vfork_daemon_rexec.c b/libbb/vfork_daemon_rexec.c
index a6d260a40..9ab49d0a1 100644
--- a/libbb/vfork_daemon_rexec.c
+++ b/libbb/vfork_daemon_rexec.c
@@ -123,28 +123,8 @@ int FAST_FUNC run_nofork_applet(int applet_no, char **argv)
        /* In case getopt() or getopt32() was already called:
         * reset the libc getopt() function, which keeps internal state.
-         *
-         * BSD-derived getopt() functions require that optind be set to 1 in
-         * order to reset getopt() state.  This used to be generally accepted
-         * way of resetting getopt().  However, glibc's getopt()
-         * has additional getopt() state beyond optind, and requires that
-         * optind be set to zero to reset its state.  So the unfortunate state of
-         * affairs is that BSD-derived versions of getopt() misbehave if
-         * optind is set to 0 in order to reset getopt(), and glibc's getopt()
-         * will core dump if optind is set 1 in order to reset getopt().
-         *
-         * More modern versions of BSD require that optreset be set to 1 in
-         * order to reset getopt().  Sigh.  Standards, anyone?
         */
-#ifdef __GLIBC__
+        GETOPT_RESET();
-        optind = 0;
-#else /* BSD style */
-        optind = 1;
-        /* optreset = 1; */
-#endif
-        /* optarg = NULL; opterr = 1; optopt = 63; - do we need this too? */
-        /* (values above are what they initialized to in glibc and uclibc) */
-        /* option_mask32 = 0; - not needed, no applet depends on it being 0 */
        argc = 1;
        while (argv[argc])
@@ -169,11 +149,7 @@ int FAST_FUNC run_nofork_applet(int applet_no, char **argv)
        restore_nofork_data(&old);
        /* Other globals can be simply reset to defaults */
-#ifdef __GLIBC__
+        GETOPT_RESET();
-        optind = 0;
-#else /* BSD style */
-        optind = 1;
-#endif
        return rc & 0xff; /* don't confuse people with "exitcodes" >255 */
 }
diff --git a/libpwdgrp/pwd_grp.c b/libpwdgrp/pwd_grp.c
index cefbc8a7e..c9bbc8bda 100644
--- a/libpwdgrp/pwd_grp.c
+++ b/libpwdgrp/pwd_grp.c
@@ -14,7 +14,7 @@
 *    exit using the atexit function to make valgrind happy.
 * 2) the passwd/group files:
 *      a) must contain the expected number of fields (as per count of field
- *         delimeters ":") or we will complain with a error message.
+ *         delimiters ":") or we will complain with a error message.
 *      b) leading and trailing whitespace in fields is stripped.
 *      c) some fields are not allowed to be empty (e.g. username, uid/gid),
 *         and in this case NULL is returned and errno is set to EINVAL.
@@ -149,7 +149,7 @@ static struct statics *get_S(void)
 /* Internal functions */
 /* Divide the passwd/group/shadow record in fields
- * by substituting the given delimeter
+ * by substituting the given delimiter
 * e.g. ':' or ',' with '\0'.
 * Returns the number of fields found.
 * Strips leading and trailing whitespace in fields.
diff --git a/loginutils/add-remove-shell.c b/loginutils/add-remove-shell.c
index af7c31779..922b3333d 100644
--- a/loginutils/add-remove-shell.c
+++ b/loginutils/add-remove-shell.c
@@ -43,10 +43,7 @@
 #define REMOVE_SHELL (ENABLE_REMOVE_SHELL && (!ENABLE_ADD_SHELL || applet_name[0] == 'r'))
 #define ADD_SHELL    (ENABLE_ADD_SHELL && (!ENABLE_REMOVE_SHELL || applet_name[0] == 'a'))
-/* NB: we use the _address_, not the value, of this string
+#define dont_add ((char*)(uintptr_t)1)
- * as a "special value of pointer" in the code.
- */
-static const char dont_add[] ALIGN1 = "\n";
 int add_remove_shell_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int add_remove_shell_main(int argc UNUSED_PARAM, char **argv)
@@ -54,6 +51,9 @@ int add_remove_shell_main(int argc UNUSED_PARAM, char **argv)
        FILE *orig_fp;
        char *orig_fn;
        char *new_fn;
+        struct stat sb;
+        sb.st_mode = 0666;
        argv++;
@@ -61,6 +61,8 @@ int add_remove_shell_main(int argc UNUSED_PARAM, char **argv)
        if (!orig_fn)
                return EXIT_FAILURE;
        orig_fp = fopen_for_read(orig_fn);
+        if (orig_fp)
+                xfstat(fileno(orig_fp), &sb, orig_fn);
        new_fn = xasprintf("%s.tmp", orig_fn);
        /*
@@ -71,13 +73,9 @@ int add_remove_shell_main(int argc UNUSED_PARAM, char **argv)
         * after which it should revert to O_TRUNC.
         * For now, I settle for O_TRUNC instead.
         */
-        xmove_fd(xopen(new_fn, O_WRONLY | O_CREAT | O_TRUNC), STDOUT_FILENO);
+        xmove_fd(xopen3(new_fn, O_WRONLY | O_CREAT | O_TRUNC, sb.st_mode), STDOUT_FILENO);
+        /* TODO?
-        /* TODO:
-        struct stat sb;
-        xfstat(fileno(orig_fp), &sb);
        xfchown(STDOUT_FILENO, sb.st_uid, sb.st_gid);
-        xfchmod(STDOUT_FILENO, sb.st_mode);
        */
        if (orig_fp) {
@@ -95,7 +93,7 @@ int add_remove_shell_main(int argc UNUSED_PARAM, char **argv)
                                        }
                                        /* we are add-shell */
                                        /* mark this name as "do not add" */
-                                        *cpp = (char*)dont_add;
+                                        *cpp = dont_add;
                                }
                                cpp++;
                        }
diff --git a/loginutils/cryptpw.c b/loginutils/cryptpw.c
index 696e169fc..3dc8232e0 100644
--- a/loginutils/cryptpw.c
+++ b/loginutils/cryptpw.c
@@ -64,7 +64,7 @@ OPTIONS
    $1$.
 -R, --rounds=NUMBER
    Use NUMBER rounds. This argument is ignored if the method
-    choosen does not support variable rounds. For the OpenBSD Blowfish
+    chosen does not support variable rounds. For the OpenBSD Blowfish
    method this is the logarithm of the number of rounds.
 -m, --method=TYPE
    Compute the password using the TYPE method. If TYPE is 'help'
diff --git a/loginutils/login.c b/loginutils/login.c
index d1757a65d..be05def09 100644
--- a/loginutils/login.c
+++ b/loginutils/login.c
@@ -175,25 +175,6 @@ static void die_if_nologin(void)
 # define die_if_nologin() ((void)0)
 #endif
-#if ENABLE_FEATURE_SECURETTY && !ENABLE_PAM
-static int check_securetty(const char *short_tty)
-{
-        char *buf = (char*)"/etc/securetty"; /* any non-NULL is ok */
-        parser_t *parser = config_open2("/etc/securetty", fopen_for_read);
-        while (config_read(parser, &buf, 1, 1, "# \t", PARSE_NORMAL)) {
-                if (strcmp(buf, short_tty) == 0)
-                        break;
-                buf = NULL;
-        }
-        config_close(parser);
-        /* buf != NULL here if config file was not found, empty
-         * or line was found which equals short_tty */
-        return buf != NULL;
-}
-#else
-static ALWAYS_INLINE int check_securetty(const char *short_tty UNUSED_PARAM) { return 1; }
-#endif
 #if ENABLE_SELINUX
 static void initselinux(char *username, char *full_tty,
                                                security_context_t *user_sid)
@@ -505,7 +486,7 @@ int login_main(int argc UNUSED_PARAM, char **argv)
                if (opt & LOGIN_OPT_f)
                        break; /* -f USER: success without asking passwd */
-                if (pw->pw_uid == 0 && !check_securetty(short_tty))
+                if (pw->pw_uid == 0 && !is_tty_secure(short_tty))
                        goto auth_failed;
                /* Don't check the password if password entry is empty (!) */
diff --git a/loginutils/su.c b/loginutils/su.c
index d04b85fb1..4cce82405 100644
--- a/loginutils/su.c
+++ b/loginutils/su.c
@@ -23,6 +23,11 @@
 //config:       bool "If user's shell is not in /etc/shells, disallow -s PROG"
 //config:       default y
 //config:       depends on SU
+//config:
+//config:config FEATURE_SU_BLANK_PW_NEEDS_SECURE_TTY
+//config:       bool "Allow blank passwords only on TTYs in /etc/securetty"
+//config:       default n
+//config:       depends on SU
 //applet:/* Needs to be run by root or be suid root - needs to change uid and gid: */
 //applet:IF_SU(APPLET(su, BB_DIR_BIN, BB_SUID_REQUIRE))
@@ -79,6 +84,7 @@ int su_main(int argc UNUSED_PARAM, char **argv)
        char user_buf[64];
 #endif
        const char *old_user;
+        int r;
        /* Note: we don't use "'+': stop at first non-option" idiom here.
         * For su, "SCRIPT ARGS" or "-c CMD ARGS" do not stop option parsing:
@@ -99,6 +105,11 @@ int su_main(int argc UNUSED_PARAM, char **argv)
                argv++;
        }
+        tty = xmalloc_ttyname(STDIN_FILENO);
+        if (!tty)
+                tty = "none";
+        tty = skip_dev_pfx(tty);
        if (ENABLE_FEATURE_SU_SYSLOG) {
                /* The utmp entry (via getlogin) is probably the best way to
                 * identify the user, especially if someone su's from a su-shell.
@@ -112,20 +123,26 @@ int su_main(int argc UNUSED_PARAM, char **argv)
                        pw = getpwuid(cur_uid);
                        old_user = pw ? xstrdup(pw->pw_name) : "";
                }
-                tty = xmalloc_ttyname(2);
-                if (!tty) {
-                        tty = "none";
-                }
                openlog(applet_name, 0, LOG_AUTH);
        }
        pw = xgetpwnam(opt_username);
-        if (cur_uid == 0 || ask_and_check_password(pw) > 0) {
+        r = 1;
+        if (cur_uid != 0)
+                r = ask_and_check_password(pw);
+        if (r > 0) {
+                if (ENABLE_FEATURE_SU_BLANK_PW_NEEDS_SECURE_TTY
+                 && r == CHECKPASS_PW_HAS_EMPTY_PASSWORD
+                 && !is_tty_secure(tty)
+                ) {
+                        goto fail;
+                }
                if (ENABLE_FEATURE_SU_SYSLOG)
                        syslog(LOG_NOTICE, "%c %s %s:%s",
                                '+', tty, old_user, opt_username);
        } else {
+ fail:
                if (ENABLE_FEATURE_SU_SYSLOG)
                        syslog(LOG_NOTICE, "%c %s %s:%s",
                                '-', tty, old_user, opt_username);
diff --git a/mailutils/sendmail.c b/mailutils/sendmail.c
index 8ddb7826b..b542099fd 100644
--- a/mailutils/sendmail.c
+++ b/mailutils/sendmail.c
@@ -150,7 +150,7 @@ static char *sane_address(char *str)
        trim(str);
        s = str;
        while (*s) {
-                if (!isalnum(*s) && !strchr("_-.@", *s)) {
+                if (!isalnum(*s) && !strchr("+_-.@", *s)) {
                        bb_error_msg("bad address '%s'", str);
                        /* returning "": */
                        str[0] = '\0';
diff --git a/miscutils/inotifyd.c b/miscutils/inotifyd.c
index 601df6465..db8ddce92 100644
--- a/miscutils/inotifyd.c
+++ b/miscutils/inotifyd.c
@@ -12,7 +12,7 @@
 * Use as follows:
 * # inotifyd /user/space/agent dir/or/file/being/watched[:mask] ...
 *
- * When a filesystem event matching the specified mask is occured on specified file (or directory)
+ * When a filesystem event matching the specified mask is occurred on specified file (or directory)
 * a userspace agent is spawned and given the following parameters:
 * $1. actual event(s)
 * $2. file (or directory) name
diff --git a/miscutils/less.c b/miscutils/less.c
index 220e2c693..16be1447e 100644
--- a/miscutils/less.c
+++ b/miscutils/less.c
@@ -271,7 +271,7 @@ struct globals {
 /* flines[] are lines read from stdin, each in malloc'ed buffer.
 * Line numbers are stored as uint32_t prepended to each line.
 * Pointer is adjusted so that flines[i] points directly past
- * line number. Accesor: */
+ * line number. Accessor: */
 #define MEMPTR(p) ((char*)(p) - 4)
 #define LINENO(p) (*(uint32_t*)((p) - 4))
diff --git a/miscutils/lsscsi.c b/miscutils/lsscsi.c
new file mode 100644
index 000000000..1521680ac
--- /dev/null
+++ b/miscutils/lsscsi.c
@@ -0,0 +1,123 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * lsscsi implementation for busybox
+ *
+ * Copyright (C) 2017 Markus Gothe <nietzsche@lysator.liu.se>
+ *
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
+ */
+//config:config LSSCSI
+//config:       bool "lsscsi"
+//config:       default y
+//config:       #select PLATFORM_LINUX
+//config:       help
+//config:         lsscsi is a utility for displaying information about SCSI buses in the
+//config:         system and devices connected to them.
+//config:
+//config:         This version uses sysfs (/sys/bus/scsi/devices) only.
+//applet:IF_LSSCSI(APPLET(lsscsi, BB_DIR_USR_BIN, BB_SUID_DROP))
+//kbuild:lib-$(CONFIG_LSSCSI) += lsscsi.o
+//usage:#define lsscsi_trivial_usage NOUSAGE_STR
+//usage:#define lsscsi_full_usage ""
+#include "libbb.h"
+static char *get_line(const char *filename, char *buf, unsigned *bufsize_p)
+{
+        unsigned bufsize = *bufsize_p;
+        ssize_t sz;
+        if ((int)(bufsize - 2) <= 0)
+                return buf;
+        sz = open_read_close(filename, buf, bufsize - 2);
+        if (sz < 0)
+                sz = 0;
+        buf[sz] = '\0';
+        trim(buf);
+        sz = strlen(buf) + 1;
+        bufsize -= sz;
+        buf += sz;
+        buf[0] = '\0';
+        *bufsize_p = bufsize;
+        return buf;
+}
+int lsscsi_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int lsscsi_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
+{
+        struct dirent *de;
+        DIR *dir;
+        xchdir("/sys/bus/scsi/devices");
+        dir = xopendir(".");
+        while ((de = readdir(dir)) != NULL) {
+                char buf[256];
+                char *ptr;
+                unsigned bufsize;
+                const char *vendor;
+                const char *type_str;
+                const char *type_name;
+                const char *model;
+                const char *rev;
+                unsigned type;
+                if (!isdigit(de->d_name[0]))
+                        continue;
+                if (!strchr(de->d_name, ':'))
+                        continue;
+                if (chdir(de->d_name) != 0)
+                        continue;
+                bufsize = sizeof(buf);
+                vendor = buf;
+                ptr = get_line("vendor", buf, &bufsize);
+                type_str = ptr;
+                ptr = get_line("type", ptr, &bufsize);
+                model = ptr;
+                ptr = get_line("model", ptr, &bufsize);
+                rev = ptr;
+                ptr = get_line("rev", ptr, &bufsize);
+                printf("[%s]\t", de->d_name);
+#define scsi_device_types \
+        "disk\0"    "tape\0"    "printer\0" "process\0" \
+        "worm\0"    "\0"        "scanner\0" "optical\0" \
+        "mediumx\0" "comms\0"   "\0"        "\0"        \
+        "storage\0" "enclosu\0" "sim dsk\0" "opti rd\0" \
+        "bridge\0"  "osd\0"     "adi\0"     "\0"        \
+        "\0"        "\0"        "\0"        "\0"        \
+        "\0"        "\0"        "\0"        "\0"        \
+        "\0"        "\0"        "wlun\0"    "no dev"
+                type = bb_strtou(type_str, NULL, 10);
+                if (errno
+                 || type >= 0x20
+                 || (type_name = nth_string(scsi_device_types, type))[0] == '\0'
+                ) {
+                        printf("(%s)\t", type_str);
+                } else {
+                        printf("%s\t", type_name);
+                }
+                printf("%s\t""%s\t""%s\n",
+                        vendor,
+                        model,
+                        rev
+                );
+                /* TODO: also output device column, e.g. "/dev/sdX" */
+                xchdir("..");
+        }
+        if (ENABLE_FEATURE_CLEAN_UP)
+                closedir(dir);
+        return EXIT_SUCCESS;
+}
diff --git a/miscutils/partprobe.c b/miscutils/partprobe.c
new file mode 100644
index 000000000..38831598d
--- /dev/null
+++ b/miscutils/partprobe.c
@@ -0,0 +1,56 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Copyright (C) 2017 Denys Vlasenko <vda.linux@googlemail.com>
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
+ */
+//config:config PARTPROBE
+//config:       bool "partprobe"
+//config:       default y
+//config:       select PLATFORM_LINUX
+//config:       help
+//config:         Ask kernel to rescan partition table.
+//applet:IF_PARTPROBE(APPLET(partprobe, BB_DIR_USR_SBIN, BB_SUID_DROP))
+//kbuild:lib-$(CONFIG_PARTPROBE) += partprobe.o
+#include <linux/fs.h>
+#include "libbb.h"
+#ifndef BLKRRPART
+# define BLKRRPART _IO(0x12,95)
+#endif
+//usage:#define partprobe_trivial_usage
+//usage:        "DEVICE..."
+//usage:#define partprobe_full_usage "\n\n"
+//usage:        "Ask kernel to rescan partition table"
+//
+// partprobe (GNU parted) 3.2:
+// -d, --dry-run        Don't update the kernel
+// -s, --summary        Show a summary of devices and their partitions
+int partprobe_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int partprobe_main(int argc UNUSED_PARAM, char **argv)
+{
+        getopt32(argv, "");
+        argv += optind;
+        /* "partprobe" with no arguments just does nothing */
+        while (*argv) {
+                int fd = xopen(*argv, O_RDONLY);
+                /*
+                 * Newer versions of parted scan partition tables themselves and
+                 * use BLKPG ioctl (BLKPG_DEL_PARTITION / BLKPG_ADD_PARTITION)
+                 * since this way kernel does not need to know
+                 * partition table formats.
+                 * We use good old BLKRRPART:
+                 */
+                ioctl_or_perror_and_die(fd, BLKRRPART, NULL, "%s", *argv);
+                close(fd);
+                argv++;
+        }
+        return EXIT_SUCCESS;
+}
diff --git a/miscutils/time.c b/miscutils/time.c
index a73a837d8..e377bb6b7 100644
--- a/miscutils/time.c
+++ b/miscutils/time.c
@@ -21,10 +21,14 @@
 //kbuild:lib-$(CONFIG_TIME) += time.o
 //usage:#define time_trivial_usage
-//usage:       "[-v] PROG ARGS"
+//usage:       "[-vpa] [-o FILE] PROG ARGS"
 //usage:#define time_full_usage "\n\n"
 //usage:       "Run PROG, display resource usage when it exits\n"
 //usage:     "\n        -v      Verbose"
+//usage:     "\n        -p      POSIX output format"
+//usage:     "\n        -f FMT  Custom format"
+//usage:     "\n        -o FILE Write result to FILE"
+//usage:     "\n        -a      Append (else overwrite)"
 #include "libbb.h"
 #include <sys/resource.h> /* getrusage */
@@ -397,7 +401,7 @@ static void run_command(char *const *cmd, resource_t *resp)
        }
        /* Have signals kill the child but not self (if possible).  */
-//TODO: just block all sigs? and reenable them in the very end in main?
+//TODO: just block all sigs? and re-enable them in the very end in main?
        interrupt_signal = signal(SIGINT, SIG_IGN);
        quit_signal = signal(SIGQUIT, SIG_IGN);
@@ -412,29 +416,50 @@ int time_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int time_main(int argc UNUSED_PARAM, char **argv)
 {
        resource_t res;
-        const char *output_format = default_format;
+        /* $TIME has lowest prio (-v,-p,-f FMT overrride it) */
+        const char *output_format = getenv("TIME") ? : default_format;
+        char *output_filename;
+        int output_fd;
        int opt;
+        int ex;
+        enum {
+                OPT_v = (1 << 0),
+                OPT_p = (1 << 1),
+                OPT_a = (1 << 2),
+                OPT_o = (1 << 3),
+                OPT_f = (1 << 4),
+        };
        opt_complementary = "-1"; /* at least one arg */
        /* "+": stop on first non-option */
-        opt = getopt32(argv, "+vp");
+        opt = getopt32(argv, "+vpao:f:", &output_filename, &output_format);
        argv += optind;
-        if (opt & 1)
+        if (opt & OPT_v)
                output_format = long_format;
-        if (opt & 2)
+        if (opt & OPT_p)
                output_format = posix_format;
+        output_fd = STDERR_FILENO;
+        if (opt & OPT_o) {
+                output_fd = xopen(output_filename,
+                        (opt & OPT_a) /* append? */
+                        ? (O_CREAT | O_WRONLY | O_CLOEXEC | O_APPEND)
+                        : (O_CREAT | O_WRONLY | O_CLOEXEC | O_TRUNC)
+                );
+        }
        run_command(argv, &res);
        /* Cheat. printf's are shorter :) */
-        xdup2(STDERR_FILENO, STDOUT_FILENO);
+        xdup2(output_fd, STDOUT_FILENO);
        summarize(output_format, argv, &res);
+        ex = WEXITSTATUS(res.waitstatus);
+        /* Impossible: we do not use WUNTRACED flag in wait()...
        if (WIFSTOPPED(res.waitstatus))
-                return WSTOPSIG(res.waitstatus);
+                ex = WSTOPSIG(res.waitstatus);
+        */
        if (WIFSIGNALED(res.waitstatus))
-                return WTERMSIG(res.waitstatus);
+                ex = WTERMSIG(res.waitstatus);
-        if (WIFEXITED(res.waitstatus))
-                return WEXITSTATUS(res.waitstatus);
+        fflush_stdout_and_exit(ex);
-        fflush_stdout_and_exit(EXIT_SUCCESS);
 }
diff --git a/modutils/Config.src b/modutils/Config.src
index 5f0b0cec4..9b76c83d2 100644
--- a/modutils/Config.src
+++ b/modutils/Config.src
@@ -75,7 +75,7 @@ config FEATURE_INSMOD_KSYMOOPS_SYMBOLS
        depends on FEATURE_2_4_MODULES && (INSMOD || MODPROBE)
        help
          By adding module symbols to the kernel symbol table, Oops messages
-          occuring within kernel modules can be properly debugged. By enabling
+          occurring within kernel modules can be properly debugged. By enabling
          this feature, module symbols will always be added to the kernel symbol
          table for proper debugging support. If you are not interested in
          Oops messages from kernel modules, say N.
diff --git a/modutils/modinfo.c b/modutils/modinfo.c
index aa641ad54..ead2cf16f 100644
--- a/modutils/modinfo.c
+++ b/modutils/modinfo.c
@@ -104,7 +104,7 @@ static void modinfo(const char *path, const char *version,
                        char *after_pattern;
                        ptr = memchr(ptr, *pattern, len - (ptr - (char*)the_module));
-                        if (ptr == NULL) /* no occurance left, done */
+                        if (ptr == NULL) /* no occurrence left, done */
                                break;
                        after_pattern = is_prefixed_with(ptr, pattern);
                        if (after_pattern && *after_pattern == '=') {
diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c
index 431b8aeb2..053a7df89 100644
--- a/modutils/modprobe-small.c
+++ b/modutils/modprobe-small.c
@@ -79,6 +79,7 @@ int lsmod_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 #define is_rmmod    (ENABLE_RMMOD    && (ONLY_APPLET || applet_name[0] == 'r'))
 enum {
+        DEPMOD_OPT_n = (1 << 0), /* dry-run, print to stdout */
        OPT_q = (1 << 0), /* be quiet */
        OPT_r = (1 << 1), /* module removal instead of loading */
 };
@@ -168,7 +169,7 @@ static char* find_keyword(char *ptr, size_t len, const char *word)
                /* search for the first char in word */
                ptr = memchr(ptr, word[0], len);
-                if (ptr == NULL) /* no occurance left, done */
+                if (ptr == NULL) /* no occurrence left, done */
                        break;
                after_word = is_prefixed_with(ptr, word);
                if (after_word)
@@ -410,7 +411,7 @@ static FAST_FUNC int fileAction(const char *pathname,
                if (load_module(pathname, module_load_options) == 0) {
                        /* Load was successful, there is nothing else to do.
                         * This can happen ONLY for "top-level" module load,
-                         * not a dep, because deps dont do dirscan. */
+                         * not a dep, because deps don't do dirscan. */
                        exit(EXIT_SUCCESS);
                }
        }
@@ -477,7 +478,7 @@ static int start_dep_bb_writeout(void)
        int fd;
        /* depmod -n: write result to stdout */
-        if (applet_name[0] == 'd' && (option_mask32 & 1))
+        if (is_depmod && (option_mask32 & DEPMOD_OPT_n))
                return STDOUT_FILENO;
        fd = open(DEPFILE_BB".new", O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0644);
@@ -764,9 +765,12 @@ static int process_module(char *name, const char *cmdline_options)
        if (!infovec) {
                /* both dirscan and find_alias found nothing */
-                if (!is_remove && !is_depmod) /* it wasn't rmmod or depmod */
+                if (!is_remove && !is_depmod) { /* it wasn't rmmod or depmod */
                        bb_error_msg("module '%s' not found", name);
 //TODO: _and_die()? or should we continue (un)loading modules listed on cmdline?
+                        /* "modprobe non-existing-module; echo $?" must print 1 */
+                        exitcode = EXIT_FAILURE;
+                }
                goto ret;
        }
@@ -862,25 +866,28 @@ Usage: rmmod [-fhswvV] modulename ...
    should eventually fall to zero).
 # modprobe
-Usage: modprobe [-v] [-V] [-C config-file] [-n] [-i] [-q] [-b]
+Usage: modprobe [-v] [-V] [-C config-file] [-d <dirname> ] [-n] [-i] [-q]
-    [-o <modname>] [ --dump-modversions ] <modname> [parameters...]
+    [-b] [-o <modname>] [ --dump-modversions ] <modname> [parameters...]
 modprobe -r [-n] [-i] [-v] <modulename> ...
 modprobe -l -t <dirname> [ -a <modulename> ...]
 # depmod --help
-depmod 3.4 -- part of module-init-tools
+depmod 3.13 -- part of module-init-tools
-depmod -[aA] [-n -e -v -q -V -r -u]
+depmod -[aA] [-n -e -v -q -V -r -u -w -m]
      [-b basedirectory] [forced_version]
-depmod [-n -e -v -q -r -u] [-F kernelsyms] module1.ko module2.ko ...
+depmod [-n -e -v -q -r -u -w] [-F kernelsyms] module1.ko module2.ko ...
 If no arguments (except options) are given, "depmod -a" is assumed.
 depmod will output a dependency list suitable for the modprobe utility.
 Options:
    -a, --all           Probe all modules
    -A, --quick         Only does the work if there's a new module
-    -n, --show          Write the dependency file on stdout only
    -e, --errsyms       Report not supplied symbols
+    -m, --map           Create the legacy map files
+    -n, --show          Write the dependency file on stdout only
+    -P, --symbol-prefix Architecture symbol prefix
    -V, --version       Print the release version
    -v, --verbose       Enable verbose mode
+    -w, --warn          Warn on duplicates
    -h, --help          Print this usage message
 The following options are useful for people managing distributions:
    -b basedirectory
@@ -889,12 +896,18 @@ The following options are useful for people managing distributions:
    -F kernelsyms
    --filesyms kernelsyms
                        Use the file instead of the current kernel symbols
+    -E Module.symvers
+    --symvers Module.symvers
+                        Use Module.symvers file to check symbol versions
 */
 //usage:#if ENABLE_MODPROBE_SMALL
-//usage:#define depmod_trivial_usage NOUSAGE_STR
+//usage:#define depmod_trivial_usage "[-n]"
-//usage:#define depmod_full_usage ""
+//usage:#define depmod_full_usage "\n\n"
+//usage:       "Generate modules.dep.bb"
+//usage:     "\n"
+//usage:     "\n        -n      Dry run: print file to stdout"
 //usage:#define insmod_trivial_usage
 //usage:        "FILE" IF_FEATURE_CMDLINE_MODULE_OPTIONS(" [SYMBOL=VALUE]...")
@@ -947,10 +960,12 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
                 * -e: report any symbols which a module needs
                 *  which are not supplied by other modules or the kernel
                 * -F FILE: System.map (symbols for -e)
-                 * -q, -r, -u: noop?
+                 * -q, -r, -u: noop
                 * Not supported:
                 * -b BASEDIR: (TODO!) modules are in
                 *  $BASEDIR/lib/modules/$VERSION
+                 * -m: create legacy "modules.*map" files (deprecated; in
+                 *  kmod's depmod, prints a warning message and continues)
                 * -v: human readable deps to stdout
                 * -V: version (don't want to support it - people may depend
                 *  on it as an indicator of "standard" depmod)
diff --git a/modutils/modprobe.c b/modutils/modprobe.c
index a6224fa63..51ede9204 100644
--- a/modutils/modprobe.c
+++ b/modutils/modprobe.c
@@ -171,6 +171,7 @@ static const char modprobe_longopts[] ALIGN1 =
 /* "was seen in modules.dep": */
 #define MODULE_FLAG_FOUND_IN_MODDEP     0x0004
 #define MODULE_FLAG_BLACKLISTED         0x0008
+#define MODULE_FLAG_BUILTIN             0x0010
 struct globals {
        llist_t *probes; /* MEs of module(s) requested on cmdline */
@@ -217,7 +218,7 @@ static void add_probe(const char *name)
        m = get_or_add_modentry(name);
        if (!(option_mask32 & (OPT_REMOVE | OPT_SHOW_DEPS))
-         && (m->flags & MODULE_FLAG_LOADED)
+         && (m->flags & (MODULE_FLAG_LOADED | MODULE_FLAG_BUILTIN))
        ) {
                DBG("skipping %s, it is already loaded", name);
                return;
@@ -251,6 +252,15 @@ static int FAST_FUNC config_file_action(const char *filename,
        if (base[0] == '.')
                goto error;
+        /* "man modprobe.d" from kmod version 22 suggests
+         * that we shouldn't recurse into /etc/modprobe.d/dir/
+         * _subdirectories_:
+         */
+        if (depth > 1)
+                return SKIP; /* stop recursing */
+//TODO: instead, can use dirAction in recursive_action() to SKIP dirs
+//on depth == 1 level. But that's more code...
        /* In dir recursion, skip files that do not end with a ".conf"
         * depth==0: read_config("modules.{symbols,alias}") must work,
         * "include FILE_NOT_ENDING_IN_CONF" must work too.
@@ -413,8 +423,10 @@ static int do_modprobe(struct module_entry *m)
        if (!(m->flags & MODULE_FLAG_FOUND_IN_MODDEP)) {
                if (!(option_mask32 & INSMOD_OPT_SILENT))
-                        bb_error_msg("module %s not found in modules.dep",
+                        bb_error_msg((m->flags & MODULE_FLAG_BUILTIN) ?
-                                humanly_readable_name(m));
+                                     "module %s is builtin" :
+                                     "module %s not found in modules.dep",
+                                     humanly_readable_name(m));
                return -ENOENT;
        }
        DBG("do_modprob'ing %s", m->modname);
@@ -618,6 +630,11 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
                while (config_read(parser, &s, 1, 1, "# \t", PARSE_NORMAL & ~PARSE_GREEDY))
                        get_or_add_modentry(s)->flags |= MODULE_FLAG_LOADED;
                config_close(parser);
+                parser = config_open2("modules.builtin", fopen_for_read);
+                while (config_read(parser, &s, 1, 1, "# \t", PARSE_NORMAL))
+                        get_or_add_modentry(s)->flags |= MODULE_FLAG_BUILTIN;
+                config_close(parser);
        }
        if (opt & (OPT_INSERT_ALL | OPT_REMOVE)) {
diff --git a/networking/dnsd.c b/networking/dnsd.c
index 7be90018d..1b85618c6 100644
--- a/networking/dnsd.c
+++ b/networking/dnsd.c
@@ -360,7 +360,7 @@ RDATA   a variable length string of octets that describes the resource.
 In order to reduce the size of messages, domain names coan be compressed.
 An entire domain name or a list of labels at the end of a domain name
-is replaced with a pointer to a prior occurance of the same name.
+is replaced with a pointer to a prior occurrence of the same name.
 The pointer takes the form of a two octet sequence:
    +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
diff --git a/networking/ifenslave.c b/networking/ifenslave.c
index 1cb765e23..070931209 100644
--- a/networking/ifenslave.c
+++ b/networking/ifenslave.c
@@ -55,7 +55,7 @@
 *
 *    - 2003/03/18 - Tsippy Mendelson <tsippy.mendelson at intel dot com> and
 *                   Shmulik Hen <shmulik.hen at intel dot com>
- *       - Moved setting the slave's mac address and openning it, from
+ *       - Moved setting the slave's mac address and opening it, from
 *         the application to the driver. This enables support of modes
 *         that need to use the unique mac address of each slave.
 *         The driver also takes care of closing the slave and restoring its
diff --git a/networking/ip.c b/networking/ip.c
index 0f52b19dd..3cf52cdd7 100644
--- a/networking/ip.c
+++ b/networking/ip.c
@@ -140,47 +140,79 @@
 //kbuild:lib-$(CONFIG_IPTUNNEL) += ip.o
 //kbuild:lib-$(CONFIG_IPNEIGH) += ip.o
+//--------------123456789.123456789.123456789.123456789.123456789.123456789.123456789.123....79
 //usage:#define ipaddr_trivial_usage
 //usage:       "add|del IFADDR dev IFACE | show|flush [dev IFACE] [to PREFIX]"
 //usage:#define ipaddr_full_usage "\n\n"
-//usage:       "ipaddr add|change|replace|delete IFADDR dev IFACE\n"
+//usage:       "ipaddr add|change|replace|delete dev IFACE IFADDR\n"
-//usage:       "ipaddr show|flush [dev IFACE] [scope SCOPE-ID]\n"
+//usage:       "        IFADDR := PREFIX | ADDR peer PREFIX [broadcast ADDR|+|-]\n"
-//usage:       "                [to PREFIX] [label PATTERN]\n"
+//usage:       "                [anycast ADDR] [label STRING] [scope SCOPE]\n"
-//usage:       "        IFADDR := PREFIX | ADDR peer PREFIX\n"
+//usage:       "        PREFIX := ADDR[/MASK]\n"
-//usage:       "                [broadcast ADDR] [anycast ADDR]\n"
+//usage:       "        SCOPE := [host|link|global|NUMBER]\n"
-//usage:       "                [label STRING] [scope SCOPE-ID]\n"
+//usage:       "ipaddr show|flush [dev IFACE] [scope SCOPE] [to PREFIX] [label PATTERN]"
-//usage:       "        SCOPE-ID := [host|link|global|NUMBER]"
 //usage:
+//--------------123456789.123456789.123456789.123456789.123456789.123456789.123456789.123....79
 //usage:#define iplink_trivial_usage
 //usage:       "set IFACE [up|down] [arp on|off] | show [IFACE]"
 //usage:#define iplink_full_usage "\n\n"
-//usage:       "iplink set IFACE [up|down]\n"
+//usage:       "iplink set IFACE [up|down] [arp on|off] [multicast on|off] [promisc on|off]\n"
-//usage:       "        [arp on|off]\n"
+//usage:       "        [mtu NUM] [name NAME] [qlen NUM] [address MAC]\n"
-//usage:       "        [dynamic on|off]\n"
-//usage:       "        [multicast on|off]\n"
-//usage:       "        [mtu MTU]\n"
 //usage:       "iplink show [IFACE]"
 //usage:
+//--------------123456789.123456789.123456789.123456789.123456789.123456789.123456789.123....79
 //usage:#define iproute_trivial_usage
 //usage:       "list|flush|add|del|change|append|replace|test ROUTE"
 //usage:#define iproute_full_usage "\n\n"
 //usage:       "iproute list|flush SELECTOR\n"
-//usage:       "iproute get ADDRESS [from ADDRESS iif STRING]\n"
-//usage:       "        [oif STRING] [tos TOS]\n"
-//usage:       "iproute add|del|change|append|replace|test ROUTE\n"
 //usage:       "        SELECTOR := [root PREFIX] [match PREFIX] [proto RTPROTO]\n"
-//usage:       "        ROUTE := [TYPE] PREFIX [tos TOS] [proto RTPROTO] [metric METRIC]"
+//usage:       "        PREFIX := default|ADDR[/MASK]\n"
+//usage:       "iproute get ADDR [from ADDR iif IFACE]\n"
+//usage:       "        [oif IFACE] [tos TOS]\n"
+//usage:       "iproute add|del|change|append|replace|test ROUTE\n"
+//usage:       "        ROUTE := NODE_SPEC [INFO_SPEC]\n"
+//usage:       "        NODE_SPEC := PREFIX"IF_FEATURE_IP_RULE(" [table TABLE_ID]")" [proto RTPROTO] [scope SCOPE] [metric METRIC]\n"
+//usage:       "        INFO_SPEC := NH OPTIONS\n"
+//usage:       "        NH := [via [inet|inet6] ADDR] [dev IFACE] [src ADDR] [onlink]\n"
+//usage:       "        OPTIONS := [mtu [lock] NUM] [advmss [lock] NUM]"
+//upstream man ip-route:
+//======================
+//ip route { show | flush } SELECTOR
+//ip route save SELECTOR
+//ip route restore
+//ip route get ADDRESS [ from ADDRESS iif STRING  ] [ oif STRING ] [ tos TOS ]
+//ip route { add | del | change | append | replace } ROUTE
+//SELECTOR := [ root PREFIX ] [ match PREFIX ] [ exact PREFIX ] [ table TABLE_ID ] [ proto RTPROTO ] [ type TYPE ] [ scope SCOPE ]
+//ROUTE := NODE_SPEC [ INFO_SPEC ]
+//NODE_SPEC := [ TYPE ] PREFIX [ tos TOS ] [ table TABLE_ID ] [ proto RTPROTO ] [ scope SCOPE ] [ metric METRIC ]
+//INFO_SPEC := NH OPTIONS FLAGS [ nexthop NH ] ...
+//NH := [ encap ENCAP ] [ via [ FAMILY ] ADDRESS ] [ dev STRING ] [ weight NUMBER ] NHFLAGS
+// ..............................................................^ I guess [src ADDRESS] should be here
+//FAMILY := [ inet | inet6 | ipx | dnet | mpls | bridge | link ]
+//OPTIONS := FLAGS [ mtu NUMBER ] [ advmss NUMBER ] [ as [ to ] ADDRESS ] rtt TIME ] [ rttvar TIME ] [ reordering NUMBER ] [ window NUMBER ] [ cwnd NUMBER ] [ ssthresh REALM ] [ realms REALM ]
+//        [ rto_min TIME ] [ initcwnd NUMBER ] [ initrwnd NUMBER ] [ features FEATURES ] [ quickack BOOL ] [ congctl NAME ] [ pref PREF ] [ expires TIME ]
+//TYPE := [ unicast | local | broadcast | multicast | throw | unreachable | prohibit | blackhole | nat ]
+//TABLE_ID := [ local | main | default | all | NUMBER ]
+//SCOPE := [ host | link | global | NUMBER ]
+//NHFLAGS := [ onlink | pervasive ]
+//RTPROTO := [ kernel | boot | static | NUMBER ]
+//FEATURES := [ ecn | ]
+//PREF := [ low | medium | high ]
+//ENCAP := [ MPLS | IP ]
+//ENCAP_MPLS := mpls [ LABEL ]
+//ENCAP_IP := ip id TUNNEL_ID dst REMOTE_IP [ tos TOS ] [ ttl TTL ]
 //usage:
+//--------------123456789.123456789.123456789.123456789.123456789.123456789.123456789.123....79
 //usage:#define iprule_trivial_usage
 //usage:       "[list] | add|del SELECTOR ACTION"
 //usage:#define iprule_full_usage "\n\n"
 //usage:       "        SELECTOR := [from PREFIX] [to PREFIX] [tos TOS] [fwmark FWMARK]\n"
 //usage:       "                        [dev IFACE] [pref NUMBER]\n"
-//usage:       "        ACTION := [table TABLE_ID] [nat ADDRESS]\n"
+//usage:       "        ACTION := [table TABLE_ID] [nat ADDR]\n"
 //usage:       "                        [prohibit|reject|unreachable]\n"
 //usage:       "                        [realms [SRCREALM/]DSTREALM]\n"
 //usage:       "        TABLE_ID := [local|main|default|NUMBER]"
 //usage:
+//--------------123456789.123456789.123456789.123456789.123456789.123456789.123456789.123....79
 //usage:#define iptunnel_trivial_usage
 //usage:       "add|change|del|show [NAME]\n"
 //usage:       "        [mode ipip|gre|sit]\n"
diff --git a/networking/isrv.c b/networking/isrv.c
index 3673db715..97f5c6d4e 100644
--- a/networking/isrv.c
+++ b/networking/isrv.c
@@ -191,7 +191,7 @@ static void handle_accept(isrv_state_t *state, int fd)
        DPRINTF("new_peer(%d)", newfd);
        n = state->new_peer(state, newfd);
        if (n)
-                remove_peer(state, n); /* unsuccesful peer start */
+                remove_peer(state, n); /* unsuccessful peer start */
 }
 static void handle_fd_set(isrv_state_t *state, fd_set *fds, int (*h)(int, void **))
diff --git a/networking/libiproute/ipaddress.c b/networking/libiproute/ipaddress.c
index d9e099607..36d6b65c6 100644
--- a/networking/libiproute/ipaddress.c
+++ b/networking/libiproute/ipaddress.c
@@ -593,9 +593,13 @@ static int default_scope(inet_prefix *lcl)
 /* Return value becomes exitcode. It's okay to not return at all */
 static int ipaddr_modify(int cmd, int flags, char **argv)
 {
+        /* If you add stuff here, update ipaddr_full_usage */
        static const char option[] ALIGN1 =
                "peer\0""remote\0""broadcast\0""brd\0"
                "anycast\0""scope\0""dev\0""label\0""local\0";
+#define option_peer      option
+#define option_broadcast (option           + sizeof("peer") + sizeof("remote"))
+#define option_anycast   (option_broadcast + sizeof("broadcast") + sizeof("brd"))
        struct rtnl_handle rth;
        struct {
                struct nlmsghdr  n;
@@ -627,7 +631,7 @@ static int ipaddr_modify(int cmd, int flags, char **argv)
                if (arg <= 1) { /* peer, remote */
                        if (peer_len) {
-                                duparg("peer", *argv);
+                                duparg(option_peer, *argv);
                        }
                        get_prefix(&peer, *argv, req.ifa.ifa_family);
                        peer_len = peer.bytelen;
@@ -639,7 +643,7 @@ static int ipaddr_modify(int cmd, int flags, char **argv)
                } else if (arg <= 3) { /* broadcast, brd */
                        inet_prefix addr;
                        if (brd_len) {
-                                duparg("broadcast", *argv);
+                                duparg(option_broadcast, *argv);
                        }
                        if (LONE_CHAR(*argv, '+')) {
                                brd_len = -1;
@@ -655,7 +659,7 @@ static int ipaddr_modify(int cmd, int flags, char **argv)
                } else if (arg == 4) { /* anycast */
                        inet_prefix addr;
                        if (any_len) {
-                                duparg("anycast", *argv);
+                                duparg(option_anycast, *argv);
                        }
                        get_addr(&addr, *argv, req.ifa.ifa_family);
                        if (req.ifa.ifa_family == AF_UNSPEC) {
diff --git a/networking/libiproute/iplink.c b/networking/libiproute/iplink.c
index ae3ef0ceb..aef5f6490 100644
--- a/networking/libiproute/iplink.c
+++ b/networking/libiproute/iplink.c
@@ -52,6 +52,9 @@ struct ifla_vlan_flags {
 # define dbg(...) ((void)0)
 #endif
+#define str_on_off "on\0""off\0"
 /* Exits on error */
 static int get_ctl_fd(void)
 {
@@ -204,12 +207,14 @@ static int do_set(char **argv)
        struct ifreq ifr0, ifr1;
        char *newname = NULL;
        int htype, halen;
+        /* If you add stuff here, update iplink_full_usage */
        static const char keywords[] ALIGN1 =
                "up\0""down\0""name\0""mtu\0""qlen\0""multicast\0"
-                "arp\0""address\0""dev\0";
+                "arp\0""promisc\0""address\0"
+                "dev\0" /* must be last */;
        enum { ARG_up = 0, ARG_down, ARG_name, ARG_mtu, ARG_qlen, ARG_multicast,
-                ARG_arp, ARG_addr, ARG_dev };
+                ARG_arp, ARG_promisc, ARG_addr,
-        static const char str_on_off[] ALIGN1 = "on\0""off\0";
+                ARG_dev };
        enum { PARM_on = 0, PARM_off };
        smalluint key;
@@ -232,6 +237,7 @@ static int do_set(char **argv)
                                duparg("mtu", *argv);
                        mtu = get_unsigned(*argv, "mtu");
                } else if (key == ARG_qlen) {
+//TODO: txqueuelen, txqlen are synonyms to qlen
                        NEXT_ARG();
                        if (qlen != -1)
                                duparg("qlen", *argv);
@@ -240,6 +246,7 @@ static int do_set(char **argv)
                        NEXT_ARG();
                        newaddr = *argv;
                } else if (key >= ARG_dev) {
+                        /* ^^^^^^ ">=" here results in "dev IFACE" treated as default */
                        if (key == ARG_dev) {
                                NEXT_ARG();
                        }
@@ -247,6 +254,7 @@ static int do_set(char **argv)
                                duparg2("dev", *argv);
                        dev = *argv;
                } else {
+                        /* "on|off" options */
                        int param;
                        NEXT_ARG();
                        param = index_in_strings(str_on_off, *argv);
@@ -266,8 +274,132 @@ static int do_set(char **argv)
                                        flags &= ~IFF_NOARP;
                                else
                                        flags |= IFF_NOARP;
+                        } else if (key == ARG_promisc) {
+                                if (param < 0)
+                                        die_must_be_on_off("promisc");
+                                mask |= IFF_PROMISC;
+                                if (param == PARM_on)
+                                        flags |= IFF_PROMISC;
+                                else
+                                        flags &= ~IFF_PROMISC;
                        }
                }
+/* Other keywords recognized by iproute2-3.12.0: */
+#if 0
+                } else if (matches(*argv, "broadcast") == 0 ||
+                                strcmp(*argv, "brd") == 0) {
+                        NEXT_ARG();
+                        len = ll_addr_a2n(abuf, sizeof(abuf), *argv);
+                        if (len < 0)
+                                return -1;
+                        addattr_l(&req->n, sizeof(*req), IFLA_BROADCAST, abuf, len);
+                } else if (strcmp(*argv, "netns") == 0) {
+                        NEXT_ARG();
+                        if (netns != -1)
+                                duparg("netns", *argv);
+                        if ((netns = get_netns_fd(*argv)) >= 0)
+                                addattr_l(&req->n, sizeof(*req), IFLA_NET_NS_FD, &netns, 4);
+                        else if (get_integer(&netns, *argv, 0) == 0)
+                                addattr_l(&req->n, sizeof(*req), IFLA_NET_NS_PID, &netns, 4);
+                        else
+                                invarg_1_to_2(*argv, "netns");
+                } else if (strcmp(*argv, "allmulticast") == 0) {
+                        NEXT_ARG();
+                        req->i.ifi_change |= IFF_ALLMULTI;
+                        if (strcmp(*argv, "on") == 0) {
+                                req->i.ifi_flags |= IFF_ALLMULTI;
+                        } else if (strcmp(*argv, "off") == 0) {
+                                req->i.ifi_flags &= ~IFF_ALLMULTI;
+                        } else
+                                return on_off("allmulticast", *argv);
+                } else if (strcmp(*argv, "trailers") == 0) {
+                        NEXT_ARG();
+                        req->i.ifi_change |= IFF_NOTRAILERS;
+                        if (strcmp(*argv, "off") == 0) {
+                                req->i.ifi_flags |= IFF_NOTRAILERS;
+                        } else if (strcmp(*argv, "on") == 0) {
+                                req->i.ifi_flags &= ~IFF_NOTRAILERS;
+                        } else
+                                return on_off("trailers", *argv);
+                } else if (strcmp(*argv, "vf") == 0) {
+                        struct rtattr *vflist;
+                        NEXT_ARG();
+                        if (get_integer(&vf,  *argv, 0)) {
+                                invarg_1_to_2(*argv, "vf");
+                        }
+                        vflist = addattr_nest(&req->n, sizeof(*req),
+                                              IFLA_VFINFO_LIST);
+                        len = iplink_parse_vf(vf, &argc, &argv, req);
+                        if (len < 0)
+                                return -1;
+                        addattr_nest_end(&req->n, vflist);
+                } else if (matches(*argv, "master") == 0) {
+                        int ifindex;
+                        NEXT_ARG();
+                        ifindex = ll_name_to_index(*argv);
+                        if (!ifindex)
+                                invarg_1_to_2(*argv, "master");
+                        addattr_l(&req->n, sizeof(*req), IFLA_MASTER,
+                                  &ifindex, 4);
+                } else if (matches(*argv, "nomaster") == 0) {
+                        int ifindex = 0;
+                        addattr_l(&req->n, sizeof(*req), IFLA_MASTER,
+                                  &ifindex, 4);
+                } else if (matches(*argv, "dynamic") == 0) {
+                        NEXT_ARG();
+                        req->i.ifi_change |= IFF_DYNAMIC;
+                        if (strcmp(*argv, "on") == 0) {
+                                req->i.ifi_flags |= IFF_DYNAMIC;
+                        } else if (strcmp(*argv, "off") == 0) {
+                                req->i.ifi_flags &= ~IFF_DYNAMIC;
+                        } else
+                                return on_off("dynamic", *argv);
+                } else if (matches(*argv, "alias") == 0) {
+                        NEXT_ARG();
+                        addattr_l(&req->n, sizeof(*req), IFLA_IFALIAS,
+                                  *argv, strlen(*argv));
+                        argc--; argv++;
+                        break;
+                } else if (strcmp(*argv, "group") == 0) {
+                        NEXT_ARG();
+                        if (*group != -1)
+                                duparg("group", *argv);
+                        if (rtnl_group_a2n(group, *argv))
+                                invarg_1_to_2(*argv, "group");
+                } else if (strcmp(*argv, "mode") == 0) {
+                        int mode;
+                        NEXT_ARG();
+                        mode = get_link_mode(*argv);
+                        if (mode < 0)
+                                invarg_1_to_2(*argv, "mode");
+                        addattr8(&req->n, sizeof(*req), IFLA_LINKMODE, mode);
+                } else if (strcmp(*argv, "state") == 0) {
+                        int state;
+                        NEXT_ARG();
+                        state = get_operstate(*argv);
+                        if (state < 0)
+                                invarg_1_to_2(*argv, "state");
+                        addattr8(&req->n, sizeof(*req), IFLA_OPERSTATE, state);
+                } else if (matches(*argv, "numtxqueues") == 0) {
+                        NEXT_ARG();
+                        if (numtxqueues != -1)
+                                duparg("numtxqueues", *argv);
+                        if (get_integer(&numtxqueues, *argv, 0))
+                                invarg_1_to_2(*argv, "numtxqueues");
+                        addattr_l(&req->n, sizeof(*req), IFLA_NUM_TX_QUEUES,
+                                  &numtxqueues, 4);
+                } else if (matches(*argv, "numrxqueues") == 0) {
+                        NEXT_ARG();
+                        if (numrxqueues != -1)
+                                duparg("numrxqueues", *argv);
+                        if (get_integer(&numrxqueues, *argv, 0))
+                                invarg_1_to_2(*argv, "numrxqueues");
+                        addattr_l(&req->n, sizeof(*req), IFLA_NUM_RX_QUEUES,
+                                  &numrxqueues, 4);
+                }
+#endif
                argv++;
        }
@@ -322,10 +454,6 @@ static void vlan_parse_opt(char **argv, struct nlmsghdr *n, unsigned int size)
                "802.1q\0"
                "802.1ad\0"
        ;
-        static const char str_on_off[] ALIGN1 =
-                "on\0"
-                "off\0"
-        ;
        enum {
                ARG_id = 0,
                ARG_reorder_hdr,
@@ -520,164 +648,6 @@ static int do_add_or_delete(char **argv, const unsigned rtm)
        return 0;
 }
-/* Other keywords recognized by iproute2-3.12.0: */
-#if 0
-                } else if (matches(*argv, "broadcast") == 0 ||
-                                strcmp(*argv, "brd") == 0) {
-                        NEXT_ARG();
-                        len = ll_addr_a2n(abuf, sizeof(abuf), *argv);
-                        if (len < 0)
-                                return -1;
-                        addattr_l(&req->n, sizeof(*req), IFLA_BROADCAST, abuf, len);
-                } else if (matches(*argv, "txqueuelen") == 0 ||
-                                strcmp(*argv, "qlen") == 0 ||
-                                matches(*argv, "txqlen") == 0) {
-                        NEXT_ARG();
-                        if (qlen != -1)
-                                duparg("txqueuelen", *argv);
-                        if (get_integer(&qlen,  *argv, 0))
-                                invarg_1_to_2(*argv, "txqueuelen");
-                        addattr_l(&req->n, sizeof(*req), IFLA_TXQLEN, &qlen, 4);
-                } else if (strcmp(*argv, "mtu") == 0) {
-                        NEXT_ARG();
-                        if (mtu != -1)
-                                duparg("mtu", *argv);
-                        if (get_integer(&mtu, *argv, 0))
-                                invarg_1_to_2(*argv, "mtu");
-                        addattr_l(&req->n, sizeof(*req), IFLA_MTU, &mtu, 4);
-                } else if (strcmp(*argv, "netns") == 0) {
-                        NEXT_ARG();
-                        if (netns != -1)
-                                duparg("netns", *argv);
-                        if ((netns = get_netns_fd(*argv)) >= 0)
-                                addattr_l(&req->n, sizeof(*req), IFLA_NET_NS_FD, &netns, 4);
-                        else if (get_integer(&netns, *argv, 0) == 0)
-                                addattr_l(&req->n, sizeof(*req), IFLA_NET_NS_PID, &netns, 4);
-                        else
-                                invarg_1_to_2(*argv, "netns");
-                } else if (strcmp(*argv, "multicast") == 0) {
-                        NEXT_ARG();
-                        req->i.ifi_change |= IFF_MULTICAST;
-                        if (strcmp(*argv, "on") == 0) {
-                                req->i.ifi_flags |= IFF_MULTICAST;
-                        } else if (strcmp(*argv, "off") == 0) {
-                                req->i.ifi_flags &= ~IFF_MULTICAST;
-                        } else
-                                return on_off("multicast", *argv);
-                } else if (strcmp(*argv, "allmulticast") == 0) {
-                        NEXT_ARG();
-                        req->i.ifi_change |= IFF_ALLMULTI;
-                        if (strcmp(*argv, "on") == 0) {
-                                req->i.ifi_flags |= IFF_ALLMULTI;
-                        } else if (strcmp(*argv, "off") == 0) {
-                                req->i.ifi_flags &= ~IFF_ALLMULTI;
-                        } else
-                                return on_off("allmulticast", *argv);
-                } else if (strcmp(*argv, "promisc") == 0) {
-                        NEXT_ARG();
-                        req->i.ifi_change |= IFF_PROMISC;
-                        if (strcmp(*argv, "on") == 0) {
-                                req->i.ifi_flags |= IFF_PROMISC;
-                        } else if (strcmp(*argv, "off") == 0) {
-                                req->i.ifi_flags &= ~IFF_PROMISC;
-                        } else
-                                return on_off("promisc", *argv);
-                } else if (strcmp(*argv, "trailers") == 0) {
-                        NEXT_ARG();
-                        req->i.ifi_change |= IFF_NOTRAILERS;
-                        if (strcmp(*argv, "off") == 0) {
-                                req->i.ifi_flags |= IFF_NOTRAILERS;
-                        } else if (strcmp(*argv, "on") == 0) {
-                                req->i.ifi_flags &= ~IFF_NOTRAILERS;
-                        } else
-                                return on_off("trailers", *argv);
-                } else if (strcmp(*argv, "arp") == 0) {
-                        NEXT_ARG();
-                        req->i.ifi_change |= IFF_NOARP;
-                        if (strcmp(*argv, "on") == 0) {
-                                req->i.ifi_flags &= ~IFF_NOARP;
-                        } else if (strcmp(*argv, "off") == 0) {
-                                req->i.ifi_flags |= IFF_NOARP;
-                        } else
-                                return on_off("noarp", *argv);
-                } else if (strcmp(*argv, "vf") == 0) {
-                        struct rtattr *vflist;
-                        NEXT_ARG();
-                        if (get_integer(&vf,  *argv, 0)) {
-                                invarg_1_to_2(*argv, "vf");
-                        }
-                        vflist = addattr_nest(&req->n, sizeof(*req),
-                                              IFLA_VFINFO_LIST);
-                        len = iplink_parse_vf(vf, &argc, &argv, req);
-                        if (len < 0)
-                                return -1;
-                        addattr_nest_end(&req->n, vflist);
-                } else if (matches(*argv, "master") == 0) {
-                        int ifindex;
-                        NEXT_ARG();
-                        ifindex = ll_name_to_index(*argv);
-                        if (!ifindex)
-                                invarg_1_to_2(*argv, "master");
-                        addattr_l(&req->n, sizeof(*req), IFLA_MASTER,
-                                  &ifindex, 4);
-                } else if (matches(*argv, "nomaster") == 0) {
-                        int ifindex = 0;
-                        addattr_l(&req->n, sizeof(*req), IFLA_MASTER,
-                                  &ifindex, 4);
-                } else if (matches(*argv, "dynamic") == 0) {
-                        NEXT_ARG();
-                        req->i.ifi_change |= IFF_DYNAMIC;
-                        if (strcmp(*argv, "on") == 0) {
-                                req->i.ifi_flags |= IFF_DYNAMIC;
-                        } else if (strcmp(*argv, "off") == 0) {
-                                req->i.ifi_flags &= ~IFF_DYNAMIC;
-                        } else
-                                return on_off("dynamic", *argv);
-                } else if (matches(*argv, "alias") == 0) {
-                        NEXT_ARG();
-                        addattr_l(&req->n, sizeof(*req), IFLA_IFALIAS,
-                                  *argv, strlen(*argv));
-                        argc--; argv++;
-                        break;
-                } else if (strcmp(*argv, "group") == 0) {
-                        NEXT_ARG();
-                        if (*group != -1)
-                                duparg("group", *argv);
-                        if (rtnl_group_a2n(group, *argv))
-                                invarg_1_to_2(*argv, "group");
-                } else if (strcmp(*argv, "mode") == 0) {
-                        int mode;
-                        NEXT_ARG();
-                        mode = get_link_mode(*argv);
-                        if (mode < 0)
-                                invarg_1_to_2(*argv, "mode");
-                        addattr8(&req->n, sizeof(*req), IFLA_LINKMODE, mode);
-                } else if (strcmp(*argv, "state") == 0) {
-                        int state;
-                        NEXT_ARG();
-                        state = get_operstate(*argv);
-                        if (state < 0)
-                                invarg_1_to_2(*argv, "state");
-                        addattr8(&req->n, sizeof(*req), IFLA_OPERSTATE, state);
-                } else if (matches(*argv, "numtxqueues") == 0) {
-                        NEXT_ARG();
-                        if (numtxqueues != -1)
-                                duparg("numtxqueues", *argv);
-                        if (get_integer(&numtxqueues, *argv, 0))
-                                invarg_1_to_2(*argv, "numtxqueues");
-                        addattr_l(&req->n, sizeof(*req), IFLA_NUM_TX_QUEUES,
-                                  &numtxqueues, 4);
-                } else if (matches(*argv, "numrxqueues") == 0) {
-                        NEXT_ARG();
-                        if (numrxqueues != -1)
-                                duparg("numrxqueues", *argv);
-                        if (get_integer(&numrxqueues, *argv, 0))
-                                invarg_1_to_2(*argv, "numrxqueues");
-                        addattr_l(&req->n, sizeof(*req), IFLA_NUM_RX_QUEUES,
-                                  &numrxqueues, 4);
-                }
-#endif
 /* Return value becomes exitcode. It's okay to not return at all */
 int FAST_FUNC do_iplink(char **argv)
 {
diff --git a/networking/libiproute/iproute.c b/networking/libiproute/iproute.c
index 0f2b89682..cc3443a92 100644
--- a/networking/libiproute/iproute.c
+++ b/networking/libiproute/iproute.c
@@ -322,16 +322,31 @@ static int FAST_FUNC print_route(const struct sockaddr_nl *who UNUSED_PARAM,
        return 0;
 }
+static int str_is_lock(const char *str)
+{
+        return strcmp(str, "lock") == 0;
+}
 /* Return value becomes exitcode. It's okay to not return at all */
 static int iproute_modify(int cmd, unsigned flags, char **argv)
 {
+        /* If you add stuff here, update iproute_full_usage */
        static const char keywords[] ALIGN1 =
-                "src\0""via\0""mtu\0""lock\0""scope\0""protocol\0"IF_FEATURE_IP_RULE("table\0")
+                "src\0""via\0"
+                "mtu\0""advmss\0"
+                "scope\0""protocol\0"IF_FEATURE_IP_RULE("table\0")
                "dev\0""oif\0""to\0""metric\0""onlink\0";
+#define keyword_via    (keywords       + sizeof("src"))
+#define keyword_mtu    (keyword_via    + sizeof("via"))
+#define keyword_advmss (keyword_mtu    + sizeof("mtu"))
+#define keyword_scope  (keyword_advmss + sizeof("advmss"))
+#define keyword_proto  (keyword_scope  + sizeof("scope"))
+#define keyword_table  (keyword_proto  + sizeof("protocol"))
        enum {
                ARG_src,
                ARG_via,
-                ARG_mtu, PARM_lock,
+                ARG_mtu,
+                ARG_advmss,
                ARG_scope,
                ARG_protocol,
 IF_FEATURE_IP_RULE(ARG_table,)
@@ -404,24 +419,33 @@ IF_FEATURE_IP_RULE(ARG_table,)
                } else if (arg == ARG_mtu) {
                        unsigned mtu;
                        NEXT_ARG();
-                        if (index_in_strings(keywords, *argv) == PARM_lock) {
+                        if (str_is_lock(*argv)) {
                                mxlock |= (1 << RTAX_MTU);
                                NEXT_ARG();
                        }
-                        mtu = get_unsigned(*argv, "mtu");
+                        mtu = get_unsigned(*argv, keyword_mtu);
                        rta_addattr32(mxrta, sizeof(mxbuf), RTAX_MTU, mtu);
+                } else if (arg == ARG_advmss) {
+                        unsigned mss;
+                        NEXT_ARG();
+                        if (str_is_lock(*argv)) {
+                                mxlock |= (1 << RTAX_ADVMSS);
+                                NEXT_ARG();
+                        }
+                        mss = get_unsigned(*argv, keyword_advmss);
+                        rta_addattr32(mxrta, sizeof(mxbuf), RTAX_ADVMSS, mss);
                } else if (arg == ARG_scope) {
                        uint32_t scope;
                        NEXT_ARG();
                        if (rtnl_rtscope_a2n(&scope, *argv))
-                                invarg_1_to_2(*argv, "scope");
+                                invarg_1_to_2(*argv, keyword_scope);
                        req.r.rtm_scope = scope;
                        scope_ok = 1;
                } else if (arg == ARG_protocol) {
                        uint32_t prot;
                        NEXT_ARG();
                        if (rtnl_rtprot_a2n(&prot, *argv))
-                                invarg_1_to_2(*argv, "protocol");
+                                invarg_1_to_2(*argv, keyword_proto);
                        req.r.rtm_protocol = prot;
                        ok |= proto_ok;
 #if ENABLE_FEATURE_IP_RULE
@@ -429,7 +453,7 @@ IF_FEATURE_IP_RULE(ARG_table,)
                        uint32_t tid;
                        NEXT_ARG();
                        if (rtnl_rttable_a2n(&tid, *argv))
-                                invarg_1_to_2(*argv, "table");
+                                invarg_1_to_2(*argv, keyword_table);
                        if (tid < 256)
                                req.r.rtm_table = tid;
                        else {
@@ -441,6 +465,7 @@ IF_FEATURE_IP_RULE(ARG_table,)
                        NEXT_ARG();
                        d = *argv;
                } else if (arg == ARG_metric) {
+//TODO: "metric", "priority" and "preference" are synonyms
                        uint32_t metric;
                        NEXT_ARG();
                        metric = get_u32(*argv, "metric");
@@ -475,6 +500,158 @@ IF_FEATURE_IP_RULE(ARG_table,)
                                addattr_l(&req.n, sizeof(req), RTA_DST, &dst.data, dst.bytelen);
                        }
                }
+/* Other keywords recognized by iproute2-3.19.0: */
+#if 0
+                } else if (strcmp(*argv, "from") == 0) {
+                        inet_prefix addr;
+                        NEXT_ARG();
+                        get_prefix(&addr, *argv, req.r.rtm_family);
+                        if (req.r.rtm_family == AF_UNSPEC)
+                                req.r.rtm_family = addr.family;
+                        if (addr.bytelen)
+                                addattr_l(&req.n, sizeof(req), RTA_SRC, &addr.data, addr.bytelen);
+                        req.r.rtm_src_len = addr.bitlen;
+                } else if (strcmp(*argv, "tos") == 0 ||
+                           matches(*argv, "dsfield") == 0) {
+                        __u32 tos;
+                        NEXT_ARG();
+                        if (rtnl_dsfield_a2n(&tos, *argv))
+                                invarg("\"tos\" value is invalid\n", *argv);
+                        req.r.rtm_tos = tos;
+                } else if (strcmp(*argv, "hoplimit") == 0) {
+                        unsigned hoplimit;
+                        NEXT_ARG();
+                        if (strcmp(*argv, "lock") == 0) {
+                                mxlock |= (1<<RTAX_HOPLIMIT);
+                                NEXT_ARG();
+                        }
+                        if (get_unsigned(&hoplimit, *argv, 0))
+                                invarg("\"hoplimit\" value is invalid\n", *argv);
+                        rta_addattr32(mxrta, sizeof(mxbuf), RTAX_HOPLIMIT, hoplimit);
+                } else if (matches(*argv, "reordering") == 0) {
+                        unsigned reord;
+                        NEXT_ARG();
+                        if (strcmp(*argv, "lock") == 0) {
+                                mxlock |= (1<<RTAX_REORDERING);
+                                NEXT_ARG();
+                        }
+                        if (get_unsigned(&reord, *argv, 0))
+                                invarg("\"reordering\" value is invalid\n", *argv);
+                        rta_addattr32(mxrta, sizeof(mxbuf), RTAX_REORDERING, reord);
+                } else if (strcmp(*argv, "rtt") == 0) {
+                        unsigned rtt;
+                        NEXT_ARG();
+                        if (strcmp(*argv, "lock") == 0) {
+                                mxlock |= (1<<RTAX_RTT);
+                                NEXT_ARG();
+                        }
+                        if (get_time_rtt(&rtt, *argv, &raw))
+                                invarg("\"rtt\" value is invalid\n", *argv);
+                        rta_addattr32(mxrta, sizeof(mxbuf), RTAX_RTT,
+                                (raw) ? rtt : rtt * 8);
+                } else if (strcmp(*argv, "rto_min") == 0) {
+                        unsigned rto_min;
+                        NEXT_ARG();
+                        mxlock |= (1<<RTAX_RTO_MIN);
+                        if (get_time_rtt(&rto_min, *argv, &raw))
+                                invarg("\"rto_min\" value is invalid\n",
+                                       *argv);
+                        rta_addattr32(mxrta, sizeof(mxbuf), RTAX_RTO_MIN,
+                                      rto_min);
+                } else if (matches(*argv, "window") == 0) {
+                        unsigned win;
+                        NEXT_ARG();
+                        if (strcmp(*argv, "lock") == 0) {
+                                mxlock |= (1<<RTAX_WINDOW);
+                                NEXT_ARG();
+                        }
+                        if (get_unsigned(&win, *argv, 0))
+                                invarg("\"window\" value is invalid\n", *argv);
+                        rta_addattr32(mxrta, sizeof(mxbuf), RTAX_WINDOW, win);
+                } else if (matches(*argv, "cwnd") == 0) {
+                        unsigned win;
+                        NEXT_ARG();
+                        if (strcmp(*argv, "lock") == 0) {
+                                mxlock |= (1<<RTAX_CWND);
+                                NEXT_ARG();
+                        }
+                        if (get_unsigned(&win, *argv, 0))
+                                invarg("\"cwnd\" value is invalid\n", *argv);
+                        rta_addattr32(mxrta, sizeof(mxbuf), RTAX_CWND, win);
+                } else if (matches(*argv, "initcwnd") == 0) {
+                        unsigned win;
+                        NEXT_ARG();
+                        if (strcmp(*argv, "lock") == 0) {
+                                mxlock |= (1<<RTAX_INITCWND);
+                                NEXT_ARG();
+                        }
+                        if (get_unsigned(&win, *argv, 0))
+                                invarg("\"initcwnd\" value is invalid\n", *argv);
+                        rta_addattr32(mxrta, sizeof(mxbuf), RTAX_INITCWND, win);
+                } else if (matches(*argv, "initrwnd") == 0) {
+                        unsigned win;
+                        NEXT_ARG();
+                        if (strcmp(*argv, "lock") == 0) {
+                                mxlock |= (1<<RTAX_INITRWND);
+                                NEXT_ARG();
+                        }
+                        if (get_unsigned(&win, *argv, 0))
+                                invarg("\"initrwnd\" value is invalid\n", *argv);
+                        rta_addattr32(mxrta, sizeof(mxbuf), RTAX_INITRWND, win);
+                } else if (matches(*argv, "features") == 0) {
+                        unsigned int features = 0;
+                        while (argc > 0) {
+                                NEXT_ARG();
+                                if (strcmp(*argv, "ecn") == 0)
+                                        features |= RTAX_FEATURE_ECN;
+                                else
+                                        invarg("\"features\" value not valid\n", *argv);
+                                break;
+                        }
+                        rta_addattr32(mxrta, sizeof(mxbuf), RTAX_FEATURES, features);
+                } else if (matches(*argv, "quickack") == 0) {
+                        unsigned quickack;
+                        NEXT_ARG();
+                        if (get_unsigned(&quickack, *argv, 0))
+                                invarg("\"quickack\" value is invalid\n", *argv);
+                        if (quickack != 1 && quickack != 0)
+                                invarg("\"quickack\" value should be 0 or 1\n", *argv);
+                        rta_addattr32(mxrta, sizeof(mxbuf), RTAX_QUICKACK, quickack);
+                } else if (matches(*argv, "rttvar") == 0) {
+                        unsigned win;
+                        NEXT_ARG();
+                        if (strcmp(*argv, "lock") == 0) {
+                                mxlock |= (1<<RTAX_RTTVAR);
+                                NEXT_ARG();
+                        }
+                        if (get_time_rtt(&win, *argv, &raw))
+                                invarg("\"rttvar\" value is invalid\n", *argv);
+                        rta_addattr32(mxrta, sizeof(mxbuf), RTAX_RTTVAR,
+                                (raw) ? win : win * 4);
+                } else if (matches(*argv, "ssthresh") == 0) {
+                        unsigned win;
+                        NEXT_ARG();
+                        if (strcmp(*argv, "lock") == 0) {
+                                mxlock |= (1<<RTAX_SSTHRESH);
+                                NEXT_ARG();
+                        }
+                        if (get_unsigned(&win, *argv, 0))
+                                invarg("\"ssthresh\" value is invalid\n", *argv);
+                        rta_addattr32(mxrta, sizeof(mxbuf), RTAX_SSTHRESH, win);
+                } else if (matches(*argv, "realms") == 0) {
+                        __u32 realm;
+                        NEXT_ARG();
+                        if (get_rt_realms(&realm, *argv))
+                                invarg("\"realm\" value is invalid\n", *argv);
+                        addattr32(&req.n, sizeof(req), RTA_FLOW, realm);
+                } else if (strcmp(*argv, "nexthop") == 0) {
+                        nhs_ok = 1;
+                        break;
+                }
+#endif
                argv++;
        }
@@ -912,9 +1089,15 @@ static int iproute_get(char **argv)
 int FAST_FUNC do_iproute(char **argv)
 {
        static const char ip_route_commands[] ALIGN1 =
-        /*0-3*/ "add\0""append\0""change\0""chg\0"
+                "a\0""add\0""append\0""change\0""chg\0"
-        /*4-7*/ "delete\0""get\0""list\0""show\0"
+                "delete\0""get\0""list\0""show\0"
-        /*8..*/ "prepend\0""replace\0""test\0""flush\0";
+                "prepend\0""replace\0""test\0""flush\0"
+        ;
+        enum {
+                CMD_a = 0, CMD_add, CMD_append, CMD_change, CMD_chg,
+                CMD_delete, CMD_get, CMD_list, CMD_show,
+                CMD_prepend, CMD_replace, CMD_test, CMD_flush,
+        };
        int command_num;
        unsigned flags = 0;
        int cmd = RTM_NEWROUTE;
@@ -929,38 +1112,39 @@ int FAST_FUNC do_iproute(char **argv)
        command_num = index_in_substrings(ip_route_commands, *argv);
        switch (command_num) {
-                case 0: /* add */
+                case CMD_a:
+                case CMD_add:
                        flags = NLM_F_CREATE|NLM_F_EXCL;
                        break;
-                case 1: /* append */
+                case CMD_append:
                        flags = NLM_F_CREATE|NLM_F_APPEND;
                        break;
-                case 2: /* change */
+                case CMD_change:
-                case 3: /* chg */
+                case CMD_chg:
                        flags = NLM_F_REPLACE;
                        break;
-                case 4: /* delete */
+                case CMD_delete:
                        cmd = RTM_DELROUTE;
                        break;
-                case 5: /* get */
+                case CMD_get:
-                        return iproute_get(argv+1);
+                        return iproute_get(argv + 1);
-                case 6: /* list */
+                case CMD_list:
-                case 7: /* show */
+                case CMD_show:
-                        return iproute_list_or_flush(argv+1, 0);
+                        return iproute_list_or_flush(argv + 1, 0);
-                case 8: /* prepend */
+                case CMD_prepend:
                        flags = NLM_F_CREATE;
                        break;
-                case 9: /* replace */
+                case CMD_replace:
                        flags = NLM_F_CREATE|NLM_F_REPLACE;
                        break;
-                case 10: /* test */
+                case CMD_test:
                        flags = NLM_F_EXCL;
                        break;
-                case 11: /* flush */
+                case CMD_flush:
-                        return iproute_list_or_flush(argv+1, 1);
+                        return iproute_list_or_flush(argv + 1, 1);
                default:
                        invarg_1_to_2(*argv, applet_name);
        }
-        return iproute_modify(cmd, flags, argv+1);
+        return iproute_modify(cmd, flags, argv + 1);
 }
diff --git a/networking/libiproute/utils.c b/networking/libiproute/utils.c
index 42025bc66..fca167ac6 100644
--- a/networking/libiproute/utils.c
+++ b/networking/libiproute/utils.c
@@ -13,7 +13,7 @@
 #include "utils.h"
 #include "inet_common.h"
-unsigned get_hz(void)
+unsigned FAST_FUNC get_hz(void)
 {
        static unsigned hz_internal;
        FILE *fp;
@@ -35,7 +35,7 @@ unsigned get_hz(void)
        return hz_internal;
 }
-unsigned get_unsigned(char *arg, const char *errmsg)
+unsigned FAST_FUNC get_unsigned(char *arg, const char *errmsg)
 {
        unsigned long res;
        char *ptr;
@@ -50,7 +50,7 @@ unsigned get_unsigned(char *arg, const char *errmsg)
        invarg_1_to_2(arg, errmsg); /* does not return */
 }
-uint32_t get_u32(char *arg, const char *errmsg)
+uint32_t FAST_FUNC get_u32(char *arg, const char *errmsg)
 {
        unsigned long res;
        char *ptr;
@@ -65,7 +65,7 @@ uint32_t get_u32(char *arg, const char *errmsg)
        invarg_1_to_2(arg, errmsg); /* does not return */
 }
-uint16_t get_u16(char *arg, const char *errmsg)
+uint16_t FAST_FUNC get_u16(char *arg, const char *errmsg)
 {
        unsigned long res;
        char *ptr;
@@ -80,7 +80,7 @@ uint16_t get_u16(char *arg, const char *errmsg)
        invarg_1_to_2(arg, errmsg); /* does not return */
 }
-int get_addr_1(inet_prefix *addr, char *name, int family)
+int FAST_FUNC get_addr_1(inet_prefix *addr, char *name, int family)
 {
        memset(addr, 0, sizeof(*addr));
@@ -199,7 +199,7 @@ static void get_prefix_1(inet_prefix *dst, char *arg, int family)
        bb_error_msg_and_die("an %s %s is expected rather than \"%s\"", "inet", "prefix", arg);
 }
-int get_addr(inet_prefix *dst, char *arg, int family)
+int FAST_FUNC get_addr(inet_prefix *dst, char *arg, int family)
 {
        if (family == AF_PACKET) {
                bb_error_msg_and_die("\"%s\" may be inet %s, but it is not allowed in this context", arg, "address");
@@ -210,7 +210,7 @@ int get_addr(inet_prefix *dst, char *arg, int family)
        return 0;
 }
-void get_prefix(inet_prefix *dst, char *arg, int family)
+void FAST_FUNC get_prefix(inet_prefix *dst, char *arg, int family)
 {
        if (family == AF_PACKET) {
                bb_error_msg_and_die("\"%s\" may be inet %s, but it is not allowed in this context", arg, "prefix");
@@ -218,7 +218,7 @@ void get_prefix(inet_prefix *dst, char *arg, int family)
        get_prefix_1(dst, arg, family);
 }
-uint32_t get_addr32(char *name)
+uint32_t FAST_FUNC get_addr32(char *name)
 {
        inet_prefix addr;
@@ -228,27 +228,29 @@ uint32_t get_addr32(char *name)
        return addr.data[0];
 }
-void incomplete_command(void)
+char** FAST_FUNC next_arg(char **argv)
 {
-        bb_error_msg_and_die("command line is not complete, try \"help\"");
+        if (!*++argv)
+                bb_error_msg_and_die("command line is not complete, try \"help\"");
+        return argv;
 }
-void invarg_1_to_2(const char *arg, const char *opt)
+void FAST_FUNC invarg_1_to_2(const char *arg, const char *opt)
 {
        bb_error_msg_and_die(bb_msg_invalid_arg_to, arg, opt);
 }
-void duparg(const char *key, const char *arg)
+void FAST_FUNC duparg(const char *key, const char *arg)
 {
        bb_error_msg_and_die("duplicate \"%s\": \"%s\" is the second value", key, arg);
 }
-void duparg2(const char *key, const char *arg)
+void FAST_FUNC duparg2(const char *key, const char *arg)
 {
        bb_error_msg_and_die("either \"%s\" is duplicate, or \"%s\" is garbage", key, arg);
 }
-int inet_addr_match(const inet_prefix *a, const inet_prefix *b, int bits)
+int FAST_FUNC inet_addr_match(const inet_prefix *a, const inet_prefix *b, int bits)
 {
        const uint32_t *a1 = a->data;
        const uint32_t *a2 = b->data;
@@ -276,7 +278,7 @@ int inet_addr_match(const inet_prefix *a, const inet_prefix *b, int bits)
        return 0;
 }
-const char *rt_addr_n2a(int af, void *addr)
+const char* FAST_FUNC rt_addr_n2a(int af, void *addr)
 {
        switch (af) {
        case AF_INET:
@@ -290,7 +292,7 @@ const char *rt_addr_n2a(int af, void *addr)
 }
 #ifdef RESOLVE_HOSTNAMES
-const char *format_host(int af, int len, void *addr)
+const char* FAST_FUNC format_host(int af, int len, void *addr)
 {
        if (resolve_hosts) {
                struct hostent *h_ent;
diff --git a/networking/libiproute/utils.h b/networking/libiproute/utils.h
index 408d5f65f..55490980d 100644
--- a/networking/libiproute/utils.h
+++ b/networking/libiproute/utils.h
@@ -26,10 +26,6 @@ extern char _SL_;
 #define SPRINT_BSIZE 64
 #define SPRINT_BUF(x)  char x[SPRINT_BSIZE]
-extern void incomplete_command(void) NORETURN;
-#define NEXT_ARG() do { if (!*++argv) incomplete_command(); } while (0)
 typedef struct {
        uint8_t family;
        uint8_t bytelen;
@@ -56,36 +52,40 @@ struct ipx_addr {
        uint8_t  ipx_node[IPX_NODE_LEN];
 };
-extern uint32_t get_addr32(char *name);
+char** next_arg(char **argv) FAST_FUNC;
-extern int get_addr_1(inet_prefix *dst, char *arg, int family);
+#define NEXT_ARG() do { argv = next_arg(argv); } while (0)
-/*extern void get_prefix_1(inet_prefix *dst, char *arg, int family);*/
-extern int get_addr(inet_prefix *dst, char *arg, int family);
-extern void get_prefix(inet_prefix *dst, char *arg, int family);
-extern unsigned get_unsigned(char *arg, const char *errmsg);
+uint32_t get_addr32(char *name) FAST_FUNC;
-extern uint32_t get_u32(char *arg, const char *errmsg);
+int get_addr_1(inet_prefix *dst, char *arg, int family) FAST_FUNC;
-extern uint16_t get_u16(char *arg, const char *errmsg);
+/*void get_prefix_1(inet_prefix *dst, char *arg, int family) FAST_FUNC;*/
+int get_addr(inet_prefix *dst, char *arg, int family) FAST_FUNC;
+void get_prefix(inet_prefix *dst, char *arg, int family) FAST_FUNC;
-extern const char *rt_addr_n2a(int af, void *addr);
+unsigned get_unsigned(char *arg, const char *errmsg) FAST_FUNC;
+uint32_t get_u32(char *arg, const char *errmsg) FAST_FUNC;
+uint16_t get_u16(char *arg, const char *errmsg) FAST_FUNC;
+const char *rt_addr_n2a(int af, void *addr) FAST_FUNC;
 #ifdef RESOLVE_HOSTNAMES
-extern const char *format_host(int af, int len, void *addr);
+const char *format_host(int af, int len, void *addr) FAST_FUNC;
 #else
 #define format_host(af, len, addr) \
        rt_addr_n2a(af, addr)
 #endif
-void invarg_1_to_2(const char *, const char *) NORETURN;
+void invarg_1_to_2(const char *, const char *) FAST_FUNC NORETURN;
-void duparg(const char *, const char *) NORETURN;
+void duparg(const char *, const char *) FAST_FUNC NORETURN;
-void duparg2(const char *, const char *) NORETURN;
+void duparg2(const char *, const char *) FAST_FUNC NORETURN;
-int inet_addr_match(const inet_prefix *a, const inet_prefix *b, int bits);
+int inet_addr_match(const inet_prefix *a, const inet_prefix *b, int bits) FAST_FUNC;
-const char *dnet_ntop(int af, const void *addr, char *str, size_t len);
+//const char *dnet_ntop(int af, const void *addr, char *str, size_t len);
-int dnet_pton(int af, const char *src, void *addr);
+//int dnet_pton(int af, const char *src, void *addr);
-const char *ipx_ntop(int af, const void *addr, char *str, size_t len);
+//const char *ipx_ntop(int af, const void *addr, char *str, size_t len);
-int ipx_pton(int af, const char *src, void *addr);
+//int ipx_pton(int af, const char *src, void *addr);
-unsigned get_hz(void);
+unsigned get_hz(void) FAST_FUNC;
 POP_SAVED_FUNCTION_VISIBILITY
diff --git a/networking/nc.c b/networking/nc.c
index 1b70434ac..d2b1ddcce 100644
--- a/networking/nc.c
+++ b/networking/nc.c
@@ -117,7 +117,7 @@ int nc_main(int argc, char **argv)
        IF_NOT_NC_EXTRA (const) unsigned delay = 0;
        IF_NOT_NC_EXTRA (const int execparam = 0;)
        IF_NC_EXTRA     (char **execparam = NULL;)
-        fd_set readfds, testfds;
+        struct pollfd pfds[2];
        int opt; /* must be signed (getopt returns -1) */
        if (ENABLE_NC_SERVER || ENABLE_NC_EXTRA) {
@@ -235,29 +235,28 @@ int nc_main(int argc, char **argv)
                IF_NC_EXTRA(bb_perror_msg_and_die("can't execute '%s'", execparam[0]);)
        }
-        /* Select loop copying stdin to cfd, and cfd to stdout */
+        /* loop copying stdin to cfd, and cfd to stdout */
-        FD_ZERO(&readfds);
+        pfds[0].fd = STDIN_FILENO;
-        FD_SET(cfd, &readfds);
+        pfds[0].events = POLLIN;
-        FD_SET(STDIN_FILENO, &readfds);
+        pfds[1].fd = cfd;
+        pfds[1].events = POLLIN;
 #define iobuf bb_common_bufsiz1
        setup_common_bufsiz();
        for (;;) {
-                int fd;
+                int fdidx;
                int ofd;
                int nread;
-                testfds = readfds;
+                if (safe_poll(pfds, 2, -1) < 0)
+                        bb_perror_msg_and_die("poll");
-                if (select(cfd + 1, &testfds, NULL, NULL, NULL) < 0)
+                fdidx = 0;
-                        bb_perror_msg_and_die("select");
-                fd = STDIN_FILENO;
                while (1) {
-                        if (FD_ISSET(fd, &testfds)) {
+                        if (pfds[fdidx].revents) {
-                                nread = safe_read(fd, iobuf, COMMON_BUFSIZE);
+                                nread = safe_read(pfds[fdidx].fd, iobuf, COMMON_BUFSIZE);
-                                if (fd == cfd) {
+                                if (fdidx != 0) {
                                        if (nread < 1)
                                                exit(EXIT_SUCCESS);
                                        ofd = STDOUT_FILENO;
@@ -266,7 +265,7 @@ int nc_main(int argc, char **argv)
                                                /* Close outgoing half-connection so they get EOF,
                                                 * but leave incoming alone so we can see response */
                                                shutdown(cfd, SHUT_WR);
-                                                FD_CLR(STDIN_FILENO, &readfds);
+                                                pfds[0].fd = -1;
                                        }
                                        ofd = cfd;
                                }
@@ -274,9 +273,9 @@ int nc_main(int argc, char **argv)
                                if (delay > 0)
                                        sleep(delay);
                        }
-                        if (fd == cfd)
+                        if (fdidx == 1)
                                break;
-                        fd = cfd;
+                        fdidx++;
                }
        }
 }
diff --git a/networking/nc_bloaty.c b/networking/nc_bloaty.c
index 192e42fe5..3db784982 100644
--- a/networking/nc_bloaty.c
+++ b/networking/nc_bloaty.c
@@ -459,7 +459,7 @@ create new one, and bind() it. TODO */
         so I don't feel bad.
         The *real* question is why BFD sockets wasn't designed to allow listens for
         connections *from* specific hosts/ports, instead of requiring the caller to
-         accept the connection and then reject undesireable ones by closing.
+         accept the connection and then reject undesirable ones by closing.
         In other words, we need a TCP MSG_PEEK. */
        /* bbox: removed most of it */
                lcladdr = xmalloc_sockaddr2dotted(&ouraddr->u.sa);
@@ -502,7 +502,7 @@ static int udptest(void)
        /* use the tcp-ping trick: try connecting to a normally refused port, which
         causes us to block for the time that SYN gets there and RST gets back.
         Not completely reliable, but it *does* mostly work. */
-        /* Set a temporary connect timeout, so packet filtration doesnt cause
+        /* Set a temporary connect timeout, so packet filtration doesn't cause
         us to hang forever, and hit it */
                o_wait = 5;                     /* enough that we'll notice?? */
                rr = xsocket(ouraddr->u.sa.sa_family, SOCK_STREAM, 0);
@@ -582,11 +582,10 @@ void oprint(int direction, unsigned char *p, unsigned bc);
 #endif
 /* readwrite:
- handle stdin/stdout/network I/O.  Bwahaha!! -- the select loop from hell.
+ handle stdin/stdout/network I/O.  Bwahaha!! -- the i/o loop from hell.
 In this instance, return what might become our exit status. */
 static int readwrite(void)
 {
-        int rr;
        char *zp = zp; /* gcc */  /* stdin buf ptr */
        char *np = np;            /* net-in buf ptr */
        unsigned rzleft;
@@ -594,45 +593,41 @@ static int readwrite(void)
        unsigned netretry;              /* net-read retry counter */
        unsigned fds_open;
-        /* if you don't have all this FD_* macro hair in sys/types.h, you'll have to
+        struct pollfd pfds[2];
-         either find it or do your own bit-bashing: *ding1 |= (1 << fd), etc... */
+        pfds[0].fd = STDIN_FILENO;
-        fd_set ding1;                   /* for select loop */
+        pfds[0].events = POLLIN;
-        fd_set ding2;
+        pfds[1].fd = netfd;
-        FD_ZERO(&ding1);
+        pfds[1].events = POLLIN;
-        FD_SET(netfd, &ding1);
-        FD_SET(STDIN_FILENO, &ding1);
-        fds_open = 2;
+        fds_open = 2;
        netretry = 2;
        rzleft = rnleft = 0;
        if (o_interval)
                sleep(o_interval);                /* pause *before* sending stuff, too */
-        /* and now the big ol' select shoveling loop ... */
+        /* and now the big ol' shoveling loop ... */
        /* nc 1.10 has "while (FD_ISSET(netfd)" here */
        while (fds_open) {
+                int rr;
+                int poll_tmout_ms;
                unsigned wretry = 8200;               /* net-write sanity counter */
-                ding2 = ding1;                        /* FD_COPY ain't portable... */
+                poll_tmout_ms = -1;
-        /* some systems, notably linux, crap into their select timers on return, so
-         we create a expendable copy and give *that* to select.  */
                if (o_wait) {
-                        struct timeval tmp_timer;
+                        poll_tmout_ms = INT_MAX;
-                        tmp_timer.tv_sec = o_wait;
+                        if (o_wait < INT_MAX / 1000)
-                        tmp_timer.tv_usec = 0;
+                                poll_tmout_ms = o_wait * 1000;
-                /* highest possible fd is netfd (3) */
+                }
-                        rr = select(netfd+1, &ding2, NULL, NULL, &tmp_timer);
+                rr = poll(pfds, 2, poll_tmout_ms);
-                } else
-                        rr = select(netfd+1, &ding2, NULL, NULL, NULL);
                if (rr < 0 && errno != EINTR) {                /* might have gotten ^Zed, etc */
-                        holler_perror("select");
+                        holler_perror("poll");
                        close(netfd);
                        return 1;
                }
        /* if we have a timeout AND stdin is closed AND we haven't heard anything
         from the net during that time, assume it's dead and close it too. */
                if (rr == 0) {
-                        if (!FD_ISSET(STDIN_FILENO, &ding1)) {
+                        if (!pfds[0].revents) {
                                netretry--;                        /* we actually try a coupla times. */
                                if (!netretry) {
                                        if (o_verbose > 1)         /* normally we don't care */
@@ -641,19 +636,17 @@ static int readwrite(void)
                                        return 0;                  /* not an error! */
                                }
                        }
-                } /* select timeout */
+                } /* timeout */
-        /* xxx: should we check the exception fds too?  The read fds seem to give
-         us the right info, and none of the examples I found bothered. */
        /* Ding!!  Something arrived, go check all the incoming hoppers, net first */
-                if (FD_ISSET(netfd, &ding2)) {                /* net: ding! */
+                if (pfds[1].revents) {                /* net: ding! */
                        rr = read(netfd, bigbuf_net, BIGSIZ);
                        if (rr <= 0) {
                                if (rr < 0 && o_verbose > 1) {
                                        /* nc 1.10 doesn't do this */
                                        bb_perror_msg("net read");
                                }
-                                FD_CLR(netfd, &ding1);                /* net closed */
+                                pfds[1].fd = -1;                   /* don't poll for netfd anymore */
                                fds_open--;
                                rzleft = 0;                        /* can't write anymore: broken pipe */
                        } else {
@@ -669,12 +662,12 @@ Debug("got %d from the net, errno %d", rr, errno);
                        goto shovel;
        /* okay, suck more stdin */
-                if (FD_ISSET(STDIN_FILENO, &ding2)) {                /* stdin: ding! */
+                if (pfds[0].revents) {                /* stdin: ding! */
                        rr = read(STDIN_FILENO, bigbuf_in, BIGSIZ);
        /* Considered making reads here smaller for UDP mode, but 8192-byte
         mobygrams are kinda fun and exercise the reassembler. */
                        if (rr <= 0) {                        /* at end, or fukt, or ... */
-                                FD_CLR(STDIN_FILENO, &ding1); /* disable stdin */
+                                pfds[0].fd = -1;              /* disable stdin */
                                /*close(STDIN_FILENO); - not really necessary */
                                /* Let peer know we have no more data */
                                /* nc 1.10 doesn't do this: */
@@ -718,7 +711,7 @@ Debug("wrote %d to net, errno %d", rr, errno);
                } /* rzleft */
                if (o_interval) {                        /* cycle between slow lines, or ... */
                        sleep(o_interval);
-                        continue;                        /* ...with hairy select loop... */
+                        continue;                        /* ...with hairy loop... */
                }
                if (rzleft || rnleft) {                  /* shovel that shit till they ain't */
                        wretry--;                        /* none left, and get another load */
diff --git a/networking/ntpd.c b/networking/ntpd.c
index 5cc71ca7a..73d27ac20 100644
--- a/networking/ntpd.c
+++ b/networking/ntpd.c
@@ -393,7 +393,7 @@ struct globals {
         * too big and we will step. I observed it with -6.
         *
         * OTOH, setting precision_sec far too small would result in futile
-         * attempts to syncronize to an unachievable precision.
+         * attempts to synchronize to an unachievable precision.
         *
         * -6 is 1/64 sec, -7 is 1/128 sec and so on.
         * -8 is 1/256 ~= 0.003906 (worked well for me --vda)
@@ -754,7 +754,7 @@ reset_peer_stats(peer_t *p, double offset)
        bool small_ofs = fabs(offset) < STEP_THRESHOLD;
        /* Used to set p->filter_datapoint[i].d_dispersion = MAXDISP
-         * and clear reachable bits, but this proved to be too agressive:
+         * and clear reachable bits, but this proved to be too aggressive:
         * after step (tested with suspending laptop for ~30 secs),
         * this caused all previous data to be considered invalid,
         * making us needing to collect full ~8 datapoints per peer
@@ -1715,7 +1715,7 @@ update_local_clock(peer_t *p)
         * It looks like Linux kernel's PLL is far too gentle in changing
         * tmx.freq in response to clock offset. Offset keeps growing
         * and eventually we fall back to smaller poll intervals.
-         * We can make correction more agressive (about x2) by supplying
+         * We can make correction more aggressive (about x2) by supplying
         * PLL time constant which is one less than the real one.
         * To be on a safe side, let's do it only if offset is significantly
         * larger than jitter.
diff --git a/networking/ping.c b/networking/ping.c
index ef31e000b..94fb007f5 100644
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -478,7 +478,7 @@ static void sendping_tail(void (*sp)(int), int size_pkt)
        } else { /* -c NN, and all NN are sent (and no deadline) */
                /* Wait for the last ping to come back.
                 * -W timeout: wait for a response in seconds.
-                 * Affects only timeout in absense of any responses,
+                 * Affects only timeout in absence of any responses,
                 * otherwise ping waits for two RTTs. */
                unsigned expire = timeout;
@@ -712,7 +712,7 @@ static void ping4(len_and_sockaddr *lsa)
        if (opt_ttl != 0) {
                setsockopt_int(pingsock, IPPROTO_IP, IP_TTL, opt_ttl);
-                /* above doesnt affect packets sent to bcast IP, so... */
+                /* above doesn't affect packets sent to bcast IP, so... */
                setsockopt_int(pingsock, IPPROTO_IP, IP_MULTICAST_TTL, opt_ttl);
        }
diff --git a/networking/tcpudp.c b/networking/tcpudp.c
index 3a6c68646..3ebe7d5fc 100644
--- a/networking/tcpudp.c
+++ b/networking/tcpudp.c
@@ -683,7 +683,7 @@ prog
 -E
    no special environment. Do not set up TCP-related environment variables.
 -v
-    verbose. Print verbose messsages to standard output.
+    verbose. Print verbose messages to standard output.
 -vv
    more verbose. Print more verbose messages to standard output.
    * no difference between -v and -vv in busyboxed version
diff --git a/networking/tls.c b/networking/tls.c
index 30afd9ea9..db518bf90 100644
--- a/networking/tls.c
+++ b/networking/tls.c
@@ -39,7 +39,7 @@
 // works against "openssl s_server -cipher NULL"
 // and against wolfssl-3.9.10-stable/examples/server/server.c:
-//#define CIPHER_ID TLS_RSA_WITH_NULL_SHA256 // for testing (does everything except encrypting)
+//#define CIPHER_ID1 TLS_RSA_WITH_NULL_SHA256 // for testing (does everything except encrypting)
 // works against wolfssl-3.9.10-stable/examples/server/server.c
 // works for kernel.org
@@ -367,11 +367,12 @@ static unsigned hmac_sha_precomputed_v(
        return sha_end(&pre->hashed_key_xor_opad, out);
 }
-static void hmac_sha256_begin(hmac_precomputed_t *pre, uint8_t *key, unsigned key_size)
+typedef void md5sha_begin_func(md5sha_ctx_t *ctx) FAST_FUNC;
+static void hmac_begin(hmac_precomputed_t *pre, uint8_t *key, unsigned key_size, md5sha_begin_func *begin)
 {
        uint8_t key_xor_ipad[SHA_INSIZE];
        uint8_t key_xor_opad[SHA_INSIZE];
-        uint8_t tempkey[SHA256_OUTSIZE];
+        uint8_t tempkey[SHA1_OUTSIZE < SHA256_OUTSIZE ? SHA256_OUTSIZE : SHA1_OUTSIZE];
        unsigned i;
        // "The authentication key can be of any length up to INSIZE, the
@@ -380,7 +381,7 @@ static void hmac_sha256_begin(hmac_precomputed_t *pre, uint8_t *key, unsigned ke
        // resultant OUTSIZE byte string as the actual key to HMAC."
        if (key_size > SHA_INSIZE) {
                md5sha_ctx_t ctx;
-                sha256_begin(&ctx);
+                begin(&ctx);
                md5sha_hash(&ctx, key, key_size);
                key_size = sha_end(&ctx, tempkey);
        }
@@ -394,41 +395,8 @@ static void hmac_sha256_begin(hmac_precomputed_t *pre, uint8_t *key, unsigned ke
                key_xor_opad[i] = 0x5c;
        }
-        sha256_begin(&pre->hashed_key_xor_ipad);
+        begin(&pre->hashed_key_xor_ipad);
-        sha256_begin(&pre->hashed_key_xor_opad);
+        begin(&pre->hashed_key_xor_opad);
-        md5sha_hash(&pre->hashed_key_xor_ipad, key_xor_ipad, SHA_INSIZE);
-        md5sha_hash(&pre->hashed_key_xor_opad, key_xor_opad, SHA_INSIZE);
-}
-// TODO: ^^^ vvv merge?
-static void hmac_sha1_begin(hmac_precomputed_t *pre, uint8_t *key, unsigned key_size)
-{
-        uint8_t key_xor_ipad[SHA_INSIZE];
-        uint8_t key_xor_opad[SHA_INSIZE];
-        uint8_t tempkey[SHA1_OUTSIZE];
-        unsigned i;
-        // "The authentication key can be of any length up to INSIZE, the
-        // block length of the hash function.  Applications that use keys longer
-        // than INSIZE bytes will first hash the key using H and then use the
-        // resultant OUTSIZE byte string as the actual key to HMAC."
-        if (key_size > SHA_INSIZE) {
-                md5sha_ctx_t ctx;
-                sha1_begin(&ctx);
-                md5sha_hash(&ctx, key, key_size);
-                key_size = sha_end(&ctx, tempkey);
-        }
-        for (i = 0; i < key_size; i++) {
-                key_xor_ipad[i] = key[i] ^ 0x36;
-                key_xor_opad[i] = key[i] ^ 0x5c;
-        }
-        for (; i < SHA_INSIZE; i++) {
-                key_xor_ipad[i] = 0x36;
-                key_xor_opad[i] = 0x5c;
-        }
-        sha1_begin(&pre->hashed_key_xor_ipad);
-        sha1_begin(&pre->hashed_key_xor_opad);
        md5sha_hash(&pre->hashed_key_xor_ipad, key_xor_ipad, SHA_INSIZE);
        md5sha_hash(&pre->hashed_key_xor_opad, key_xor_opad, SHA_INSIZE);
 }
@@ -441,11 +409,11 @@ static unsigned hmac(tls_state_t *tls, uint8_t *out, uint8_t *key, unsigned key_
        va_start(va, key_size);
-        if (tls->MAC_size == SHA256_OUTSIZE)
+        hmac_begin(&pre, key, key_size,
-                hmac_sha256_begin(&pre, key, key_size);
+                        (tls->MAC_size == SHA256_OUTSIZE)
-        else
+                                ? sha256_begin
-                hmac_sha1_begin(&pre, key, key_size);
+                                : sha1_begin
+        );
        len = hmac_sha_precomputed_v(&pre, out, va);
        va_end(va);
@@ -460,7 +428,7 @@ static unsigned hmac_sha256(/*tls_state_t *tls,*/ uint8_t *out, uint8_t *key, un
        va_start(va, key_size);
-        hmac_sha256_begin(&pre, key, key_size);
+        hmac_begin(&pre, key, key_size, sha256_begin);
        len = hmac_sha_precomputed_v(&pre, out, va);
        va_end(va);
@@ -507,7 +475,7 @@ static void prf_hmac_sha256(/*tls_state_t *tls,*/
        uint8_t a[TLS_MAX_MAC_SIZE];
        uint8_t *out_p = outbuf;
        unsigned label_size = strlen(label);
-        unsigned MAC_size = SHA256_OUTSIZE;///tls->MAC_size;
+        unsigned MAC_size = SHA256_OUTSIZE;
        /* In P_hash() calculation, "seed" is "label + seed": */
 #define SEED   label, label_size, seed, seed_size
@@ -518,7 +486,7 @@ static void prf_hmac_sha256(/*tls_state_t *tls,*/
        hmac_sha256(/*tls,*/ a, SECRET, SEED, NULL);
 //TODO: convert hmac to precomputed
-        for(;;) {
+        for (;;) {
                /* HMAC_hash(secret, A(1) + seed) */
                if (outbuf_size <= MAC_size) {
                        /* Last, possibly incomplete, block */
@@ -597,8 +565,11 @@ static void xwrite_encrypted(tls_state_t *tls, unsigned size, unsigned type)
        uint8_t padding_length;
        xhdr = (void*)(buf - RECHDR_LEN);
-        if (tls->cipher_id != TLS_RSA_WITH_NULL_SHA256)
+        if (CIPHER_ID1 != TLS_RSA_WITH_NULL_SHA256 /* if "no encryption" can't be selected */
+         || tls->cipher_id != TLS_RSA_WITH_NULL_SHA256 /* or if it wasn't selected */
+        ) {
                xhdr = (void*)(buf - RECHDR_LEN - AES_BLOCKSIZE); /* place for IV */
+        }
        xhdr->type = type;
        xhdr->proto_maj = TLS_MAJ;
@@ -652,7 +623,9 @@ static void xwrite_encrypted(tls_state_t *tls, unsigned size, unsigned type)
        // --------  -----------  ----------  --------------
        // SHA       HMAC-SHA1       20            20
        // SHA256    HMAC-SHA256     32            32
-        if (tls->cipher_id == TLS_RSA_WITH_NULL_SHA256) {
+        if (CIPHER_ID1 == TLS_RSA_WITH_NULL_SHA256
+         && tls->cipher_id == TLS_RSA_WITH_NULL_SHA256
+        ) {
                /* No encryption, only signing */
                xhdr->len16_hi = size >> 8;
                xhdr->len16_lo = size & 0xff;
@@ -1698,9 +1671,11 @@ void FAST_FUNC tls_handshake(tls_state_t *tls, const char *sni)
        if (len != 1 || memcmp(tls->inbuf, rec_CHANGE_CIPHER_SPEC, 6) != 0)
                bad_record_die(tls, "switch to encrypted traffic", len);
        dbg("<< CHANGE_CIPHER_SPEC\n");
-        if (tls->cipher_id == TLS_RSA_WITH_NULL_SHA256)
+        if (CIPHER_ID1 == TLS_RSA_WITH_NULL_SHA256
+         && tls->cipher_id == TLS_RSA_WITH_NULL_SHA256
+        ) {
                tls->min_encrypted_len_on_read = tls->MAC_size;
-        else {
+        } else {
                unsigned mac_blocks = (unsigned)(tls->MAC_size + AES_BLOCKSIZE-1) / AES_BLOCKSIZE;
                /* all incoming packets now should be encrypted and have
                 * at least IV + (MAC padded to blocksize):
@@ -1740,26 +1715,23 @@ static void tls_xwrite(tls_state_t *tls, int len)
 void FAST_FUNC tls_run_copy_loop(tls_state_t *tls)
 {
-        fd_set readfds;
        int inbuf_size;
        const int INBUF_STEP = 4 * 1024;
+        struct pollfd pfds[2];
-//TODO: convert to poll
+        pfds[0].fd = STDIN_FILENO;
-        /* Select loop copying stdin to ofd, and ifd to stdout */
+        pfds[0].events = POLLIN;
-        FD_ZERO(&readfds);
+        pfds[1].fd = tls->ifd;
-        FD_SET(tls->ifd, &readfds);
+        pfds[1].events = POLLIN;
-        FD_SET(STDIN_FILENO, &readfds);
        inbuf_size = INBUF_STEP;
        for (;;) {
-                fd_set testfds;
                int nread;
-                testfds = readfds;
+                if (safe_poll(pfds, 2, -1) < 0)
-                if (select(tls->ifd + 1, &testfds, NULL, NULL, NULL) < 0)
+                        bb_perror_msg_and_die("poll");
-                        bb_perror_msg_and_die("select");
-                if (FD_ISSET(STDIN_FILENO, &testfds)) {
+                if (pfds[0].revents) {
                        void *buf;
                        dbg("STDIN HAS DATA\n");
@@ -1774,7 +1746,7 @@ void FAST_FUNC tls_run_copy_loop(tls_state_t *tls)
                                /* But TLS has no way to encode this,
                                 * doubt it's ok to do it "raw"
                                 */
-                                FD_CLR(STDIN_FILENO, &readfds);
+                                pfds[0].fd = -1;
                                tls_free_outbuf(tls); /* mem usage optimization */
                        } else {
                                if (nread == inbuf_size) {
@@ -1788,7 +1760,7 @@ void FAST_FUNC tls_run_copy_loop(tls_state_t *tls)
                                tls_xwrite(tls, nread);
                        }
                }
-                if (FD_ISSET(tls->ifd, &testfds)) {
+                if (pfds[1].revents) {
                        dbg("NETWORK HAS DATA\n");
 read_record:
                        nread = tls_xread_record(tls);
@@ -1796,7 +1768,7 @@ void FAST_FUNC tls_run_copy_loop(tls_state_t *tls)
                                /* TLS protocol has no real concept of one-sided shutdowns:
                                 * if we get "TLS EOF" from the peer, writes will fail too
                                 */
-                                //FD_CLR(tls->ifd, &readfds);
+                                //pfds[1].fd = -1;
                                //close(STDOUT_FILENO);
                                //tls_free_inbuf(tls); /* mem usage optimization */
                                //continue;
diff --git a/networking/tls_aes.c b/networking/tls_aes.c
index ebaab15b1..6992f1c90 100644
--- a/networking/tls_aes.c
+++ b/networking/tls_aes.c
@@ -3,1774 +3,458 @@
 *
 * Licensed under GPLv2, see file LICENSE in this source tree.
 */
-#include "tls.h"
-static
-int32 psAesInitKey(const unsigned char *key, uint32 keylen, psAesKey_t *skey);
-static
-void psAesEncryptBlock(const unsigned char *pt, unsigned char *ct,
-                psAesKey_t *skey);
-static
-void psAesDecryptBlock(const unsigned char *ct, unsigned char *pt,
-                psAesKey_t *skey);
-static
-int32 psAesInit(psCipherContext_t *ctx, unsigned char *IV,
-                const unsigned char *key, uint32 keylen);
-static
-int32 psAesEncrypt(psCipherContext_t *ctx, const unsigned char *pt,
-                unsigned char *ct, uint32 len);
-static
-int32 psAesDecrypt(psCipherContext_t *ctx, const unsigned char *ct,
-                unsigned char *pt, uint32 len);
-void aes_cbc_encrypt(const void *key, int klen, void *iv, const void *data, size_t len, void *dst)
-{
-        psCipherContext_t ctx;
-        psAesInit(&ctx, iv, key, klen);
-        psAesEncrypt(&ctx,
-                data, /* plaintext */
-                dst,  /* ciphertext */
-                len
-        );
-}
-void aes_cbc_decrypt(const void *key, int klen, void *iv, const void *data, size_t len, void *dst)
-{
-        psCipherContext_t ctx;
-        psAesInit(&ctx, iv, key, klen);
-        psAesDecrypt(&ctx,
-                data, /* ciphertext */
-                dst,  /* plaintext */
-                len
-        );
-}
-/* The file is taken almost verbatim from matrixssl-3-7-2b-open/crypto/symmetric/.
- * Changes are flagged with //bbox
- */
-/**
+/* This AES implementation is derived from tiny-AES128-C code,
- *      @file    aes.c
+ * which was put by its author into public domain:
- *      @version 33ef80f (HEAD, tag: MATRIXSSL-3-7-2-OPEN, tag: MATRIXSSL-3-7-2-COMM, origin/master, origin/HEAD, master)
 *
- *      AES CBC block cipher implementation.
+ * tiny-AES128-C/unlicense.txt, Dec 8, 2014
- */
+ * """
-/*
+ * This is free and unencumbered software released into the public domain.
- *      Copyright (c) 2013-2015 INSIDE Secure Corporation
- *      Copyright (c) PeerSec Networks, 2002-2011
- *      All Rights Reserved
- *
- *      The latest version of this code is available at http://www.matrixssl.org
 *
- *      This software is open source; you can redistribute it and/or modify
+ * Anyone is free to copy, modify, publish, use, compile, sell, or
- *      it under the terms of the GNU General Public License as published by
+ * distribute this software, either in source code form or as a compiled
- *      the Free Software Foundation; either version 2 of the License, or
+ * binary, for any purpose, commercial or non-commercial, and by any
- *      (at your option) any later version.
+ * means.
 *
- *      This General Public License does NOT permit incorporating this software
+ * In jurisdictions that recognize copyright laws, the author or authors
- *      into proprietary programs.  If you are unable to comply with the GPL, a
+ * of this software dedicate any and all copyright interest in the
- *      commercial license for this software may be purchased from INSIDE at
+ * software to the public domain. We make this dedication for the benefit
- *      http://www.insidesecure.com/eng/Company/Locations
+ * of the public at large and to the detriment of our heirs and
+ * successors. We intend this dedication to be an overt act of
+ * relinquishment in perpetuity of all present and future rights to this
+ * software under copyright law.
 *
- *      This program is distributed in WITHOUT ANY WARRANTY; without even the
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *      implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *      See the GNU General Public License for more details.
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- *
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- *      You should have received a copy of the GNU General Public License
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- *      along with this program; if not, write to the Free Software
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * OTHER DEALINGS IN THE SOFTWARE.
- *      http://www.gnu.org/copyleft/gpl.html
+ * """
 */
-/******************************************************************************/
+/* Note that only original tiny-AES128-C code is public domain.
+ * The derived code in this file has been expanded to also implement aes192
-//bbox
+ * and aes256 and use more efficient word-sized operations in many places,
-//#include "../cryptoApi.h"
+ * and put under GPLv2 license.
+ */
-#ifdef USE_AES
+#include "tls.h"
-#ifndef USE_AES_CBC_EXTERNAL
-/******************************************************************************/
-/* The precomputed tables for AES */
-/*
-Te0[x] = S [x].[02, 01, 01, 03];
-Te1[x] = S [x].[03, 02, 01, 01];
-Te2[x] = S [x].[01, 03, 02, 01];
-Te3[x] = S [x].[01, 01, 03, 02];
-Te4[x] = S [x].[01, 01, 01, 01];
-Td0[x] = Si[x].[0e, 09, 0d, 0b];
-Td1[x] = Si[x].[0b, 0e, 09, 0d];
-Td2[x] = Si[x].[0d, 0b, 0e, 09];
-Td3[x] = Si[x].[09, 0d, 0b, 0e];
-Td4[x] = Si[x].[01, 01, 01, 01];
-*/
-static const uint32 TE0[] = {
-        0xc66363a5UL, 0xf87c7c84UL, 0xee777799UL, 0xf67b7b8dUL,
-        0xfff2f20dUL, 0xd66b6bbdUL, 0xde6f6fb1UL, 0x91c5c554UL,
-        0x60303050UL, 0x02010103UL, 0xce6767a9UL, 0x562b2b7dUL,
-        0xe7fefe19UL, 0xb5d7d762UL, 0x4dababe6UL, 0xec76769aUL,
-        0x8fcaca45UL, 0x1f82829dUL, 0x89c9c940UL, 0xfa7d7d87UL,
-        0xeffafa15UL, 0xb25959ebUL, 0x8e4747c9UL, 0xfbf0f00bUL,
-        0x41adadecUL, 0xb3d4d467UL, 0x5fa2a2fdUL, 0x45afafeaUL,
-        0x239c9cbfUL, 0x53a4a4f7UL, 0xe4727296UL, 0x9bc0c05bUL,
-        0x75b7b7c2UL, 0xe1fdfd1cUL, 0x3d9393aeUL, 0x4c26266aUL,
-        0x6c36365aUL, 0x7e3f3f41UL, 0xf5f7f702UL, 0x83cccc4fUL,
-        0x6834345cUL, 0x51a5a5f4UL, 0xd1e5e534UL, 0xf9f1f108UL,
-        0xe2717193UL, 0xabd8d873UL, 0x62313153UL, 0x2a15153fUL,
-        0x0804040cUL, 0x95c7c752UL, 0x46232365UL, 0x9dc3c35eUL,
-        0x30181828UL, 0x379696a1UL, 0x0a05050fUL, 0x2f9a9ab5UL,
-        0x0e070709UL, 0x24121236UL, 0x1b80809bUL, 0xdfe2e23dUL,
-        0xcdebeb26UL, 0x4e272769UL, 0x7fb2b2cdUL, 0xea75759fUL,
-        0x1209091bUL, 0x1d83839eUL, 0x582c2c74UL, 0x341a1a2eUL,
-        0x361b1b2dUL, 0xdc6e6eb2UL, 0xb45a5aeeUL, 0x5ba0a0fbUL,
-        0xa45252f6UL, 0x763b3b4dUL, 0xb7d6d661UL, 0x7db3b3ceUL,
-        0x5229297bUL, 0xdde3e33eUL, 0x5e2f2f71UL, 0x13848497UL,
-        0xa65353f5UL, 0xb9d1d168UL, 0x00000000UL, 0xc1eded2cUL,
-        0x40202060UL, 0xe3fcfc1fUL, 0x79b1b1c8UL, 0xb65b5bedUL,
-        0xd46a6abeUL, 0x8dcbcb46UL, 0x67bebed9UL, 0x7239394bUL,
-        0x944a4adeUL, 0x984c4cd4UL, 0xb05858e8UL, 0x85cfcf4aUL,
-        0xbbd0d06bUL, 0xc5efef2aUL, 0x4faaaae5UL, 0xedfbfb16UL,
-        0x864343c5UL, 0x9a4d4dd7UL, 0x66333355UL, 0x11858594UL,
-        0x8a4545cfUL, 0xe9f9f910UL, 0x04020206UL, 0xfe7f7f81UL,
-        0xa05050f0UL, 0x783c3c44UL, 0x259f9fbaUL, 0x4ba8a8e3UL,
-        0xa25151f3UL, 0x5da3a3feUL, 0x804040c0UL, 0x058f8f8aUL,
-        0x3f9292adUL, 0x219d9dbcUL, 0x70383848UL, 0xf1f5f504UL,
-        0x63bcbcdfUL, 0x77b6b6c1UL, 0xafdada75UL, 0x42212163UL,
-        0x20101030UL, 0xe5ffff1aUL, 0xfdf3f30eUL, 0xbfd2d26dUL,
-        0x81cdcd4cUL, 0x180c0c14UL, 0x26131335UL, 0xc3ecec2fUL,
-        0xbe5f5fe1UL, 0x359797a2UL, 0x884444ccUL, 0x2e171739UL,
-        0x93c4c457UL, 0x55a7a7f2UL, 0xfc7e7e82UL, 0x7a3d3d47UL,
-        0xc86464acUL, 0xba5d5de7UL, 0x3219192bUL, 0xe6737395UL,
-        0xc06060a0UL, 0x19818198UL, 0x9e4f4fd1UL, 0xa3dcdc7fUL,
-        0x44222266UL, 0x542a2a7eUL, 0x3b9090abUL, 0x0b888883UL,
-        0x8c4646caUL, 0xc7eeee29UL, 0x6bb8b8d3UL, 0x2814143cUL,
-        0xa7dede79UL, 0xbc5e5ee2UL, 0x160b0b1dUL, 0xaddbdb76UL,
-        0xdbe0e03bUL, 0x64323256UL, 0x743a3a4eUL, 0x140a0a1eUL,
-        0x924949dbUL, 0x0c06060aUL, 0x4824246cUL, 0xb85c5ce4UL,
-        0x9fc2c25dUL, 0xbdd3d36eUL, 0x43acacefUL, 0xc46262a6UL,
-        0x399191a8UL, 0x319595a4UL, 0xd3e4e437UL, 0xf279798bUL,
-        0xd5e7e732UL, 0x8bc8c843UL, 0x6e373759UL, 0xda6d6db7UL,
-        0x018d8d8cUL, 0xb1d5d564UL, 0x9c4e4ed2UL, 0x49a9a9e0UL,
-        0xd86c6cb4UL, 0xac5656faUL, 0xf3f4f407UL, 0xcfeaea25UL,
-        0xca6565afUL, 0xf47a7a8eUL, 0x47aeaee9UL, 0x10080818UL,
-        0x6fbabad5UL, 0xf0787888UL, 0x4a25256fUL, 0x5c2e2e72UL,
-        0x381c1c24UL, 0x57a6a6f1UL, 0x73b4b4c7UL, 0x97c6c651UL,
-        0xcbe8e823UL, 0xa1dddd7cUL, 0xe874749cUL, 0x3e1f1f21UL,
-        0x964b4bddUL, 0x61bdbddcUL, 0x0d8b8b86UL, 0x0f8a8a85UL,
-        0xe0707090UL, 0x7c3e3e42UL, 0x71b5b5c4UL, 0xcc6666aaUL,
-        0x904848d8UL, 0x06030305UL, 0xf7f6f601UL, 0x1c0e0e12UL,
-        0xc26161a3UL, 0x6a35355fUL, 0xae5757f9UL, 0x69b9b9d0UL,
-        0x17868691UL, 0x99c1c158UL, 0x3a1d1d27UL, 0x279e9eb9UL,
-        0xd9e1e138UL, 0xebf8f813UL, 0x2b9898b3UL, 0x22111133UL,
-        0xd26969bbUL, 0xa9d9d970UL, 0x078e8e89UL, 0x339494a7UL,
-        0x2d9b9bb6UL, 0x3c1e1e22UL, 0x15878792UL, 0xc9e9e920UL,
-        0x87cece49UL, 0xaa5555ffUL, 0x50282878UL, 0xa5dfdf7aUL,
-        0x038c8c8fUL, 0x59a1a1f8UL, 0x09898980UL, 0x1a0d0d17UL,
-        0x65bfbfdaUL, 0xd7e6e631UL, 0x844242c6UL, 0xd06868b8UL,
-        0x824141c3UL, 0x299999b0UL, 0x5a2d2d77UL, 0x1e0f0f11UL,
-        0x7bb0b0cbUL, 0xa85454fcUL, 0x6dbbbbd6UL, 0x2c16163aUL,
-};
-static const uint32 Te4[] = {
-        0x63636363UL, 0x7c7c7c7cUL, 0x77777777UL, 0x7b7b7b7bUL,
-        0xf2f2f2f2UL, 0x6b6b6b6bUL, 0x6f6f6f6fUL, 0xc5c5c5c5UL,
-        0x30303030UL, 0x01010101UL, 0x67676767UL, 0x2b2b2b2bUL,
-        0xfefefefeUL, 0xd7d7d7d7UL, 0xababababUL, 0x76767676UL,
-        0xcacacacaUL, 0x82828282UL, 0xc9c9c9c9UL, 0x7d7d7d7dUL,
-        0xfafafafaUL, 0x59595959UL, 0x47474747UL, 0xf0f0f0f0UL,
-        0xadadadadUL, 0xd4d4d4d4UL, 0xa2a2a2a2UL, 0xafafafafUL,
-        0x9c9c9c9cUL, 0xa4a4a4a4UL, 0x72727272UL, 0xc0c0c0c0UL,
-        0xb7b7b7b7UL, 0xfdfdfdfdUL, 0x93939393UL, 0x26262626UL,
-        0x36363636UL, 0x3f3f3f3fUL, 0xf7f7f7f7UL, 0xccccccccUL,
-        0x34343434UL, 0xa5a5a5a5UL, 0xe5e5e5e5UL, 0xf1f1f1f1UL,
-        0x71717171UL, 0xd8d8d8d8UL, 0x31313131UL, 0x15151515UL,
-        0x04040404UL, 0xc7c7c7c7UL, 0x23232323UL, 0xc3c3c3c3UL,
-        0x18181818UL, 0x96969696UL, 0x05050505UL, 0x9a9a9a9aUL,
-        0x07070707UL, 0x12121212UL, 0x80808080UL, 0xe2e2e2e2UL,
-        0xebebebebUL, 0x27272727UL, 0xb2b2b2b2UL, 0x75757575UL,
-        0x09090909UL, 0x83838383UL, 0x2c2c2c2cUL, 0x1a1a1a1aUL,
-        0x1b1b1b1bUL, 0x6e6e6e6eUL, 0x5a5a5a5aUL, 0xa0a0a0a0UL,
-        0x52525252UL, 0x3b3b3b3bUL, 0xd6d6d6d6UL, 0xb3b3b3b3UL,
-        0x29292929UL, 0xe3e3e3e3UL, 0x2f2f2f2fUL, 0x84848484UL,
-        0x53535353UL, 0xd1d1d1d1UL, 0x00000000UL, 0xededededUL,
-        0x20202020UL, 0xfcfcfcfcUL, 0xb1b1b1b1UL, 0x5b5b5b5bUL,
-        0x6a6a6a6aUL, 0xcbcbcbcbUL, 0xbebebebeUL, 0x39393939UL,
-        0x4a4a4a4aUL, 0x4c4c4c4cUL, 0x58585858UL, 0xcfcfcfcfUL,
-        0xd0d0d0d0UL, 0xefefefefUL, 0xaaaaaaaaUL, 0xfbfbfbfbUL,
-        0x43434343UL, 0x4d4d4d4dUL, 0x33333333UL, 0x85858585UL,
-        0x45454545UL, 0xf9f9f9f9UL, 0x02020202UL, 0x7f7f7f7fUL,
-        0x50505050UL, 0x3c3c3c3cUL, 0x9f9f9f9fUL, 0xa8a8a8a8UL,
-        0x51515151UL, 0xa3a3a3a3UL, 0x40404040UL, 0x8f8f8f8fUL,
-        0x92929292UL, 0x9d9d9d9dUL, 0x38383838UL, 0xf5f5f5f5UL,
-        0xbcbcbcbcUL, 0xb6b6b6b6UL, 0xdadadadaUL, 0x21212121UL,
-        0x10101010UL, 0xffffffffUL, 0xf3f3f3f3UL, 0xd2d2d2d2UL,
-        0xcdcdcdcdUL, 0x0c0c0c0cUL, 0x13131313UL, 0xececececUL,
-        0x5f5f5f5fUL, 0x97979797UL, 0x44444444UL, 0x17171717UL,
-        0xc4c4c4c4UL, 0xa7a7a7a7UL, 0x7e7e7e7eUL, 0x3d3d3d3dUL,
-        0x64646464UL, 0x5d5d5d5dUL, 0x19191919UL, 0x73737373UL,
-        0x60606060UL, 0x81818181UL, 0x4f4f4f4fUL, 0xdcdcdcdcUL,
-        0x22222222UL, 0x2a2a2a2aUL, 0x90909090UL, 0x88888888UL,
-        0x46464646UL, 0xeeeeeeeeUL, 0xb8b8b8b8UL, 0x14141414UL,
-        0xdedededeUL, 0x5e5e5e5eUL, 0x0b0b0b0bUL, 0xdbdbdbdbUL,
-        0xe0e0e0e0UL, 0x32323232UL, 0x3a3a3a3aUL, 0x0a0a0a0aUL,
-        0x49494949UL, 0x06060606UL, 0x24242424UL, 0x5c5c5c5cUL,
-        0xc2c2c2c2UL, 0xd3d3d3d3UL, 0xacacacacUL, 0x62626262UL,
-        0x91919191UL, 0x95959595UL, 0xe4e4e4e4UL, 0x79797979UL,
-        0xe7e7e7e7UL, 0xc8c8c8c8UL, 0x37373737UL, 0x6d6d6d6dUL,
-        0x8d8d8d8dUL, 0xd5d5d5d5UL, 0x4e4e4e4eUL, 0xa9a9a9a9UL,
-        0x6c6c6c6cUL, 0x56565656UL, 0xf4f4f4f4UL, 0xeaeaeaeaUL,
-        0x65656565UL, 0x7a7a7a7aUL, 0xaeaeaeaeUL, 0x08080808UL,
-        0xbabababaUL, 0x78787878UL, 0x25252525UL, 0x2e2e2e2eUL,
-        0x1c1c1c1cUL, 0xa6a6a6a6UL, 0xb4b4b4b4UL, 0xc6c6c6c6UL,
-        0xe8e8e8e8UL, 0xddddddddUL, 0x74747474UL, 0x1f1f1f1fUL,
-        0x4b4b4b4bUL, 0xbdbdbdbdUL, 0x8b8b8b8bUL, 0x8a8a8a8aUL,
-        0x70707070UL, 0x3e3e3e3eUL, 0xb5b5b5b5UL, 0x66666666UL,
-        0x48484848UL, 0x03030303UL, 0xf6f6f6f6UL, 0x0e0e0e0eUL,
-        0x61616161UL, 0x35353535UL, 0x57575757UL, 0xb9b9b9b9UL,
-        0x86868686UL, 0xc1c1c1c1UL, 0x1d1d1d1dUL, 0x9e9e9e9eUL,
-        0xe1e1e1e1UL, 0xf8f8f8f8UL, 0x98989898UL, 0x11111111UL,
-        0x69696969UL, 0xd9d9d9d9UL, 0x8e8e8e8eUL, 0x94949494UL,
-        0x9b9b9b9bUL, 0x1e1e1e1eUL, 0x87878787UL, 0xe9e9e9e9UL,
-        0xcecececeUL, 0x55555555UL, 0x28282828UL, 0xdfdfdfdfUL,
-        0x8c8c8c8cUL, 0xa1a1a1a1UL, 0x89898989UL, 0x0d0d0d0dUL,
-        0xbfbfbfbfUL, 0xe6e6e6e6UL, 0x42424242UL, 0x68686868UL,
-        0x41414141UL, 0x99999999UL, 0x2d2d2d2dUL, 0x0f0f0f0fUL,
-        0xb0b0b0b0UL, 0x54545454UL, 0xbbbbbbbbUL, 0x16161616UL,
-};
-static const uint32 TD0[] = {
-        0x51f4a750UL, 0x7e416553UL, 0x1a17a4c3UL, 0x3a275e96UL,
-        0x3bab6bcbUL, 0x1f9d45f1UL, 0xacfa58abUL, 0x4be30393UL,
-        0x2030fa55UL, 0xad766df6UL, 0x88cc7691UL, 0xf5024c25UL,
-        0x4fe5d7fcUL, 0xc52acbd7UL, 0x26354480UL, 0xb562a38fUL,
-        0xdeb15a49UL, 0x25ba1b67UL, 0x45ea0e98UL, 0x5dfec0e1UL,
-        0xc32f7502UL, 0x814cf012UL, 0x8d4697a3UL, 0x6bd3f9c6UL,
-        0x038f5fe7UL, 0x15929c95UL, 0xbf6d7aebUL, 0x955259daUL,
-        0xd4be832dUL, 0x587421d3UL, 0x49e06929UL, 0x8ec9c844UL,
-        0x75c2896aUL, 0xf48e7978UL, 0x99583e6bUL, 0x27b971ddUL,
-        0xbee14fb6UL, 0xf088ad17UL, 0xc920ac66UL, 0x7dce3ab4UL,
-        0x63df4a18UL, 0xe51a3182UL, 0x97513360UL, 0x62537f45UL,
-        0xb16477e0UL, 0xbb6bae84UL, 0xfe81a01cUL, 0xf9082b94UL,
-        0x70486858UL, 0x8f45fd19UL, 0x94de6c87UL, 0x527bf8b7UL,
-        0xab73d323UL, 0x724b02e2UL, 0xe31f8f57UL, 0x6655ab2aUL,
-        0xb2eb2807UL, 0x2fb5c203UL, 0x86c57b9aUL, 0xd33708a5UL,
-        0x302887f2UL, 0x23bfa5b2UL, 0x02036abaUL, 0xed16825cUL,
-        0x8acf1c2bUL, 0xa779b492UL, 0xf307f2f0UL, 0x4e69e2a1UL,
-        0x65daf4cdUL, 0x0605bed5UL, 0xd134621fUL, 0xc4a6fe8aUL,
-        0x342e539dUL, 0xa2f355a0UL, 0x058ae132UL, 0xa4f6eb75UL,
-        0x0b83ec39UL, 0x4060efaaUL, 0x5e719f06UL, 0xbd6e1051UL,
-        0x3e218af9UL, 0x96dd063dUL, 0xdd3e05aeUL, 0x4de6bd46UL,
-        0x91548db5UL, 0x71c45d05UL, 0x0406d46fUL, 0x605015ffUL,
-        0x1998fb24UL, 0xd6bde997UL, 0x894043ccUL, 0x67d99e77UL,
-        0xb0e842bdUL, 0x07898b88UL, 0xe7195b38UL, 0x79c8eedbUL,
-        0xa17c0a47UL, 0x7c420fe9UL, 0xf8841ec9UL, 0x00000000UL,
-        0x09808683UL, 0x322bed48UL, 0x1e1170acUL, 0x6c5a724eUL,
-        0xfd0efffbUL, 0x0f853856UL, 0x3daed51eUL, 0x362d3927UL,
-        0x0a0fd964UL, 0x685ca621UL, 0x9b5b54d1UL, 0x24362e3aUL,
-        0x0c0a67b1UL, 0x9357e70fUL, 0xb4ee96d2UL, 0x1b9b919eUL,
-        0x80c0c54fUL, 0x61dc20a2UL, 0x5a774b69UL, 0x1c121a16UL,
-        0xe293ba0aUL, 0xc0a02ae5UL, 0x3c22e043UL, 0x121b171dUL,
-        0x0e090d0bUL, 0xf28bc7adUL, 0x2db6a8b9UL, 0x141ea9c8UL,
-        0x57f11985UL, 0xaf75074cUL, 0xee99ddbbUL, 0xa37f60fdUL,
-        0xf701269fUL, 0x5c72f5bcUL, 0x44663bc5UL, 0x5bfb7e34UL,
-        0x8b432976UL, 0xcb23c6dcUL, 0xb6edfc68UL, 0xb8e4f163UL,
-        0xd731dccaUL, 0x42638510UL, 0x13972240UL, 0x84c61120UL,
-        0x854a247dUL, 0xd2bb3df8UL, 0xaef93211UL, 0xc729a16dUL,
-        0x1d9e2f4bUL, 0xdcb230f3UL, 0x0d8652ecUL, 0x77c1e3d0UL,
-        0x2bb3166cUL, 0xa970b999UL, 0x119448faUL, 0x47e96422UL,
-        0xa8fc8cc4UL, 0xa0f03f1aUL, 0x567d2cd8UL, 0x223390efUL,
-        0x87494ec7UL, 0xd938d1c1UL, 0x8ccaa2feUL, 0x98d40b36UL,
-        0xa6f581cfUL, 0xa57ade28UL, 0xdab78e26UL, 0x3fadbfa4UL,
-        0x2c3a9de4UL, 0x5078920dUL, 0x6a5fcc9bUL, 0x547e4662UL,
-        0xf68d13c2UL, 0x90d8b8e8UL, 0x2e39f75eUL, 0x82c3aff5UL,
-        0x9f5d80beUL, 0x69d0937cUL, 0x6fd52da9UL, 0xcf2512b3UL,
-        0xc8ac993bUL, 0x10187da7UL, 0xe89c636eUL, 0xdb3bbb7bUL,
-        0xcd267809UL, 0x6e5918f4UL, 0xec9ab701UL, 0x834f9aa8UL,
-        0xe6956e65UL, 0xaaffe67eUL, 0x21bccf08UL, 0xef15e8e6UL,
-        0xbae79bd9UL, 0x4a6f36ceUL, 0xea9f09d4UL, 0x29b07cd6UL,
-        0x31a4b2afUL, 0x2a3f2331UL, 0xc6a59430UL, 0x35a266c0UL,
-        0x744ebc37UL, 0xfc82caa6UL, 0xe090d0b0UL, 0x33a7d815UL,
-        0xf104984aUL, 0x41ecdaf7UL, 0x7fcd500eUL, 0x1791f62fUL,
-        0x764dd68dUL, 0x43efb04dUL, 0xccaa4d54UL, 0xe49604dfUL,
-        0x9ed1b5e3UL, 0x4c6a881bUL, 0xc12c1fb8UL, 0x4665517fUL,
-        0x9d5eea04UL, 0x018c355dUL, 0xfa877473UL, 0xfb0b412eUL,
-        0xb3671d5aUL, 0x92dbd252UL, 0xe9105633UL, 0x6dd64713UL,
-        0x9ad7618cUL, 0x37a10c7aUL, 0x59f8148eUL, 0xeb133c89UL,
-        0xcea927eeUL, 0xb761c935UL, 0xe11ce5edUL, 0x7a47b13cUL,
-        0x9cd2df59UL, 0x55f2733fUL, 0x1814ce79UL, 0x73c737bfUL,
-        0x53f7cdeaUL, 0x5ffdaa5bUL, 0xdf3d6f14UL, 0x7844db86UL,
-        0xcaaff381UL, 0xb968c43eUL, 0x3824342cUL, 0xc2a3405fUL,
-        0x161dc372UL, 0xbce2250cUL, 0x283c498bUL, 0xff0d9541UL,
-        0x39a80171UL, 0x080cb3deUL, 0xd8b4e49cUL, 0x6456c190UL,
-        0x7bcb8461UL, 0xd532b670UL, 0x486c5c74UL, 0xd0b85742UL,
-};
-static const uint32 Td4[] = {
-        0x52525252UL, 0x09090909UL, 0x6a6a6a6aUL, 0xd5d5d5d5UL,
-        0x30303030UL, 0x36363636UL, 0xa5a5a5a5UL, 0x38383838UL,
-        0xbfbfbfbfUL, 0x40404040UL, 0xa3a3a3a3UL, 0x9e9e9e9eUL,
-        0x81818181UL, 0xf3f3f3f3UL, 0xd7d7d7d7UL, 0xfbfbfbfbUL,
-        0x7c7c7c7cUL, 0xe3e3e3e3UL, 0x39393939UL, 0x82828282UL,
-        0x9b9b9b9bUL, 0x2f2f2f2fUL, 0xffffffffUL, 0x87878787UL,
-        0x34343434UL, 0x8e8e8e8eUL, 0x43434343UL, 0x44444444UL,
-        0xc4c4c4c4UL, 0xdedededeUL, 0xe9e9e9e9UL, 0xcbcbcbcbUL,
-        0x54545454UL, 0x7b7b7b7bUL, 0x94949494UL, 0x32323232UL,
-        0xa6a6a6a6UL, 0xc2c2c2c2UL, 0x23232323UL, 0x3d3d3d3dUL,
-        0xeeeeeeeeUL, 0x4c4c4c4cUL, 0x95959595UL, 0x0b0b0b0bUL,
-        0x42424242UL, 0xfafafafaUL, 0xc3c3c3c3UL, 0x4e4e4e4eUL,
-        0x08080808UL, 0x2e2e2e2eUL, 0xa1a1a1a1UL, 0x66666666UL,
-        0x28282828UL, 0xd9d9d9d9UL, 0x24242424UL, 0xb2b2b2b2UL,
-        0x76767676UL, 0x5b5b5b5bUL, 0xa2a2a2a2UL, 0x49494949UL,
-        0x6d6d6d6dUL, 0x8b8b8b8bUL, 0xd1d1d1d1UL, 0x25252525UL,
-        0x72727272UL, 0xf8f8f8f8UL, 0xf6f6f6f6UL, 0x64646464UL,
-        0x86868686UL, 0x68686868UL, 0x98989898UL, 0x16161616UL,
-        0xd4d4d4d4UL, 0xa4a4a4a4UL, 0x5c5c5c5cUL, 0xccccccccUL,
-        0x5d5d5d5dUL, 0x65656565UL, 0xb6b6b6b6UL, 0x92929292UL,
-        0x6c6c6c6cUL, 0x70707070UL, 0x48484848UL, 0x50505050UL,
-        0xfdfdfdfdUL, 0xededededUL, 0xb9b9b9b9UL, 0xdadadadaUL,
-        0x5e5e5e5eUL, 0x15151515UL, 0x46464646UL, 0x57575757UL,
-        0xa7a7a7a7UL, 0x8d8d8d8dUL, 0x9d9d9d9dUL, 0x84848484UL,
-        0x90909090UL, 0xd8d8d8d8UL, 0xababababUL, 0x00000000UL,
-        0x8c8c8c8cUL, 0xbcbcbcbcUL, 0xd3d3d3d3UL, 0x0a0a0a0aUL,
-        0xf7f7f7f7UL, 0xe4e4e4e4UL, 0x58585858UL, 0x05050505UL,
-        0xb8b8b8b8UL, 0xb3b3b3b3UL, 0x45454545UL, 0x06060606UL,
-        0xd0d0d0d0UL, 0x2c2c2c2cUL, 0x1e1e1e1eUL, 0x8f8f8f8fUL,
-        0xcacacacaUL, 0x3f3f3f3fUL, 0x0f0f0f0fUL, 0x02020202UL,
-        0xc1c1c1c1UL, 0xafafafafUL, 0xbdbdbdbdUL, 0x03030303UL,
-        0x01010101UL, 0x13131313UL, 0x8a8a8a8aUL, 0x6b6b6b6bUL,
-        0x3a3a3a3aUL, 0x91919191UL, 0x11111111UL, 0x41414141UL,
-        0x4f4f4f4fUL, 0x67676767UL, 0xdcdcdcdcUL, 0xeaeaeaeaUL,
-        0x97979797UL, 0xf2f2f2f2UL, 0xcfcfcfcfUL, 0xcecececeUL,
-        0xf0f0f0f0UL, 0xb4b4b4b4UL, 0xe6e6e6e6UL, 0x73737373UL,
-        0x96969696UL, 0xacacacacUL, 0x74747474UL, 0x22222222UL,
-        0xe7e7e7e7UL, 0xadadadadUL, 0x35353535UL, 0x85858585UL,
-        0xe2e2e2e2UL, 0xf9f9f9f9UL, 0x37373737UL, 0xe8e8e8e8UL,
-        0x1c1c1c1cUL, 0x75757575UL, 0xdfdfdfdfUL, 0x6e6e6e6eUL,
-        0x47474747UL, 0xf1f1f1f1UL, 0x1a1a1a1aUL, 0x71717171UL,
-        0x1d1d1d1dUL, 0x29292929UL, 0xc5c5c5c5UL, 0x89898989UL,
-        0x6f6f6f6fUL, 0xb7b7b7b7UL, 0x62626262UL, 0x0e0e0e0eUL,
-        0xaaaaaaaaUL, 0x18181818UL, 0xbebebebeUL, 0x1b1b1b1bUL,
-        0xfcfcfcfcUL, 0x56565656UL, 0x3e3e3e3eUL, 0x4b4b4b4bUL,
-        0xc6c6c6c6UL, 0xd2d2d2d2UL, 0x79797979UL, 0x20202020UL,
-        0x9a9a9a9aUL, 0xdbdbdbdbUL, 0xc0c0c0c0UL, 0xfefefefeUL,
-        0x78787878UL, 0xcdcdcdcdUL, 0x5a5a5a5aUL, 0xf4f4f4f4UL,
-        0x1f1f1f1fUL, 0xddddddddUL, 0xa8a8a8a8UL, 0x33333333UL,
-        0x88888888UL, 0x07070707UL, 0xc7c7c7c7UL, 0x31313131UL,
-        0xb1b1b1b1UL, 0x12121212UL, 0x10101010UL, 0x59595959UL,
-        0x27272727UL, 0x80808080UL, 0xececececUL, 0x5f5f5f5fUL,
-        0x60606060UL, 0x51515151UL, 0x7f7f7f7fUL, 0xa9a9a9a9UL,
-        0x19191919UL, 0xb5b5b5b5UL, 0x4a4a4a4aUL, 0x0d0d0d0dUL,
-        0x2d2d2d2dUL, 0xe5e5e5e5UL, 0x7a7a7a7aUL, 0x9f9f9f9fUL,
-        0x93939393UL, 0xc9c9c9c9UL, 0x9c9c9c9cUL, 0xefefefefUL,
-        0xa0a0a0a0UL, 0xe0e0e0e0UL, 0x3b3b3b3bUL, 0x4d4d4d4dUL,
-        0xaeaeaeaeUL, 0x2a2a2a2aUL, 0xf5f5f5f5UL, 0xb0b0b0b0UL,
-        0xc8c8c8c8UL, 0xebebebebUL, 0xbbbbbbbbUL, 0x3c3c3c3cUL,
-        0x83838383UL, 0x53535353UL, 0x99999999UL, 0x61616161UL,
-        0x17171717UL, 0x2b2b2b2bUL, 0x04040404UL, 0x7e7e7e7eUL,
-        0xbabababaUL, 0x77777777UL, 0xd6d6d6d6UL, 0x26262626UL,
-        0xe1e1e1e1UL, 0x69696969UL, 0x14141414UL, 0x63636363UL,
-        0x55555555UL, 0x21212121UL, 0x0c0c0c0cUL, 0x7d7d7d7dUL,
-        0xe1f27f3aUL, 0xf5710fb0UL, 0xada0e5c4UL, 0x98e4c919UL
-};
-#ifndef PS_AES_IMPROVE_PERF_INCREASE_CODESIZE
-#define Te0(x) TE0[x]
-#define Te1(x) ROR(TE0[x], 8)
-#define Te2(x) ROR(TE0[x], 16)
-#define Te3(x) ROR(TE0[x], 24)
-#define Td0(x) TD0[x]
-#define Td1(x) ROR(TD0[x], 8)
-#define Td2(x) ROR(TD0[x], 16)
-#define Td3(x) ROR(TD0[x], 24)
-#define Te4_0 0x000000FF & Te4
-#define Te4_1 0x0000FF00 & Te4
-#define Te4_2 0x00FF0000 & Te4
-#define Te4_3 0xFF000000 & Te4
-#else /* PS_AES_IMPROVE_PERF_INCREASE_CODESIZE */
-#define Te0(x) TE0[x]
-#define Te1(x) TE1[x]
-#define Te2(x) TE2[x]
-#define Te3(x) TE3[x]
-#define Td0(x) TD0[x]
-#define Td1(x) TD1[x]
-#define Td2(x) TD2[x]
-#define Td3(x) TD3[x]
-static const uint32 TE1[256] = {
-        0xa5c66363UL, 0x84f87c7cUL, 0x99ee7777UL, 0x8df67b7bUL,
-        0x0dfff2f2UL, 0xbdd66b6bUL, 0xb1de6f6fUL, 0x5491c5c5UL,
-        0x50603030UL, 0x03020101UL, 0xa9ce6767UL, 0x7d562b2bUL,
-        0x19e7fefeUL, 0x62b5d7d7UL, 0xe64dababUL, 0x9aec7676UL,
-        0x458fcacaUL, 0x9d1f8282UL, 0x4089c9c9UL, 0x87fa7d7dUL,
-        0x15effafaUL, 0xebb25959UL, 0xc98e4747UL, 0x0bfbf0f0UL,
-        0xec41adadUL, 0x67b3d4d4UL, 0xfd5fa2a2UL, 0xea45afafUL,
-        0xbf239c9cUL, 0xf753a4a4UL, 0x96e47272UL, 0x5b9bc0c0UL,
-        0xc275b7b7UL, 0x1ce1fdfdUL, 0xae3d9393UL, 0x6a4c2626UL,
-        0x5a6c3636UL, 0x417e3f3fUL, 0x02f5f7f7UL, 0x4f83ccccUL,
-        0x5c683434UL, 0xf451a5a5UL, 0x34d1e5e5UL, 0x08f9f1f1UL,
-        0x93e27171UL, 0x73abd8d8UL, 0x53623131UL, 0x3f2a1515UL,
-        0x0c080404UL, 0x5295c7c7UL, 0x65462323UL, 0x5e9dc3c3UL,
-        0x28301818UL, 0xa1379696UL, 0x0f0a0505UL, 0xb52f9a9aUL,
-        0x090e0707UL, 0x36241212UL, 0x9b1b8080UL, 0x3ddfe2e2UL,
-        0x26cdebebUL, 0x694e2727UL, 0xcd7fb2b2UL, 0x9fea7575UL,
-        0x1b120909UL, 0x9e1d8383UL, 0x74582c2cUL, 0x2e341a1aUL,
-        0x2d361b1bUL, 0xb2dc6e6eUL, 0xeeb45a5aUL, 0xfb5ba0a0UL,
-        0xf6a45252UL, 0x4d763b3bUL, 0x61b7d6d6UL, 0xce7db3b3UL,
-        0x7b522929UL, 0x3edde3e3UL, 0x715e2f2fUL, 0x97138484UL,
-        0xf5a65353UL, 0x68b9d1d1UL, 0x00000000UL, 0x2cc1ededUL,
-        0x60402020UL, 0x1fe3fcfcUL, 0xc879b1b1UL, 0xedb65b5bUL,
-        0xbed46a6aUL, 0x468dcbcbUL, 0xd967bebeUL, 0x4b723939UL,
-        0xde944a4aUL, 0xd4984c4cUL, 0xe8b05858UL, 0x4a85cfcfUL,
-        0x6bbbd0d0UL, 0x2ac5efefUL, 0xe54faaaaUL, 0x16edfbfbUL,
-        0xc5864343UL, 0xd79a4d4dUL, 0x55663333UL, 0x94118585UL,
-        0xcf8a4545UL, 0x10e9f9f9UL, 0x06040202UL, 0x81fe7f7fUL,
-        0xf0a05050UL, 0x44783c3cUL, 0xba259f9fUL, 0xe34ba8a8UL,
-        0xf3a25151UL, 0xfe5da3a3UL, 0xc0804040UL, 0x8a058f8fUL,
-        0xad3f9292UL, 0xbc219d9dUL, 0x48703838UL, 0x04f1f5f5UL,
-        0xdf63bcbcUL, 0xc177b6b6UL, 0x75afdadaUL, 0x63422121UL,
-        0x30201010UL, 0x1ae5ffffUL, 0x0efdf3f3UL, 0x6dbfd2d2UL,
-        0x4c81cdcdUL, 0x14180c0cUL, 0x35261313UL, 0x2fc3ececUL,
-        0xe1be5f5fUL, 0xa2359797UL, 0xcc884444UL, 0x392e1717UL,
-        0x5793c4c4UL, 0xf255a7a7UL, 0x82fc7e7eUL, 0x477a3d3dUL,
-        0xacc86464UL, 0xe7ba5d5dUL, 0x2b321919UL, 0x95e67373UL,
-        0xa0c06060UL, 0x98198181UL, 0xd19e4f4fUL, 0x7fa3dcdcUL,
-        0x66442222UL, 0x7e542a2aUL, 0xab3b9090UL, 0x830b8888UL,
-        0xca8c4646UL, 0x29c7eeeeUL, 0xd36bb8b8UL, 0x3c281414UL,
-        0x79a7dedeUL, 0xe2bc5e5eUL, 0x1d160b0bUL, 0x76addbdbUL,
-        0x3bdbe0e0UL, 0x56643232UL, 0x4e743a3aUL, 0x1e140a0aUL,
-        0xdb924949UL, 0x0a0c0606UL, 0x6c482424UL, 0xe4b85c5cUL,
-        0x5d9fc2c2UL, 0x6ebdd3d3UL, 0xef43acacUL, 0xa6c46262UL,
-        0xa8399191UL, 0xa4319595UL, 0x37d3e4e4UL, 0x8bf27979UL,
-        0x32d5e7e7UL, 0x438bc8c8UL, 0x596e3737UL, 0xb7da6d6dUL,
-        0x8c018d8dUL, 0x64b1d5d5UL, 0xd29c4e4eUL, 0xe049a9a9UL,
-        0xb4d86c6cUL, 0xfaac5656UL, 0x07f3f4f4UL, 0x25cfeaeaUL,
-        0xafca6565UL, 0x8ef47a7aUL, 0xe947aeaeUL, 0x18100808UL,
-        0xd56fbabaUL, 0x88f07878UL, 0x6f4a2525UL, 0x725c2e2eUL,
-        0x24381c1cUL, 0xf157a6a6UL, 0xc773b4b4UL, 0x5197c6c6UL,
-        0x23cbe8e8UL, 0x7ca1ddddUL, 0x9ce87474UL, 0x213e1f1fUL,
-        0xdd964b4bUL, 0xdc61bdbdUL, 0x860d8b8bUL, 0x850f8a8aUL,
-        0x90e07070UL, 0x427c3e3eUL, 0xc471b5b5UL, 0xaacc6666UL,
-        0xd8904848UL, 0x05060303UL, 0x01f7f6f6UL, 0x121c0e0eUL,
-        0xa3c26161UL, 0x5f6a3535UL, 0xf9ae5757UL, 0xd069b9b9UL,
-        0x91178686UL, 0x5899c1c1UL, 0x273a1d1dUL, 0xb9279e9eUL,
-        0x38d9e1e1UL, 0x13ebf8f8UL, 0xb32b9898UL, 0x33221111UL,
-        0xbbd26969UL, 0x70a9d9d9UL, 0x89078e8eUL, 0xa7339494UL,
-        0xb62d9b9bUL, 0x223c1e1eUL, 0x92158787UL, 0x20c9e9e9UL,
-        0x4987ceceUL, 0xffaa5555UL, 0x78502828UL, 0x7aa5dfdfUL,
-        0x8f038c8cUL, 0xf859a1a1UL, 0x80098989UL, 0x171a0d0dUL,
-        0xda65bfbfUL, 0x31d7e6e6UL, 0xc6844242UL, 0xb8d06868UL,
-        0xc3824141UL, 0xb0299999UL, 0x775a2d2dUL, 0x111e0f0fUL,
-        0xcb7bb0b0UL, 0xfca85454UL, 0xd66dbbbbUL, 0x3a2c1616UL,
-};
-static const uint32 TE2[256] = {
-        0x63a5c663UL, 0x7c84f87cUL, 0x7799ee77UL, 0x7b8df67bUL,
-        0xf20dfff2UL, 0x6bbdd66bUL, 0x6fb1de6fUL, 0xc55491c5UL,
-        0x30506030UL, 0x01030201UL, 0x67a9ce67UL, 0x2b7d562bUL,
-        0xfe19e7feUL, 0xd762b5d7UL, 0xabe64dabUL, 0x769aec76UL,
-        0xca458fcaUL, 0x829d1f82UL, 0xc94089c9UL, 0x7d87fa7dUL,
-        0xfa15effaUL, 0x59ebb259UL, 0x47c98e47UL, 0xf00bfbf0UL,
-        0xadec41adUL, 0xd467b3d4UL, 0xa2fd5fa2UL, 0xafea45afUL,
-        0x9cbf239cUL, 0xa4f753a4UL, 0x7296e472UL, 0xc05b9bc0UL,
-        0xb7c275b7UL, 0xfd1ce1fdUL, 0x93ae3d93UL, 0x266a4c26UL,
-        0x365a6c36UL, 0x3f417e3fUL, 0xf702f5f7UL, 0xcc4f83ccUL,
-        0x345c6834UL, 0xa5f451a5UL, 0xe534d1e5UL, 0xf108f9f1UL,
-        0x7193e271UL, 0xd873abd8UL, 0x31536231UL, 0x153f2a15UL,
-        0x040c0804UL, 0xc75295c7UL, 0x23654623UL, 0xc35e9dc3UL,
-        0x18283018UL, 0x96a13796UL, 0x050f0a05UL, 0x9ab52f9aUL,
-        0x07090e07UL, 0x12362412UL, 0x809b1b80UL, 0xe23ddfe2UL,
-        0xeb26cdebUL, 0x27694e27UL, 0xb2cd7fb2UL, 0x759fea75UL,
-        0x091b1209UL, 0x839e1d83UL, 0x2c74582cUL, 0x1a2e341aUL,
-        0x1b2d361bUL, 0x6eb2dc6eUL, 0x5aeeb45aUL, 0xa0fb5ba0UL,
-        0x52f6a452UL, 0x3b4d763bUL, 0xd661b7d6UL, 0xb3ce7db3UL,
-        0x297b5229UL, 0xe33edde3UL, 0x2f715e2fUL, 0x84971384UL,
-        0x53f5a653UL, 0xd168b9d1UL, 0x00000000UL, 0xed2cc1edUL,
-        0x20604020UL, 0xfc1fe3fcUL, 0xb1c879b1UL, 0x5bedb65bUL,
-        0x6abed46aUL, 0xcb468dcbUL, 0xbed967beUL, 0x394b7239UL,
-        0x4ade944aUL, 0x4cd4984cUL, 0x58e8b058UL, 0xcf4a85cfUL,
-        0xd06bbbd0UL, 0xef2ac5efUL, 0xaae54faaUL, 0xfb16edfbUL,
-        0x43c58643UL, 0x4dd79a4dUL, 0x33556633UL, 0x85941185UL,
-        0x45cf8a45UL, 0xf910e9f9UL, 0x02060402UL, 0x7f81fe7fUL,
-        0x50f0a050UL, 0x3c44783cUL, 0x9fba259fUL, 0xa8e34ba8UL,
-        0x51f3a251UL, 0xa3fe5da3UL, 0x40c08040UL, 0x8f8a058fUL,
-        0x92ad3f92UL, 0x9dbc219dUL, 0x38487038UL, 0xf504f1f5UL,
-        0xbcdf63bcUL, 0xb6c177b6UL, 0xda75afdaUL, 0x21634221UL,
-        0x10302010UL, 0xff1ae5ffUL, 0xf30efdf3UL, 0xd26dbfd2UL,
-        0xcd4c81cdUL, 0x0c14180cUL, 0x13352613UL, 0xec2fc3ecUL,
-        0x5fe1be5fUL, 0x97a23597UL, 0x44cc8844UL, 0x17392e17UL,
-        0xc45793c4UL, 0xa7f255a7UL, 0x7e82fc7eUL, 0x3d477a3dUL,
-        0x64acc864UL, 0x5de7ba5dUL, 0x192b3219UL, 0x7395e673UL,
-        0x60a0c060UL, 0x81981981UL, 0x4fd19e4fUL, 0xdc7fa3dcUL,
-        0x22664422UL, 0x2a7e542aUL, 0x90ab3b90UL, 0x88830b88UL,
-        0x46ca8c46UL, 0xee29c7eeUL, 0xb8d36bb8UL, 0x143c2814UL,
-        0xde79a7deUL, 0x5ee2bc5eUL, 0x0b1d160bUL, 0xdb76addbUL,
-        0xe03bdbe0UL, 0x32566432UL, 0x3a4e743aUL, 0x0a1e140aUL,
-        0x49db9249UL, 0x060a0c06UL, 0x246c4824UL, 0x5ce4b85cUL,
-        0xc25d9fc2UL, 0xd36ebdd3UL, 0xacef43acUL, 0x62a6c462UL,
-        0x91a83991UL, 0x95a43195UL, 0xe437d3e4UL, 0x798bf279UL,
-        0xe732d5e7UL, 0xc8438bc8UL, 0x37596e37UL, 0x6db7da6dUL,
-        0x8d8c018dUL, 0xd564b1d5UL, 0x4ed29c4eUL, 0xa9e049a9UL,
-        0x6cb4d86cUL, 0x56faac56UL, 0xf407f3f4UL, 0xea25cfeaUL,
-        0x65afca65UL, 0x7a8ef47aUL, 0xaee947aeUL, 0x08181008UL,
-        0xbad56fbaUL, 0x7888f078UL, 0x256f4a25UL, 0x2e725c2eUL,
-        0x1c24381cUL, 0xa6f157a6UL, 0xb4c773b4UL, 0xc65197c6UL,
-        0xe823cbe8UL, 0xdd7ca1ddUL, 0x749ce874UL, 0x1f213e1fUL,
-        0x4bdd964bUL, 0xbddc61bdUL, 0x8b860d8bUL, 0x8a850f8aUL,
-        0x7090e070UL, 0x3e427c3eUL, 0xb5c471b5UL, 0x66aacc66UL,
-        0x48d89048UL, 0x03050603UL, 0xf601f7f6UL, 0x0e121c0eUL,
-        0x61a3c261UL, 0x355f6a35UL, 0x57f9ae57UL, 0xb9d069b9UL,
-        0x86911786UL, 0xc15899c1UL, 0x1d273a1dUL, 0x9eb9279eUL,
-        0xe138d9e1UL, 0xf813ebf8UL, 0x98b32b98UL, 0x11332211UL,
-        0x69bbd269UL, 0xd970a9d9UL, 0x8e89078eUL, 0x94a73394UL,
-        0x9bb62d9bUL, 0x1e223c1eUL, 0x87921587UL, 0xe920c9e9UL,
-        0xce4987ceUL, 0x55ffaa55UL, 0x28785028UL, 0xdf7aa5dfUL,
-        0x8c8f038cUL, 0xa1f859a1UL, 0x89800989UL, 0x0d171a0dUL,
-        0xbfda65bfUL, 0xe631d7e6UL, 0x42c68442UL, 0x68b8d068UL,
-        0x41c38241UL, 0x99b02999UL, 0x2d775a2dUL, 0x0f111e0fUL,
-        0xb0cb7bb0UL, 0x54fca854UL, 0xbbd66dbbUL, 0x163a2c16UL,
-};
-static const uint32 TE3[256] = {
-        0x6363a5c6UL, 0x7c7c84f8UL, 0x777799eeUL, 0x7b7b8df6UL,
-        0xf2f20dffUL, 0x6b6bbdd6UL, 0x6f6fb1deUL, 0xc5c55491UL,
-        0x30305060UL, 0x01010302UL, 0x6767a9ceUL, 0x2b2b7d56UL,
-        0xfefe19e7UL, 0xd7d762b5UL, 0xababe64dUL, 0x76769aecUL,
-        0xcaca458fUL, 0x82829d1fUL, 0xc9c94089UL, 0x7d7d87faUL,
-        0xfafa15efUL, 0x5959ebb2UL, 0x4747c98eUL, 0xf0f00bfbUL,
-        0xadadec41UL, 0xd4d467b3UL, 0xa2a2fd5fUL, 0xafafea45UL,
-        0x9c9cbf23UL, 0xa4a4f753UL, 0x727296e4UL, 0xc0c05b9bUL,
-        0xb7b7c275UL, 0xfdfd1ce1UL, 0x9393ae3dUL, 0x26266a4cUL,
-        0x36365a6cUL, 0x3f3f417eUL, 0xf7f702f5UL, 0xcccc4f83UL,
-        0x34345c68UL, 0xa5a5f451UL, 0xe5e534d1UL, 0xf1f108f9UL,
-        0x717193e2UL, 0xd8d873abUL, 0x31315362UL, 0x15153f2aUL,
-        0x04040c08UL, 0xc7c75295UL, 0x23236546UL, 0xc3c35e9dUL,
-        0x18182830UL, 0x9696a137UL, 0x05050f0aUL, 0x9a9ab52fUL,
-        0x0707090eUL, 0x12123624UL, 0x80809b1bUL, 0xe2e23ddfUL,
-        0xebeb26cdUL, 0x2727694eUL, 0xb2b2cd7fUL, 0x75759feaUL,
-        0x09091b12UL, 0x83839e1dUL, 0x2c2c7458UL, 0x1a1a2e34UL,
-        0x1b1b2d36UL, 0x6e6eb2dcUL, 0x5a5aeeb4UL, 0xa0a0fb5bUL,
-        0x5252f6a4UL, 0x3b3b4d76UL, 0xd6d661b7UL, 0xb3b3ce7dUL,
-        0x29297b52UL, 0xe3e33eddUL, 0x2f2f715eUL, 0x84849713UL,
-        0x5353f5a6UL, 0xd1d168b9UL, 0x00000000UL, 0xeded2cc1UL,
-        0x20206040UL, 0xfcfc1fe3UL, 0xb1b1c879UL, 0x5b5bedb6UL,
-        0x6a6abed4UL, 0xcbcb468dUL, 0xbebed967UL, 0x39394b72UL,
-        0x4a4ade94UL, 0x4c4cd498UL, 0x5858e8b0UL, 0xcfcf4a85UL,
-        0xd0d06bbbUL, 0xefef2ac5UL, 0xaaaae54fUL, 0xfbfb16edUL,
-        0x4343c586UL, 0x4d4dd79aUL, 0x33335566UL, 0x85859411UL,
-        0x4545cf8aUL, 0xf9f910e9UL, 0x02020604UL, 0x7f7f81feUL,
-        0x5050f0a0UL, 0x3c3c4478UL, 0x9f9fba25UL, 0xa8a8e34bUL,
-        0x5151f3a2UL, 0xa3a3fe5dUL, 0x4040c080UL, 0x8f8f8a05UL,
-        0x9292ad3fUL, 0x9d9dbc21UL, 0x38384870UL, 0xf5f504f1UL,
-        0xbcbcdf63UL, 0xb6b6c177UL, 0xdada75afUL, 0x21216342UL,
-        0x10103020UL, 0xffff1ae5UL, 0xf3f30efdUL, 0xd2d26dbfUL,
-        0xcdcd4c81UL, 0x0c0c1418UL, 0x13133526UL, 0xecec2fc3UL,
-        0x5f5fe1beUL, 0x9797a235UL, 0x4444cc88UL, 0x1717392eUL,
-        0xc4c45793UL, 0xa7a7f255UL, 0x7e7e82fcUL, 0x3d3d477aUL,
-        0x6464acc8UL, 0x5d5de7baUL, 0x19192b32UL, 0x737395e6UL,
-        0x6060a0c0UL, 0x81819819UL, 0x4f4fd19eUL, 0xdcdc7fa3UL,
-        0x22226644UL, 0x2a2a7e54UL, 0x9090ab3bUL, 0x8888830bUL,
-        0x4646ca8cUL, 0xeeee29c7UL, 0xb8b8d36bUL, 0x14143c28UL,
-        0xdede79a7UL, 0x5e5ee2bcUL, 0x0b0b1d16UL, 0xdbdb76adUL,
-        0xe0e03bdbUL, 0x32325664UL, 0x3a3a4e74UL, 0x0a0a1e14UL,
-        0x4949db92UL, 0x06060a0cUL, 0x24246c48UL, 0x5c5ce4b8UL,
-        0xc2c25d9fUL, 0xd3d36ebdUL, 0xacacef43UL, 0x6262a6c4UL,
-        0x9191a839UL, 0x9595a431UL, 0xe4e437d3UL, 0x79798bf2UL,
-        0xe7e732d5UL, 0xc8c8438bUL, 0x3737596eUL, 0x6d6db7daUL,
-        0x8d8d8c01UL, 0xd5d564b1UL, 0x4e4ed29cUL, 0xa9a9e049UL,
-        0x6c6cb4d8UL, 0x5656faacUL, 0xf4f407f3UL, 0xeaea25cfUL,
-        0x6565afcaUL, 0x7a7a8ef4UL, 0xaeaee947UL, 0x08081810UL,
-        0xbabad56fUL, 0x787888f0UL, 0x25256f4aUL, 0x2e2e725cUL,
-        0x1c1c2438UL, 0xa6a6f157UL, 0xb4b4c773UL, 0xc6c65197UL,
-        0xe8e823cbUL, 0xdddd7ca1UL, 0x74749ce8UL, 0x1f1f213eUL,
-        0x4b4bdd96UL, 0xbdbddc61UL, 0x8b8b860dUL, 0x8a8a850fUL,
-        0x707090e0UL, 0x3e3e427cUL, 0xb5b5c471UL, 0x6666aaccUL,
-        0x4848d890UL, 0x03030506UL, 0xf6f601f7UL, 0x0e0e121cUL,
-        0x6161a3c2UL, 0x35355f6aUL, 0x5757f9aeUL, 0xb9b9d069UL,
-        0x86869117UL, 0xc1c15899UL, 0x1d1d273aUL, 0x9e9eb927UL,
-        0xe1e138d9UL, 0xf8f813ebUL, 0x9898b32bUL, 0x11113322UL,
-        0x6969bbd2UL, 0xd9d970a9UL, 0x8e8e8907UL, 0x9494a733UL,
-        0x9b9bb62dUL, 0x1e1e223cUL, 0x87879215UL, 0xe9e920c9UL,
-        0xcece4987UL, 0x5555ffaaUL, 0x28287850UL, 0xdfdf7aa5UL,
-        0x8c8c8f03UL, 0xa1a1f859UL, 0x89898009UL, 0x0d0d171aUL,
-        0xbfbfda65UL, 0xe6e631d7UL, 0x4242c684UL, 0x6868b8d0UL,
-        0x4141c382UL, 0x9999b029UL, 0x2d2d775aUL, 0x0f0f111eUL,
-        0xb0b0cb7bUL, 0x5454fca8UL, 0xbbbbd66dUL, 0x16163a2cUL,
-};
-static const uint32 Te4_0[] = {
-0x00000063UL, 0x0000007cUL, 0x00000077UL, 0x0000007bUL, 0x000000f2UL, 0x0000006bUL, 0x0000006fUL, 0x000000c5UL,
-0x00000030UL, 0x00000001UL, 0x00000067UL, 0x0000002bUL, 0x000000feUL, 0x000000d7UL, 0x000000abUL, 0x00000076UL,
-0x000000caUL, 0x00000082UL, 0x000000c9UL, 0x0000007dUL, 0x000000faUL, 0x00000059UL, 0x00000047UL, 0x000000f0UL,
-0x000000adUL, 0x000000d4UL, 0x000000a2UL, 0x000000afUL, 0x0000009cUL, 0x000000a4UL, 0x00000072UL, 0x000000c0UL,
-0x000000b7UL, 0x000000fdUL, 0x00000093UL, 0x00000026UL, 0x00000036UL, 0x0000003fUL, 0x000000f7UL, 0x000000ccUL,
-0x00000034UL, 0x000000a5UL, 0x000000e5UL, 0x000000f1UL, 0x00000071UL, 0x000000d8UL, 0x00000031UL, 0x00000015UL,
-0x00000004UL, 0x000000c7UL, 0x00000023UL, 0x000000c3UL, 0x00000018UL, 0x00000096UL, 0x00000005UL, 0x0000009aUL,
-0x00000007UL, 0x00000012UL, 0x00000080UL, 0x000000e2UL, 0x000000ebUL, 0x00000027UL, 0x000000b2UL, 0x00000075UL,
-0x00000009UL, 0x00000083UL, 0x0000002cUL, 0x0000001aUL, 0x0000001bUL, 0x0000006eUL, 0x0000005aUL, 0x000000a0UL,
-0x00000052UL, 0x0000003bUL, 0x000000d6UL, 0x000000b3UL, 0x00000029UL, 0x000000e3UL, 0x0000002fUL, 0x00000084UL,
-0x00000053UL, 0x000000d1UL, 0x00000000UL, 0x000000edUL, 0x00000020UL, 0x000000fcUL, 0x000000b1UL, 0x0000005bUL,
-0x0000006aUL, 0x000000cbUL, 0x000000beUL, 0x00000039UL, 0x0000004aUL, 0x0000004cUL, 0x00000058UL, 0x000000cfUL,
-0x000000d0UL, 0x000000efUL, 0x000000aaUL, 0x000000fbUL, 0x00000043UL, 0x0000004dUL, 0x00000033UL, 0x00000085UL,
-0x00000045UL, 0x000000f9UL, 0x00000002UL, 0x0000007fUL, 0x00000050UL, 0x0000003cUL, 0x0000009fUL, 0x000000a8UL,
-0x00000051UL, 0x000000a3UL, 0x00000040UL, 0x0000008fUL, 0x00000092UL, 0x0000009dUL, 0x00000038UL, 0x000000f5UL,
-0x000000bcUL, 0x000000b6UL, 0x000000daUL, 0x00000021UL, 0x00000010UL, 0x000000ffUL, 0x000000f3UL, 0x000000d2UL,
-0x000000cdUL, 0x0000000cUL, 0x00000013UL, 0x000000ecUL, 0x0000005fUL, 0x00000097UL, 0x00000044UL, 0x00000017UL,
-0x000000c4UL, 0x000000a7UL, 0x0000007eUL, 0x0000003dUL, 0x00000064UL, 0x0000005dUL, 0x00000019UL, 0x00000073UL,
-0x00000060UL, 0x00000081UL, 0x0000004fUL, 0x000000dcUL, 0x00000022UL, 0x0000002aUL, 0x00000090UL, 0x00000088UL,
-0x00000046UL, 0x000000eeUL, 0x000000b8UL, 0x00000014UL, 0x000000deUL, 0x0000005eUL, 0x0000000bUL, 0x000000dbUL,
-0x000000e0UL, 0x00000032UL, 0x0000003aUL, 0x0000000aUL, 0x00000049UL, 0x00000006UL, 0x00000024UL, 0x0000005cUL,
-0x000000c2UL, 0x000000d3UL, 0x000000acUL, 0x00000062UL, 0x00000091UL, 0x00000095UL, 0x000000e4UL, 0x00000079UL,
-0x000000e7UL, 0x000000c8UL, 0x00000037UL, 0x0000006dUL, 0x0000008dUL, 0x000000d5UL, 0x0000004eUL, 0x000000a9UL,
-0x0000006cUL, 0x00000056UL, 0x000000f4UL, 0x000000eaUL, 0x00000065UL, 0x0000007aUL, 0x000000aeUL, 0x00000008UL,
-0x000000baUL, 0x00000078UL, 0x00000025UL, 0x0000002eUL, 0x0000001cUL, 0x000000a6UL, 0x000000b4UL, 0x000000c6UL,
-0x000000e8UL, 0x000000ddUL, 0x00000074UL, 0x0000001fUL, 0x0000004bUL, 0x000000bdUL, 0x0000008bUL, 0x0000008aUL,
-0x00000070UL, 0x0000003eUL, 0x000000b5UL, 0x00000066UL, 0x00000048UL, 0x00000003UL, 0x000000f6UL, 0x0000000eUL,
-0x00000061UL, 0x00000035UL, 0x00000057UL, 0x000000b9UL, 0x00000086UL, 0x000000c1UL, 0x0000001dUL, 0x0000009eUL,
-0x000000e1UL, 0x000000f8UL, 0x00000098UL, 0x00000011UL, 0x00000069UL, 0x000000d9UL, 0x0000008eUL, 0x00000094UL,
-0x0000009bUL, 0x0000001eUL, 0x00000087UL, 0x000000e9UL, 0x000000ceUL, 0x00000055UL, 0x00000028UL, 0x000000dfUL,
-0x0000008cUL, 0x000000a1UL, 0x00000089UL, 0x0000000dUL, 0x000000bfUL, 0x000000e6UL, 0x00000042UL, 0x00000068UL,
-0x00000041UL, 0x00000099UL, 0x0000002dUL, 0x0000000fUL, 0x000000b0UL, 0x00000054UL, 0x000000bbUL, 0x00000016UL
-};
-static const uint32 Te4_1[] = {
-0x00006300UL, 0x00007c00UL, 0x00007700UL, 0x00007b00UL, 0x0000f200UL, 0x00006b00UL, 0x00006f00UL, 0x0000c500UL,
-0x00003000UL, 0x00000100UL, 0x00006700UL, 0x00002b00UL, 0x0000fe00UL, 0x0000d700UL, 0x0000ab00UL, 0x00007600UL,
-0x0000ca00UL, 0x00008200UL, 0x0000c900UL, 0x00007d00UL, 0x0000fa00UL, 0x00005900UL, 0x00004700UL, 0x0000f000UL,
-0x0000ad00UL, 0x0000d400UL, 0x0000a200UL, 0x0000af00UL, 0x00009c00UL, 0x0000a400UL, 0x00007200UL, 0x0000c000UL,
-0x0000b700UL, 0x0000fd00UL, 0x00009300UL, 0x00002600UL, 0x00003600UL, 0x00003f00UL, 0x0000f700UL, 0x0000cc00UL,
-0x00003400UL, 0x0000a500UL, 0x0000e500UL, 0x0000f100UL, 0x00007100UL, 0x0000d800UL, 0x00003100UL, 0x00001500UL,
-0x00000400UL, 0x0000c700UL, 0x00002300UL, 0x0000c300UL, 0x00001800UL, 0x00009600UL, 0x00000500UL, 0x00009a00UL,
-0x00000700UL, 0x00001200UL, 0x00008000UL, 0x0000e200UL, 0x0000eb00UL, 0x00002700UL, 0x0000b200UL, 0x00007500UL,
-0x00000900UL, 0x00008300UL, 0x00002c00UL, 0x00001a00UL, 0x00001b00UL, 0x00006e00UL, 0x00005a00UL, 0x0000a000UL,
-0x00005200UL, 0x00003b00UL, 0x0000d600UL, 0x0000b300UL, 0x00002900UL, 0x0000e300UL, 0x00002f00UL, 0x00008400UL,
-0x00005300UL, 0x0000d100UL, 0x00000000UL, 0x0000ed00UL, 0x00002000UL, 0x0000fc00UL, 0x0000b100UL, 0x00005b00UL,
-0x00006a00UL, 0x0000cb00UL, 0x0000be00UL, 0x00003900UL, 0x00004a00UL, 0x00004c00UL, 0x00005800UL, 0x0000cf00UL,
-0x0000d000UL, 0x0000ef00UL, 0x0000aa00UL, 0x0000fb00UL, 0x00004300UL, 0x00004d00UL, 0x00003300UL, 0x00008500UL,
-0x00004500UL, 0x0000f900UL, 0x00000200UL, 0x00007f00UL, 0x00005000UL, 0x00003c00UL, 0x00009f00UL, 0x0000a800UL,
-0x00005100UL, 0x0000a300UL, 0x00004000UL, 0x00008f00UL, 0x00009200UL, 0x00009d00UL, 0x00003800UL, 0x0000f500UL,
-0x0000bc00UL, 0x0000b600UL, 0x0000da00UL, 0x00002100UL, 0x00001000UL, 0x0000ff00UL, 0x0000f300UL, 0x0000d200UL,
-0x0000cd00UL, 0x00000c00UL, 0x00001300UL, 0x0000ec00UL, 0x00005f00UL, 0x00009700UL, 0x00004400UL, 0x00001700UL,
-0x0000c400UL, 0x0000a700UL, 0x00007e00UL, 0x00003d00UL, 0x00006400UL, 0x00005d00UL, 0x00001900UL, 0x00007300UL,
-0x00006000UL, 0x00008100UL, 0x00004f00UL, 0x0000dc00UL, 0x00002200UL, 0x00002a00UL, 0x00009000UL, 0x00008800UL,
-0x00004600UL, 0x0000ee00UL, 0x0000b800UL, 0x00001400UL, 0x0000de00UL, 0x00005e00UL, 0x00000b00UL, 0x0000db00UL,
-0x0000e000UL, 0x00003200UL, 0x00003a00UL, 0x00000a00UL, 0x00004900UL, 0x00000600UL, 0x00002400UL, 0x00005c00UL,
-0x0000c200UL, 0x0000d300UL, 0x0000ac00UL, 0x00006200UL, 0x00009100UL, 0x00009500UL, 0x0000e400UL, 0x00007900UL,
-0x0000e700UL, 0x0000c800UL, 0x00003700UL, 0x00006d00UL, 0x00008d00UL, 0x0000d500UL, 0x00004e00UL, 0x0000a900UL,
-0x00006c00UL, 0x00005600UL, 0x0000f400UL, 0x0000ea00UL, 0x00006500UL, 0x00007a00UL, 0x0000ae00UL, 0x00000800UL,
-0x0000ba00UL, 0x00007800UL, 0x00002500UL, 0x00002e00UL, 0x00001c00UL, 0x0000a600UL, 0x0000b400UL, 0x0000c600UL,
-0x0000e800UL, 0x0000dd00UL, 0x00007400UL, 0x00001f00UL, 0x00004b00UL, 0x0000bd00UL, 0x00008b00UL, 0x00008a00UL,
-0x00007000UL, 0x00003e00UL, 0x0000b500UL, 0x00006600UL, 0x00004800UL, 0x00000300UL, 0x0000f600UL, 0x00000e00UL,
-0x00006100UL, 0x00003500UL, 0x00005700UL, 0x0000b900UL, 0x00008600UL, 0x0000c100UL, 0x00001d00UL, 0x00009e00UL,
-0x0000e100UL, 0x0000f800UL, 0x00009800UL, 0x00001100UL, 0x00006900UL, 0x0000d900UL, 0x00008e00UL, 0x00009400UL,
-0x00009b00UL, 0x00001e00UL, 0x00008700UL, 0x0000e900UL, 0x0000ce00UL, 0x00005500UL, 0x00002800UL, 0x0000df00UL,
-0x00008c00UL, 0x0000a100UL, 0x00008900UL, 0x00000d00UL, 0x0000bf00UL, 0x0000e600UL, 0x00004200UL, 0x00006800UL,
-0x00004100UL, 0x00009900UL, 0x00002d00UL, 0x00000f00UL, 0x0000b000UL, 0x00005400UL, 0x0000bb00UL, 0x00001600UL
-};
-static const uint32 Te4_2[] = {
-0x00630000UL, 0x007c0000UL, 0x00770000UL, 0x007b0000UL, 0x00f20000UL, 0x006b0000UL, 0x006f0000UL, 0x00c50000UL,
-0x00300000UL, 0x00010000UL, 0x00670000UL, 0x002b0000UL, 0x00fe0000UL, 0x00d70000UL, 0x00ab0000UL, 0x00760000UL,
-0x00ca0000UL, 0x00820000UL, 0x00c90000UL, 0x007d0000UL, 0x00fa0000UL, 0x00590000UL, 0x00470000UL, 0x00f00000UL,
-0x00ad0000UL, 0x00d40000UL, 0x00a20000UL, 0x00af0000UL, 0x009c0000UL, 0x00a40000UL, 0x00720000UL, 0x00c00000UL,
-0x00b70000UL, 0x00fd0000UL, 0x00930000UL, 0x00260000UL, 0x00360000UL, 0x003f0000UL, 0x00f70000UL, 0x00cc0000UL,
-0x00340000UL, 0x00a50000UL, 0x00e50000UL, 0x00f10000UL, 0x00710000UL, 0x00d80000UL, 0x00310000UL, 0x00150000UL,
-0x00040000UL, 0x00c70000UL, 0x00230000UL, 0x00c30000UL, 0x00180000UL, 0x00960000UL, 0x00050000UL, 0x009a0000UL,
-0x00070000UL, 0x00120000UL, 0x00800000UL, 0x00e20000UL, 0x00eb0000UL, 0x00270000UL, 0x00b20000UL, 0x00750000UL,
-0x00090000UL, 0x00830000UL, 0x002c0000UL, 0x001a0000UL, 0x001b0000UL, 0x006e0000UL, 0x005a0000UL, 0x00a00000UL,
-0x00520000UL, 0x003b0000UL, 0x00d60000UL, 0x00b30000UL, 0x00290000UL, 0x00e30000UL, 0x002f0000UL, 0x00840000UL,
-0x00530000UL, 0x00d10000UL, 0x00000000UL, 0x00ed0000UL, 0x00200000UL, 0x00fc0000UL, 0x00b10000UL, 0x005b0000UL,
-0x006a0000UL, 0x00cb0000UL, 0x00be0000UL, 0x00390000UL, 0x004a0000UL, 0x004c0000UL, 0x00580000UL, 0x00cf0000UL,
-0x00d00000UL, 0x00ef0000UL, 0x00aa0000UL, 0x00fb0000UL, 0x00430000UL, 0x004d0000UL, 0x00330000UL, 0x00850000UL,
-0x00450000UL, 0x00f90000UL, 0x00020000UL, 0x007f0000UL, 0x00500000UL, 0x003c0000UL, 0x009f0000UL, 0x00a80000UL,
-0x00510000UL, 0x00a30000UL, 0x00400000UL, 0x008f0000UL, 0x00920000UL, 0x009d0000UL, 0x00380000UL, 0x00f50000UL,
-0x00bc0000UL, 0x00b60000UL, 0x00da0000UL, 0x00210000UL, 0x00100000UL, 0x00ff0000UL, 0x00f30000UL, 0x00d20000UL,
-0x00cd0000UL, 0x000c0000UL, 0x00130000UL, 0x00ec0000UL, 0x005f0000UL, 0x00970000UL, 0x00440000UL, 0x00170000UL,
-0x00c40000UL, 0x00a70000UL, 0x007e0000UL, 0x003d0000UL, 0x00640000UL, 0x005d0000UL, 0x00190000UL, 0x00730000UL,
-0x00600000UL, 0x00810000UL, 0x004f0000UL, 0x00dc0000UL, 0x00220000UL, 0x002a0000UL, 0x00900000UL, 0x00880000UL,
-0x00460000UL, 0x00ee0000UL, 0x00b80000UL, 0x00140000UL, 0x00de0000UL, 0x005e0000UL, 0x000b0000UL, 0x00db0000UL,
-0x00e00000UL, 0x00320000UL, 0x003a0000UL, 0x000a0000UL, 0x00490000UL, 0x00060000UL, 0x00240000UL, 0x005c0000UL,
-0x00c20000UL, 0x00d30000UL, 0x00ac0000UL, 0x00620000UL, 0x00910000UL, 0x00950000UL, 0x00e40000UL, 0x00790000UL,
-0x00e70000UL, 0x00c80000UL, 0x00370000UL, 0x006d0000UL, 0x008d0000UL, 0x00d50000UL, 0x004e0000UL, 0x00a90000UL,
-0x006c0000UL, 0x00560000UL, 0x00f40000UL, 0x00ea0000UL, 0x00650000UL, 0x007a0000UL, 0x00ae0000UL, 0x00080000UL,
-0x00ba0000UL, 0x00780000UL, 0x00250000UL, 0x002e0000UL, 0x001c0000UL, 0x00a60000UL, 0x00b40000UL, 0x00c60000UL,
-0x00e80000UL, 0x00dd0000UL, 0x00740000UL, 0x001f0000UL, 0x004b0000UL, 0x00bd0000UL, 0x008b0000UL, 0x008a0000UL,
-0x00700000UL, 0x003e0000UL, 0x00b50000UL, 0x00660000UL, 0x00480000UL, 0x00030000UL, 0x00f60000UL, 0x000e0000UL,
-0x00610000UL, 0x00350000UL, 0x00570000UL, 0x00b90000UL, 0x00860000UL, 0x00c10000UL, 0x001d0000UL, 0x009e0000UL,
-0x00e10000UL, 0x00f80000UL, 0x00980000UL, 0x00110000UL, 0x00690000UL, 0x00d90000UL, 0x008e0000UL, 0x00940000UL,
-0x009b0000UL, 0x001e0000UL, 0x00870000UL, 0x00e90000UL, 0x00ce0000UL, 0x00550000UL, 0x00280000UL, 0x00df0000UL,
-0x008c0000UL, 0x00a10000UL, 0x00890000UL, 0x000d0000UL, 0x00bf0000UL, 0x00e60000UL, 0x00420000UL, 0x00680000UL,
-0x00410000UL, 0x00990000UL, 0x002d0000UL, 0x000f0000UL, 0x00b00000UL, 0x00540000UL, 0x00bb0000UL, 0x00160000UL
-};
-static const uint32 Te4_3[] = {
-0x63000000UL, 0x7c000000UL, 0x77000000UL, 0x7b000000UL, 0xf2000000UL, 0x6b000000UL, 0x6f000000UL, 0xc5000000UL,
-0x30000000UL, 0x01000000UL, 0x67000000UL, 0x2b000000UL, 0xfe000000UL, 0xd7000000UL, 0xab000000UL, 0x76000000UL,
-0xca000000UL, 0x82000000UL, 0xc9000000UL, 0x7d000000UL, 0xfa000000UL, 0x59000000UL, 0x47000000UL, 0xf0000000UL,
-0xad000000UL, 0xd4000000UL, 0xa2000000UL, 0xaf000000UL, 0x9c000000UL, 0xa4000000UL, 0x72000000UL, 0xc0000000UL,
-0xb7000000UL, 0xfd000000UL, 0x93000000UL, 0x26000000UL, 0x36000000UL, 0x3f000000UL, 0xf7000000UL, 0xcc000000UL,
-0x34000000UL, 0xa5000000UL, 0xe5000000UL, 0xf1000000UL, 0x71000000UL, 0xd8000000UL, 0x31000000UL, 0x15000000UL,
-0x04000000UL, 0xc7000000UL, 0x23000000UL, 0xc3000000UL, 0x18000000UL, 0x96000000UL, 0x05000000UL, 0x9a000000UL,
-0x07000000UL, 0x12000000UL, 0x80000000UL, 0xe2000000UL, 0xeb000000UL, 0x27000000UL, 0xb2000000UL, 0x75000000UL,
-0x09000000UL, 0x83000000UL, 0x2c000000UL, 0x1a000000UL, 0x1b000000UL, 0x6e000000UL, 0x5a000000UL, 0xa0000000UL,
-0x52000000UL, 0x3b000000UL, 0xd6000000UL, 0xb3000000UL, 0x29000000UL, 0xe3000000UL, 0x2f000000UL, 0x84000000UL,
-0x53000000UL, 0xd1000000UL, 0x00000000UL, 0xed000000UL, 0x20000000UL, 0xfc000000UL, 0xb1000000UL, 0x5b000000UL,
-0x6a000000UL, 0xcb000000UL, 0xbe000000UL, 0x39000000UL, 0x4a000000UL, 0x4c000000UL, 0x58000000UL, 0xcf000000UL,
-0xd0000000UL, 0xef000000UL, 0xaa000000UL, 0xfb000000UL, 0x43000000UL, 0x4d000000UL, 0x33000000UL, 0x85000000UL,
-0x45000000UL, 0xf9000000UL, 0x02000000UL, 0x7f000000UL, 0x50000000UL, 0x3c000000UL, 0x9f000000UL, 0xa8000000UL,
-0x51000000UL, 0xa3000000UL, 0x40000000UL, 0x8f000000UL, 0x92000000UL, 0x9d000000UL, 0x38000000UL, 0xf5000000UL,
-0xbc000000UL, 0xb6000000UL, 0xda000000UL, 0x21000000UL, 0x10000000UL, 0xff000000UL, 0xf3000000UL, 0xd2000000UL,
-0xcd000000UL, 0x0c000000UL, 0x13000000UL, 0xec000000UL, 0x5f000000UL, 0x97000000UL, 0x44000000UL, 0x17000000UL,
-0xc4000000UL, 0xa7000000UL, 0x7e000000UL, 0x3d000000UL, 0x64000000UL, 0x5d000000UL, 0x19000000UL, 0x73000000UL,
-0x60000000UL, 0x81000000UL, 0x4f000000UL, 0xdc000000UL, 0x22000000UL, 0x2a000000UL, 0x90000000UL, 0x88000000UL,
-0x46000000UL, 0xee000000UL, 0xb8000000UL, 0x14000000UL, 0xde000000UL, 0x5e000000UL, 0x0b000000UL, 0xdb000000UL,
-0xe0000000UL, 0x32000000UL, 0x3a000000UL, 0x0a000000UL, 0x49000000UL, 0x06000000UL, 0x24000000UL, 0x5c000000UL,
-0xc2000000UL, 0xd3000000UL, 0xac000000UL, 0x62000000UL, 0x91000000UL, 0x95000000UL, 0xe4000000UL, 0x79000000UL,
-0xe7000000UL, 0xc8000000UL, 0x37000000UL, 0x6d000000UL, 0x8d000000UL, 0xd5000000UL, 0x4e000000UL, 0xa9000000UL,
-0x6c000000UL, 0x56000000UL, 0xf4000000UL, 0xea000000UL, 0x65000000UL, 0x7a000000UL, 0xae000000UL, 0x08000000UL,
-0xba000000UL, 0x78000000UL, 0x25000000UL, 0x2e000000UL, 0x1c000000UL, 0xa6000000UL, 0xb4000000UL, 0xc6000000UL,
-0xe8000000UL, 0xdd000000UL, 0x74000000UL, 0x1f000000UL, 0x4b000000UL, 0xbd000000UL, 0x8b000000UL, 0x8a000000UL,
-0x70000000UL, 0x3e000000UL, 0xb5000000UL, 0x66000000UL, 0x48000000UL, 0x03000000UL, 0xf6000000UL, 0x0e000000UL,
-0x61000000UL, 0x35000000UL, 0x57000000UL, 0xb9000000UL, 0x86000000UL, 0xc1000000UL, 0x1d000000UL, 0x9e000000UL,
-0xe1000000UL, 0xf8000000UL, 0x98000000UL, 0x11000000UL, 0x69000000UL, 0xd9000000UL, 0x8e000000UL, 0x94000000UL,
-0x9b000000UL, 0x1e000000UL, 0x87000000UL, 0xe9000000UL, 0xce000000UL, 0x55000000UL, 0x28000000UL, 0xdf000000UL,
-0x8c000000UL, 0xa1000000UL, 0x89000000UL, 0x0d000000UL, 0xbf000000UL, 0xe6000000UL, 0x42000000UL, 0x68000000UL,
-0x41000000UL, 0x99000000UL, 0x2d000000UL, 0x0f000000UL, 0xb0000000UL, 0x54000000UL, 0xbb000000UL, 0x16000000UL
-};
-static const uint32 TD1[256] = {
-        0x5051f4a7UL, 0x537e4165UL, 0xc31a17a4UL, 0x963a275eUL,
-        0xcb3bab6bUL, 0xf11f9d45UL, 0xabacfa58UL, 0x934be303UL,
-        0x552030faUL, 0xf6ad766dUL, 0x9188cc76UL, 0x25f5024cUL,
-        0xfc4fe5d7UL, 0xd7c52acbUL, 0x80263544UL, 0x8fb562a3UL,
-        0x49deb15aUL, 0x6725ba1bUL, 0x9845ea0eUL, 0xe15dfec0UL,
-        0x02c32f75UL, 0x12814cf0UL, 0xa38d4697UL, 0xc66bd3f9UL,
-        0xe7038f5fUL, 0x9515929cUL, 0xebbf6d7aUL, 0xda955259UL,
-        0x2dd4be83UL, 0xd3587421UL, 0x2949e069UL, 0x448ec9c8UL,
-        0x6a75c289UL, 0x78f48e79UL, 0x6b99583eUL, 0xdd27b971UL,
-        0xb6bee14fUL, 0x17f088adUL, 0x66c920acUL, 0xb47dce3aUL,
-        0x1863df4aUL, 0x82e51a31UL, 0x60975133UL, 0x4562537fUL,
-        0xe0b16477UL, 0x84bb6baeUL, 0x1cfe81a0UL, 0x94f9082bUL,
-        0x58704868UL, 0x198f45fdUL, 0x8794de6cUL, 0xb7527bf8UL,
-        0x23ab73d3UL, 0xe2724b02UL, 0x57e31f8fUL, 0x2a6655abUL,
-        0x07b2eb28UL, 0x032fb5c2UL, 0x9a86c57bUL, 0xa5d33708UL,
-        0xf2302887UL, 0xb223bfa5UL, 0xba02036aUL, 0x5ced1682UL,
-        0x2b8acf1cUL, 0x92a779b4UL, 0xf0f307f2UL, 0xa14e69e2UL,
-        0xcd65daf4UL, 0xd50605beUL, 0x1fd13462UL, 0x8ac4a6feUL,
-        0x9d342e53UL, 0xa0a2f355UL, 0x32058ae1UL, 0x75a4f6ebUL,
-        0x390b83ecUL, 0xaa4060efUL, 0x065e719fUL, 0x51bd6e10UL,
-        0xf93e218aUL, 0x3d96dd06UL, 0xaedd3e05UL, 0x464de6bdUL,
-        0xb591548dUL, 0x0571c45dUL, 0x6f0406d4UL, 0xff605015UL,
-        0x241998fbUL, 0x97d6bde9UL, 0xcc894043UL, 0x7767d99eUL,
-        0xbdb0e842UL, 0x8807898bUL, 0x38e7195bUL, 0xdb79c8eeUL,
-        0x47a17c0aUL, 0xe97c420fUL, 0xc9f8841eUL, 0x00000000UL,
-        0x83098086UL, 0x48322bedUL, 0xac1e1170UL, 0x4e6c5a72UL,
-        0xfbfd0effUL, 0x560f8538UL, 0x1e3daed5UL, 0x27362d39UL,
-        0x640a0fd9UL, 0x21685ca6UL, 0xd19b5b54UL, 0x3a24362eUL,
-        0xb10c0a67UL, 0x0f9357e7UL, 0xd2b4ee96UL, 0x9e1b9b91UL,
-        0x4f80c0c5UL, 0xa261dc20UL, 0x695a774bUL, 0x161c121aUL,
-        0x0ae293baUL, 0xe5c0a02aUL, 0x433c22e0UL, 0x1d121b17UL,
-        0x0b0e090dUL, 0xadf28bc7UL, 0xb92db6a8UL, 0xc8141ea9UL,
-        0x8557f119UL, 0x4caf7507UL, 0xbbee99ddUL, 0xfda37f60UL,
-        0x9ff70126UL, 0xbc5c72f5UL, 0xc544663bUL, 0x345bfb7eUL,
-        0x768b4329UL, 0xdccb23c6UL, 0x68b6edfcUL, 0x63b8e4f1UL,
-        0xcad731dcUL, 0x10426385UL, 0x40139722UL, 0x2084c611UL,
-        0x7d854a24UL, 0xf8d2bb3dUL, 0x11aef932UL, 0x6dc729a1UL,
-        0x4b1d9e2fUL, 0xf3dcb230UL, 0xec0d8652UL, 0xd077c1e3UL,
-        0x6c2bb316UL, 0x99a970b9UL, 0xfa119448UL, 0x2247e964UL,
-        0xc4a8fc8cUL, 0x1aa0f03fUL, 0xd8567d2cUL, 0xef223390UL,
-        0xc787494eUL, 0xc1d938d1UL, 0xfe8ccaa2UL, 0x3698d40bUL,
-        0xcfa6f581UL, 0x28a57adeUL, 0x26dab78eUL, 0xa43fadbfUL,
-        0xe42c3a9dUL, 0x0d507892UL, 0x9b6a5fccUL, 0x62547e46UL,
-        0xc2f68d13UL, 0xe890d8b8UL, 0x5e2e39f7UL, 0xf582c3afUL,
-        0xbe9f5d80UL, 0x7c69d093UL, 0xa96fd52dUL, 0xb3cf2512UL,
-        0x3bc8ac99UL, 0xa710187dUL, 0x6ee89c63UL, 0x7bdb3bbbUL,
-        0x09cd2678UL, 0xf46e5918UL, 0x01ec9ab7UL, 0xa8834f9aUL,
-        0x65e6956eUL, 0x7eaaffe6UL, 0x0821bccfUL, 0xe6ef15e8UL,
-        0xd9bae79bUL, 0xce4a6f36UL, 0xd4ea9f09UL, 0xd629b07cUL,
-        0xaf31a4b2UL, 0x312a3f23UL, 0x30c6a594UL, 0xc035a266UL,
-        0x37744ebcUL, 0xa6fc82caUL, 0xb0e090d0UL, 0x1533a7d8UL,
-        0x4af10498UL, 0xf741ecdaUL, 0x0e7fcd50UL, 0x2f1791f6UL,
-        0x8d764dd6UL, 0x4d43efb0UL, 0x54ccaa4dUL, 0xdfe49604UL,
-        0xe39ed1b5UL, 0x1b4c6a88UL, 0xb8c12c1fUL, 0x7f466551UL,
-        0x049d5eeaUL, 0x5d018c35UL, 0x73fa8774UL, 0x2efb0b41UL,
-        0x5ab3671dUL, 0x5292dbd2UL, 0x33e91056UL, 0x136dd647UL,
-        0x8c9ad761UL, 0x7a37a10cUL, 0x8e59f814UL, 0x89eb133cUL,
-        0xeecea927UL, 0x35b761c9UL, 0xede11ce5UL, 0x3c7a47b1UL,
-        0x599cd2dfUL, 0x3f55f273UL, 0x791814ceUL, 0xbf73c737UL,
-        0xea53f7cdUL, 0x5b5ffdaaUL, 0x14df3d6fUL, 0x867844dbUL,
-        0x81caaff3UL, 0x3eb968c4UL, 0x2c382434UL, 0x5fc2a340UL,
-        0x72161dc3UL, 0x0cbce225UL, 0x8b283c49UL, 0x41ff0d95UL,
-        0x7139a801UL, 0xde080cb3UL, 0x9cd8b4e4UL, 0x906456c1UL,
-        0x617bcb84UL, 0x70d532b6UL, 0x74486c5cUL, 0x42d0b857UL,
-};
-static const uint32 TD2[256] = {
-        0xa75051f4UL, 0x65537e41UL, 0xa4c31a17UL, 0x5e963a27UL,
-        0x6bcb3babUL, 0x45f11f9dUL, 0x58abacfaUL, 0x03934be3UL,
-        0xfa552030UL, 0x6df6ad76UL, 0x769188ccUL, 0x4c25f502UL,
-        0xd7fc4fe5UL, 0xcbd7c52aUL, 0x44802635UL, 0xa38fb562UL,
-        0x5a49deb1UL, 0x1b6725baUL, 0x0e9845eaUL, 0xc0e15dfeUL,
-        0x7502c32fUL, 0xf012814cUL, 0x97a38d46UL, 0xf9c66bd3UL,
-        0x5fe7038fUL, 0x9c951592UL, 0x7aebbf6dUL, 0x59da9552UL,
-        0x832dd4beUL, 0x21d35874UL, 0x692949e0UL, 0xc8448ec9UL,
-        0x896a75c2UL, 0x7978f48eUL, 0x3e6b9958UL, 0x71dd27b9UL,
-        0x4fb6bee1UL, 0xad17f088UL, 0xac66c920UL, 0x3ab47dceUL,
-        0x4a1863dfUL, 0x3182e51aUL, 0x33609751UL, 0x7f456253UL,
-        0x77e0b164UL, 0xae84bb6bUL, 0xa01cfe81UL, 0x2b94f908UL,
-        0x68587048UL, 0xfd198f45UL, 0x6c8794deUL, 0xf8b7527bUL,
-        0xd323ab73UL, 0x02e2724bUL, 0x8f57e31fUL, 0xab2a6655UL,
-        0x2807b2ebUL, 0xc2032fb5UL, 0x7b9a86c5UL, 0x08a5d337UL,
-        0x87f23028UL, 0xa5b223bfUL, 0x6aba0203UL, 0x825ced16UL,
-        0x1c2b8acfUL, 0xb492a779UL, 0xf2f0f307UL, 0xe2a14e69UL,
-        0xf4cd65daUL, 0xbed50605UL, 0x621fd134UL, 0xfe8ac4a6UL,
-        0x539d342eUL, 0x55a0a2f3UL, 0xe132058aUL, 0xeb75a4f6UL,
-        0xec390b83UL, 0xefaa4060UL, 0x9f065e71UL, 0x1051bd6eUL,
-        0x8af93e21UL, 0x063d96ddUL, 0x05aedd3eUL, 0xbd464de6UL,
-        0x8db59154UL, 0x5d0571c4UL, 0xd46f0406UL, 0x15ff6050UL,
-        0xfb241998UL, 0xe997d6bdUL, 0x43cc8940UL, 0x9e7767d9UL,
-        0x42bdb0e8UL, 0x8b880789UL, 0x5b38e719UL, 0xeedb79c8UL,
-        0x0a47a17cUL, 0x0fe97c42UL, 0x1ec9f884UL, 0x00000000UL,
-        0x86830980UL, 0xed48322bUL, 0x70ac1e11UL, 0x724e6c5aUL,
-        0xfffbfd0eUL, 0x38560f85UL, 0xd51e3daeUL, 0x3927362dUL,
-        0xd9640a0fUL, 0xa621685cUL, 0x54d19b5bUL, 0x2e3a2436UL,
-        0x67b10c0aUL, 0xe70f9357UL, 0x96d2b4eeUL, 0x919e1b9bUL,
-        0xc54f80c0UL, 0x20a261dcUL, 0x4b695a77UL, 0x1a161c12UL,
-        0xba0ae293UL, 0x2ae5c0a0UL, 0xe0433c22UL, 0x171d121bUL,
-        0x0d0b0e09UL, 0xc7adf28bUL, 0xa8b92db6UL, 0xa9c8141eUL,
-        0x198557f1UL, 0x074caf75UL, 0xddbbee99UL, 0x60fda37fUL,
-        0x269ff701UL, 0xf5bc5c72UL, 0x3bc54466UL, 0x7e345bfbUL,
-        0x29768b43UL, 0xc6dccb23UL, 0xfc68b6edUL, 0xf163b8e4UL,
-        0xdccad731UL, 0x85104263UL, 0x22401397UL, 0x112084c6UL,
-        0x247d854aUL, 0x3df8d2bbUL, 0x3211aef9UL, 0xa16dc729UL,
-        0x2f4b1d9eUL, 0x30f3dcb2UL, 0x52ec0d86UL, 0xe3d077c1UL,
-        0x166c2bb3UL, 0xb999a970UL, 0x48fa1194UL, 0x642247e9UL,
-        0x8cc4a8fcUL, 0x3f1aa0f0UL, 0x2cd8567dUL, 0x90ef2233UL,
-        0x4ec78749UL, 0xd1c1d938UL, 0xa2fe8ccaUL, 0x0b3698d4UL,
-        0x81cfa6f5UL, 0xde28a57aUL, 0x8e26dab7UL, 0xbfa43fadUL,
-        0x9de42c3aUL, 0x920d5078UL, 0xcc9b6a5fUL, 0x4662547eUL,
-        0x13c2f68dUL, 0xb8e890d8UL, 0xf75e2e39UL, 0xaff582c3UL,
-        0x80be9f5dUL, 0x937c69d0UL, 0x2da96fd5UL, 0x12b3cf25UL,
-        0x993bc8acUL, 0x7da71018UL, 0x636ee89cUL, 0xbb7bdb3bUL,
-        0x7809cd26UL, 0x18f46e59UL, 0xb701ec9aUL, 0x9aa8834fUL,
-        0x6e65e695UL, 0xe67eaaffUL, 0xcf0821bcUL, 0xe8e6ef15UL,
-        0x9bd9bae7UL, 0x36ce4a6fUL, 0x09d4ea9fUL, 0x7cd629b0UL,
-        0xb2af31a4UL, 0x23312a3fUL, 0x9430c6a5UL, 0x66c035a2UL,
-        0xbc37744eUL, 0xcaa6fc82UL, 0xd0b0e090UL, 0xd81533a7UL,
-        0x984af104UL, 0xdaf741ecUL, 0x500e7fcdUL, 0xf62f1791UL,
-        0xd68d764dUL, 0xb04d43efUL, 0x4d54ccaaUL, 0x04dfe496UL,
-        0xb5e39ed1UL, 0x881b4c6aUL, 0x1fb8c12cUL, 0x517f4665UL,
-        0xea049d5eUL, 0x355d018cUL, 0x7473fa87UL, 0x412efb0bUL,
-        0x1d5ab367UL, 0xd25292dbUL, 0x5633e910UL, 0x47136dd6UL,
-        0x618c9ad7UL, 0x0c7a37a1UL, 0x148e59f8UL, 0x3c89eb13UL,
-        0x27eecea9UL, 0xc935b761UL, 0xe5ede11cUL, 0xb13c7a47UL,
-        0xdf599cd2UL, 0x733f55f2UL, 0xce791814UL, 0x37bf73c7UL,
-        0xcdea53f7UL, 0xaa5b5ffdUL, 0x6f14df3dUL, 0xdb867844UL,
-        0xf381caafUL, 0xc43eb968UL, 0x342c3824UL, 0x405fc2a3UL,
-        0xc372161dUL, 0x250cbce2UL, 0x498b283cUL, 0x9541ff0dUL,
-        0x017139a8UL, 0xb3de080cUL, 0xe49cd8b4UL, 0xc1906456UL,
-        0x84617bcbUL, 0xb670d532UL, 0x5c74486cUL, 0x5742d0b8UL,
-};
-static const uint32 TD3[256] = {
-        0xf4a75051UL, 0x4165537eUL, 0x17a4c31aUL, 0x275e963aUL,
-        0xab6bcb3bUL, 0x9d45f11fUL, 0xfa58abacUL, 0xe303934bUL,
-        0x30fa5520UL, 0x766df6adUL, 0xcc769188UL, 0x024c25f5UL,
-        0xe5d7fc4fUL, 0x2acbd7c5UL, 0x35448026UL, 0x62a38fb5UL,
-        0xb15a49deUL, 0xba1b6725UL, 0xea0e9845UL, 0xfec0e15dUL,
-        0x2f7502c3UL, 0x4cf01281UL, 0x4697a38dUL, 0xd3f9c66bUL,
-        0x8f5fe703UL, 0x929c9515UL, 0x6d7aebbfUL, 0x5259da95UL,
-        0xbe832dd4UL, 0x7421d358UL, 0xe0692949UL, 0xc9c8448eUL,
-        0xc2896a75UL, 0x8e7978f4UL, 0x583e6b99UL, 0xb971dd27UL,
-        0xe14fb6beUL, 0x88ad17f0UL, 0x20ac66c9UL, 0xce3ab47dUL,
-        0xdf4a1863UL, 0x1a3182e5UL, 0x51336097UL, 0x537f4562UL,
-        0x6477e0b1UL, 0x6bae84bbUL, 0x81a01cfeUL, 0x082b94f9UL,
-        0x48685870UL, 0x45fd198fUL, 0xde6c8794UL, 0x7bf8b752UL,
-        0x73d323abUL, 0x4b02e272UL, 0x1f8f57e3UL, 0x55ab2a66UL,
-        0xeb2807b2UL, 0xb5c2032fUL, 0xc57b9a86UL, 0x3708a5d3UL,
-        0x2887f230UL, 0xbfa5b223UL, 0x036aba02UL, 0x16825cedUL,
-        0xcf1c2b8aUL, 0x79b492a7UL, 0x07f2f0f3UL, 0x69e2a14eUL,
-        0xdaf4cd65UL, 0x05bed506UL, 0x34621fd1UL, 0xa6fe8ac4UL,
-        0x2e539d34UL, 0xf355a0a2UL, 0x8ae13205UL, 0xf6eb75a4UL,
-        0x83ec390bUL, 0x60efaa40UL, 0x719f065eUL, 0x6e1051bdUL,
-        0x218af93eUL, 0xdd063d96UL, 0x3e05aeddUL, 0xe6bd464dUL,
-        0x548db591UL, 0xc45d0571UL, 0x06d46f04UL, 0x5015ff60UL,
-        0x98fb2419UL, 0xbde997d6UL, 0x4043cc89UL, 0xd99e7767UL,
-        0xe842bdb0UL, 0x898b8807UL, 0x195b38e7UL, 0xc8eedb79UL,
-        0x7c0a47a1UL, 0x420fe97cUL, 0x841ec9f8UL, 0x00000000UL,
-        0x80868309UL, 0x2bed4832UL, 0x1170ac1eUL, 0x5a724e6cUL,
-        0x0efffbfdUL, 0x8538560fUL, 0xaed51e3dUL, 0x2d392736UL,
-        0x0fd9640aUL, 0x5ca62168UL, 0x5b54d19bUL, 0x362e3a24UL,
-        0x0a67b10cUL, 0x57e70f93UL, 0xee96d2b4UL, 0x9b919e1bUL,
-        0xc0c54f80UL, 0xdc20a261UL, 0x774b695aUL, 0x121a161cUL,
-        0x93ba0ae2UL, 0xa02ae5c0UL, 0x22e0433cUL, 0x1b171d12UL,
-        0x090d0b0eUL, 0x8bc7adf2UL, 0xb6a8b92dUL, 0x1ea9c814UL,
-        0xf1198557UL, 0x75074cafUL, 0x99ddbbeeUL, 0x7f60fda3UL,
-        0x01269ff7UL, 0x72f5bc5cUL, 0x663bc544UL, 0xfb7e345bUL,
-        0x4329768bUL, 0x23c6dccbUL, 0xedfc68b6UL, 0xe4f163b8UL,
-        0x31dccad7UL, 0x63851042UL, 0x97224013UL, 0xc6112084UL,
-        0x4a247d85UL, 0xbb3df8d2UL, 0xf93211aeUL, 0x29a16dc7UL,
-        0x9e2f4b1dUL, 0xb230f3dcUL, 0x8652ec0dUL, 0xc1e3d077UL,
-        0xb3166c2bUL, 0x70b999a9UL, 0x9448fa11UL, 0xe9642247UL,
-        0xfc8cc4a8UL, 0xf03f1aa0UL, 0x7d2cd856UL, 0x3390ef22UL,
-        0x494ec787UL, 0x38d1c1d9UL, 0xcaa2fe8cUL, 0xd40b3698UL,
-        0xf581cfa6UL, 0x7ade28a5UL, 0xb78e26daUL, 0xadbfa43fUL,
-        0x3a9de42cUL, 0x78920d50UL, 0x5fcc9b6aUL, 0x7e466254UL,
-        0x8d13c2f6UL, 0xd8b8e890UL, 0x39f75e2eUL, 0xc3aff582UL,
-        0x5d80be9fUL, 0xd0937c69UL, 0xd52da96fUL, 0x2512b3cfUL,
-        0xac993bc8UL, 0x187da710UL, 0x9c636ee8UL, 0x3bbb7bdbUL,
-        0x267809cdUL, 0x5918f46eUL, 0x9ab701ecUL, 0x4f9aa883UL,
-        0x956e65e6UL, 0xffe67eaaUL, 0xbccf0821UL, 0x15e8e6efUL,
-        0xe79bd9baUL, 0x6f36ce4aUL, 0x9f09d4eaUL, 0xb07cd629UL,
-        0xa4b2af31UL, 0x3f23312aUL, 0xa59430c6UL, 0xa266c035UL,
-        0x4ebc3774UL, 0x82caa6fcUL, 0x90d0b0e0UL, 0xa7d81533UL,
-        0x04984af1UL, 0xecdaf741UL, 0xcd500e7fUL, 0x91f62f17UL,
-        0x4dd68d76UL, 0xefb04d43UL, 0xaa4d54ccUL, 0x9604dfe4UL,
-        0xd1b5e39eUL, 0x6a881b4cUL, 0x2c1fb8c1UL, 0x65517f46UL,
-        0x5eea049dUL, 0x8c355d01UL, 0x877473faUL, 0x0b412efbUL,
-        0x671d5ab3UL, 0xdbd25292UL, 0x105633e9UL, 0xd647136dUL,
-        0xd7618c9aUL, 0xa10c7a37UL, 0xf8148e59UL, 0x133c89ebUL,
-        0xa927eeceUL, 0x61c935b7UL, 0x1ce5ede1UL, 0x47b13c7aUL,
-        0xd2df599cUL, 0xf2733f55UL, 0x14ce7918UL, 0xc737bf73UL,
-        0xf7cdea53UL, 0xfdaa5b5fUL, 0x3d6f14dfUL, 0x44db8678UL,
-        0xaff381caUL, 0x68c43eb9UL, 0x24342c38UL, 0xa3405fc2UL,
-        0x1dc37216UL, 0xe2250cbcUL, 0x3c498b28UL, 0x0d9541ffUL,
-        0xa8017139UL, 0x0cb3de08UL, 0xb4e49cd8UL, 0x56c19064UL,
-        0xcb84617bUL, 0x32b670d5UL, 0x6c5c7448UL, 0xb85742d0UL,
-};
-static const uint32 Tks0[] = {
-0x00000000UL, 0x0e090d0bUL, 0x1c121a16UL, 0x121b171dUL, 0x3824342cUL, 0x362d3927UL, 0x24362e3aUL, 0x2a3f2331UL,
-0x70486858UL, 0x7e416553UL, 0x6c5a724eUL, 0x62537f45UL, 0x486c5c74UL, 0x4665517fUL, 0x547e4662UL, 0x5a774b69UL,
-0xe090d0b0UL, 0xee99ddbbUL, 0xfc82caa6UL, 0xf28bc7adUL, 0xd8b4e49cUL, 0xd6bde997UL, 0xc4a6fe8aUL, 0xcaaff381UL,
-0x90d8b8e8UL, 0x9ed1b5e3UL, 0x8ccaa2feUL, 0x82c3aff5UL, 0xa8fc8cc4UL, 0xa6f581cfUL, 0xb4ee96d2UL, 0xbae79bd9UL,
-0xdb3bbb7bUL, 0xd532b670UL, 0xc729a16dUL, 0xc920ac66UL, 0xe31f8f57UL, 0xed16825cUL, 0xff0d9541UL, 0xf104984aUL,
-0xab73d323UL, 0xa57ade28UL, 0xb761c935UL, 0xb968c43eUL, 0x9357e70fUL, 0x9d5eea04UL, 0x8f45fd19UL, 0x814cf012UL,
-0x3bab6bcbUL, 0x35a266c0UL, 0x27b971ddUL, 0x29b07cd6UL, 0x038f5fe7UL, 0x0d8652ecUL, 0x1f9d45f1UL, 0x119448faUL,
-0x4be30393UL, 0x45ea0e98UL, 0x57f11985UL, 0x59f8148eUL, 0x73c737bfUL, 0x7dce3ab4UL, 0x6fd52da9UL, 0x61dc20a2UL,
-0xad766df6UL, 0xa37f60fdUL, 0xb16477e0UL, 0xbf6d7aebUL, 0x955259daUL, 0x9b5b54d1UL, 0x894043ccUL, 0x87494ec7UL,
-0xdd3e05aeUL, 0xd33708a5UL, 0xc12c1fb8UL, 0xcf2512b3UL, 0xe51a3182UL, 0xeb133c89UL, 0xf9082b94UL, 0xf701269fUL,
-0x4de6bd46UL, 0x43efb04dUL, 0x51f4a750UL, 0x5ffdaa5bUL, 0x75c2896aUL, 0x7bcb8461UL, 0x69d0937cUL, 0x67d99e77UL,
-0x3daed51eUL, 0x33a7d815UL, 0x21bccf08UL, 0x2fb5c203UL, 0x058ae132UL, 0x0b83ec39UL, 0x1998fb24UL, 0x1791f62fUL,
-0x764dd68dUL, 0x7844db86UL, 0x6a5fcc9bUL, 0x6456c190UL, 0x4e69e2a1UL, 0x4060efaaUL, 0x527bf8b7UL, 0x5c72f5bcUL,
-0x0605bed5UL, 0x080cb3deUL, 0x1a17a4c3UL, 0x141ea9c8UL, 0x3e218af9UL, 0x302887f2UL, 0x223390efUL, 0x2c3a9de4UL,
-0x96dd063dUL, 0x98d40b36UL, 0x8acf1c2bUL, 0x84c61120UL, 0xaef93211UL, 0xa0f03f1aUL, 0xb2eb2807UL, 0xbce2250cUL,
-0xe6956e65UL, 0xe89c636eUL, 0xfa877473UL, 0xf48e7978UL, 0xdeb15a49UL, 0xd0b85742UL, 0xc2a3405fUL, 0xccaa4d54UL,
-0x41ecdaf7UL, 0x4fe5d7fcUL, 0x5dfec0e1UL, 0x53f7cdeaUL, 0x79c8eedbUL, 0x77c1e3d0UL, 0x65daf4cdUL, 0x6bd3f9c6UL,
-0x31a4b2afUL, 0x3fadbfa4UL, 0x2db6a8b9UL, 0x23bfa5b2UL, 0x09808683UL, 0x07898b88UL, 0x15929c95UL, 0x1b9b919eUL,
-0xa17c0a47UL, 0xaf75074cUL, 0xbd6e1051UL, 0xb3671d5aUL, 0x99583e6bUL, 0x97513360UL, 0x854a247dUL, 0x8b432976UL,
-0xd134621fUL, 0xdf3d6f14UL, 0xcd267809UL, 0xc32f7502UL, 0xe9105633UL, 0xe7195b38UL, 0xf5024c25UL, 0xfb0b412eUL,
-0x9ad7618cUL, 0x94de6c87UL, 0x86c57b9aUL, 0x88cc7691UL, 0xa2f355a0UL, 0xacfa58abUL, 0xbee14fb6UL, 0xb0e842bdUL,
-0xea9f09d4UL, 0xe49604dfUL, 0xf68d13c2UL, 0xf8841ec9UL, 0xd2bb3df8UL, 0xdcb230f3UL, 0xcea927eeUL, 0xc0a02ae5UL,
-0x7a47b13cUL, 0x744ebc37UL, 0x6655ab2aUL, 0x685ca621UL, 0x42638510UL, 0x4c6a881bUL, 0x5e719f06UL, 0x5078920dUL,
-0x0a0fd964UL, 0x0406d46fUL, 0x161dc372UL, 0x1814ce79UL, 0x322bed48UL, 0x3c22e043UL, 0x2e39f75eUL, 0x2030fa55UL,
-0xec9ab701UL, 0xe293ba0aUL, 0xf088ad17UL, 0xfe81a01cUL, 0xd4be832dUL, 0xdab78e26UL, 0xc8ac993bUL, 0xc6a59430UL,
-0x9cd2df59UL, 0x92dbd252UL, 0x80c0c54fUL, 0x8ec9c844UL, 0xa4f6eb75UL, 0xaaffe67eUL, 0xb8e4f163UL, 0xb6edfc68UL,
-0x0c0a67b1UL, 0x02036abaUL, 0x10187da7UL, 0x1e1170acUL, 0x342e539dUL, 0x3a275e96UL, 0x283c498bUL, 0x26354480UL,
-0x7c420fe9UL, 0x724b02e2UL, 0x605015ffUL, 0x6e5918f4UL, 0x44663bc5UL, 0x4a6f36ceUL, 0x587421d3UL, 0x567d2cd8UL,
-0x37a10c7aUL, 0x39a80171UL, 0x2bb3166cUL, 0x25ba1b67UL, 0x0f853856UL, 0x018c355dUL, 0x13972240UL, 0x1d9e2f4bUL,
-0x47e96422UL, 0x49e06929UL, 0x5bfb7e34UL, 0x55f2733fUL, 0x7fcd500eUL, 0x71c45d05UL, 0x63df4a18UL, 0x6dd64713UL,
-0xd731dccaUL, 0xd938d1c1UL, 0xcb23c6dcUL, 0xc52acbd7UL, 0xef15e8e6UL, 0xe11ce5edUL, 0xf307f2f0UL, 0xfd0efffbUL,
-0xa779b492UL, 0xa970b999UL, 0xbb6bae84UL, 0xb562a38fUL, 0x9f5d80beUL, 0x91548db5UL, 0x834f9aa8UL, 0x8d4697a3UL
-};
-static const uint32 Tks1[] = {
-0x00000000UL, 0x0b0e090dUL, 0x161c121aUL, 0x1d121b17UL, 0x2c382434UL, 0x27362d39UL, 0x3a24362eUL, 0x312a3f23UL,
-0x58704868UL, 0x537e4165UL, 0x4e6c5a72UL, 0x4562537fUL, 0x74486c5cUL, 0x7f466551UL, 0x62547e46UL, 0x695a774bUL,
-0xb0e090d0UL, 0xbbee99ddUL, 0xa6fc82caUL, 0xadf28bc7UL, 0x9cd8b4e4UL, 0x97d6bde9UL, 0x8ac4a6feUL, 0x81caaff3UL,
-0xe890d8b8UL, 0xe39ed1b5UL, 0xfe8ccaa2UL, 0xf582c3afUL, 0xc4a8fc8cUL, 0xcfa6f581UL, 0xd2b4ee96UL, 0xd9bae79bUL,
-0x7bdb3bbbUL, 0x70d532b6UL, 0x6dc729a1UL, 0x66c920acUL, 0x57e31f8fUL, 0x5ced1682UL, 0x41ff0d95UL, 0x4af10498UL,
-0x23ab73d3UL, 0x28a57adeUL, 0x35b761c9UL, 0x3eb968c4UL, 0x0f9357e7UL, 0x049d5eeaUL, 0x198f45fdUL, 0x12814cf0UL,
-0xcb3bab6bUL, 0xc035a266UL, 0xdd27b971UL, 0xd629b07cUL, 0xe7038f5fUL, 0xec0d8652UL, 0xf11f9d45UL, 0xfa119448UL,
-0x934be303UL, 0x9845ea0eUL, 0x8557f119UL, 0x8e59f814UL, 0xbf73c737UL, 0xb47dce3aUL, 0xa96fd52dUL, 0xa261dc20UL,
-0xf6ad766dUL, 0xfda37f60UL, 0xe0b16477UL, 0xebbf6d7aUL, 0xda955259UL, 0xd19b5b54UL, 0xcc894043UL, 0xc787494eUL,
-0xaedd3e05UL, 0xa5d33708UL, 0xb8c12c1fUL, 0xb3cf2512UL, 0x82e51a31UL, 0x89eb133cUL, 0x94f9082bUL, 0x9ff70126UL,
-0x464de6bdUL, 0x4d43efb0UL, 0x5051f4a7UL, 0x5b5ffdaaUL, 0x6a75c289UL, 0x617bcb84UL, 0x7c69d093UL, 0x7767d99eUL,
-0x1e3daed5UL, 0x1533a7d8UL, 0x0821bccfUL, 0x032fb5c2UL, 0x32058ae1UL, 0x390b83ecUL, 0x241998fbUL, 0x2f1791f6UL,
-0x8d764dd6UL, 0x867844dbUL, 0x9b6a5fccUL, 0x906456c1UL, 0xa14e69e2UL, 0xaa4060efUL, 0xb7527bf8UL, 0xbc5c72f5UL,
-0xd50605beUL, 0xde080cb3UL, 0xc31a17a4UL, 0xc8141ea9UL, 0xf93e218aUL, 0xf2302887UL, 0xef223390UL, 0xe42c3a9dUL,
-0x3d96dd06UL, 0x3698d40bUL, 0x2b8acf1cUL, 0x2084c611UL, 0x11aef932UL, 0x1aa0f03fUL, 0x07b2eb28UL, 0x0cbce225UL,
-0x65e6956eUL, 0x6ee89c63UL, 0x73fa8774UL, 0x78f48e79UL, 0x49deb15aUL, 0x42d0b857UL, 0x5fc2a340UL, 0x54ccaa4dUL,
-0xf741ecdaUL, 0xfc4fe5d7UL, 0xe15dfec0UL, 0xea53f7cdUL, 0xdb79c8eeUL, 0xd077c1e3UL, 0xcd65daf4UL, 0xc66bd3f9UL,
-0xaf31a4b2UL, 0xa43fadbfUL, 0xb92db6a8UL, 0xb223bfa5UL, 0x83098086UL, 0x8807898bUL, 0x9515929cUL, 0x9e1b9b91UL,
-0x47a17c0aUL, 0x4caf7507UL, 0x51bd6e10UL, 0x5ab3671dUL, 0x6b99583eUL, 0x60975133UL, 0x7d854a24UL, 0x768b4329UL,
-0x1fd13462UL, 0x14df3d6fUL, 0x09cd2678UL, 0x02c32f75UL, 0x33e91056UL, 0x38e7195bUL, 0x25f5024cUL, 0x2efb0b41UL,
-0x8c9ad761UL, 0x8794de6cUL, 0x9a86c57bUL, 0x9188cc76UL, 0xa0a2f355UL, 0xabacfa58UL, 0xb6bee14fUL, 0xbdb0e842UL,
-0xd4ea9f09UL, 0xdfe49604UL, 0xc2f68d13UL, 0xc9f8841eUL, 0xf8d2bb3dUL, 0xf3dcb230UL, 0xeecea927UL, 0xe5c0a02aUL,
-0x3c7a47b1UL, 0x37744ebcUL, 0x2a6655abUL, 0x21685ca6UL, 0x10426385UL, 0x1b4c6a88UL, 0x065e719fUL, 0x0d507892UL,
-0x640a0fd9UL, 0x6f0406d4UL, 0x72161dc3UL, 0x791814ceUL, 0x48322bedUL, 0x433c22e0UL, 0x5e2e39f7UL, 0x552030faUL,
-0x01ec9ab7UL, 0x0ae293baUL, 0x17f088adUL, 0x1cfe81a0UL, 0x2dd4be83UL, 0x26dab78eUL, 0x3bc8ac99UL, 0x30c6a594UL,
-0x599cd2dfUL, 0x5292dbd2UL, 0x4f80c0c5UL, 0x448ec9c8UL, 0x75a4f6ebUL, 0x7eaaffe6UL, 0x63b8e4f1UL, 0x68b6edfcUL,
-0xb10c0a67UL, 0xba02036aUL, 0xa710187dUL, 0xac1e1170UL, 0x9d342e53UL, 0x963a275eUL, 0x8b283c49UL, 0x80263544UL,
-0xe97c420fUL, 0xe2724b02UL, 0xff605015UL, 0xf46e5918UL, 0xc544663bUL, 0xce4a6f36UL, 0xd3587421UL, 0xd8567d2cUL,
-0x7a37a10cUL, 0x7139a801UL, 0x6c2bb316UL, 0x6725ba1bUL, 0x560f8538UL, 0x5d018c35UL, 0x40139722UL, 0x4b1d9e2fUL,
-0x2247e964UL, 0x2949e069UL, 0x345bfb7eUL, 0x3f55f273UL, 0x0e7fcd50UL, 0x0571c45dUL, 0x1863df4aUL, 0x136dd647UL,
-0xcad731dcUL, 0xc1d938d1UL, 0xdccb23c6UL, 0xd7c52acbUL, 0xe6ef15e8UL, 0xede11ce5UL, 0xf0f307f2UL, 0xfbfd0effUL,
-0x92a779b4UL, 0x99a970b9UL, 0x84bb6baeUL, 0x8fb562a3UL, 0xbe9f5d80UL, 0xb591548dUL, 0xa8834f9aUL, 0xa38d4697UL
-};
-static const uint32 Tks2[] = {
-0x00000000UL, 0x0d0b0e09UL, 0x1a161c12UL, 0x171d121bUL, 0x342c3824UL, 0x3927362dUL, 0x2e3a2436UL, 0x23312a3fUL,
-0x68587048UL, 0x65537e41UL, 0x724e6c5aUL, 0x7f456253UL, 0x5c74486cUL, 0x517f4665UL, 0x4662547eUL, 0x4b695a77UL,
-0xd0b0e090UL, 0xddbbee99UL, 0xcaa6fc82UL, 0xc7adf28bUL, 0xe49cd8b4UL, 0xe997d6bdUL, 0xfe8ac4a6UL, 0xf381caafUL,
-0xb8e890d8UL, 0xb5e39ed1UL, 0xa2fe8ccaUL, 0xaff582c3UL, 0x8cc4a8fcUL, 0x81cfa6f5UL, 0x96d2b4eeUL, 0x9bd9bae7UL,
-0xbb7bdb3bUL, 0xb670d532UL, 0xa16dc729UL, 0xac66c920UL, 0x8f57e31fUL, 0x825ced16UL, 0x9541ff0dUL, 0x984af104UL,
-0xd323ab73UL, 0xde28a57aUL, 0xc935b761UL, 0xc43eb968UL, 0xe70f9357UL, 0xea049d5eUL, 0xfd198f45UL, 0xf012814cUL,
-0x6bcb3babUL, 0x66c035a2UL, 0x71dd27b9UL, 0x7cd629b0UL, 0x5fe7038fUL, 0x52ec0d86UL, 0x45f11f9dUL, 0x48fa1194UL,
-0x03934be3UL, 0x0e9845eaUL, 0x198557f1UL, 0x148e59f8UL, 0x37bf73c7UL, 0x3ab47dceUL, 0x2da96fd5UL, 0x20a261dcUL,
-0x6df6ad76UL, 0x60fda37fUL, 0x77e0b164UL, 0x7aebbf6dUL, 0x59da9552UL, 0x54d19b5bUL, 0x43cc8940UL, 0x4ec78749UL,
-0x05aedd3eUL, 0x08a5d337UL, 0x1fb8c12cUL, 0x12b3cf25UL, 0x3182e51aUL, 0x3c89eb13UL, 0x2b94f908UL, 0x269ff701UL,
-0xbd464de6UL, 0xb04d43efUL, 0xa75051f4UL, 0xaa5b5ffdUL, 0x896a75c2UL, 0x84617bcbUL, 0x937c69d0UL, 0x9e7767d9UL,
-0xd51e3daeUL, 0xd81533a7UL, 0xcf0821bcUL, 0xc2032fb5UL, 0xe132058aUL, 0xec390b83UL, 0xfb241998UL, 0xf62f1791UL,
-0xd68d764dUL, 0xdb867844UL, 0xcc9b6a5fUL, 0xc1906456UL, 0xe2a14e69UL, 0xefaa4060UL, 0xf8b7527bUL, 0xf5bc5c72UL,
-0xbed50605UL, 0xb3de080cUL, 0xa4c31a17UL, 0xa9c8141eUL, 0x8af93e21UL, 0x87f23028UL, 0x90ef2233UL, 0x9de42c3aUL,
-0x063d96ddUL, 0x0b3698d4UL, 0x1c2b8acfUL, 0x112084c6UL, 0x3211aef9UL, 0x3f1aa0f0UL, 0x2807b2ebUL, 0x250cbce2UL,
-0x6e65e695UL, 0x636ee89cUL, 0x7473fa87UL, 0x7978f48eUL, 0x5a49deb1UL, 0x5742d0b8UL, 0x405fc2a3UL, 0x4d54ccaaUL,
-0xdaf741ecUL, 0xd7fc4fe5UL, 0xc0e15dfeUL, 0xcdea53f7UL, 0xeedb79c8UL, 0xe3d077c1UL, 0xf4cd65daUL, 0xf9c66bd3UL,
-0xb2af31a4UL, 0xbfa43fadUL, 0xa8b92db6UL, 0xa5b223bfUL, 0x86830980UL, 0x8b880789UL, 0x9c951592UL, 0x919e1b9bUL,
-0x0a47a17cUL, 0x074caf75UL, 0x1051bd6eUL, 0x1d5ab367UL, 0x3e6b9958UL, 0x33609751UL, 0x247d854aUL, 0x29768b43UL,
-0x621fd134UL, 0x6f14df3dUL, 0x7809cd26UL, 0x7502c32fUL, 0x5633e910UL, 0x5b38e719UL, 0x4c25f502UL, 0x412efb0bUL,
-0x618c9ad7UL, 0x6c8794deUL, 0x7b9a86c5UL, 0x769188ccUL, 0x55a0a2f3UL, 0x58abacfaUL, 0x4fb6bee1UL, 0x42bdb0e8UL,
-0x09d4ea9fUL, 0x04dfe496UL, 0x13c2f68dUL, 0x1ec9f884UL, 0x3df8d2bbUL, 0x30f3dcb2UL, 0x27eecea9UL, 0x2ae5c0a0UL,
-0xb13c7a47UL, 0xbc37744eUL, 0xab2a6655UL, 0xa621685cUL, 0x85104263UL, 0x881b4c6aUL, 0x9f065e71UL, 0x920d5078UL,
-0xd9640a0fUL, 0xd46f0406UL, 0xc372161dUL, 0xce791814UL, 0xed48322bUL, 0xe0433c22UL, 0xf75e2e39UL, 0xfa552030UL,
-0xb701ec9aUL, 0xba0ae293UL, 0xad17f088UL, 0xa01cfe81UL, 0x832dd4beUL, 0x8e26dab7UL, 0x993bc8acUL, 0x9430c6a5UL,
-0xdf599cd2UL, 0xd25292dbUL, 0xc54f80c0UL, 0xc8448ec9UL, 0xeb75a4f6UL, 0xe67eaaffUL, 0xf163b8e4UL, 0xfc68b6edUL,
-0x67b10c0aUL, 0x6aba0203UL, 0x7da71018UL, 0x70ac1e11UL, 0x539d342eUL, 0x5e963a27UL, 0x498b283cUL, 0x44802635UL,
-0x0fe97c42UL, 0x02e2724bUL, 0x15ff6050UL, 0x18f46e59UL, 0x3bc54466UL, 0x36ce4a6fUL, 0x21d35874UL, 0x2cd8567dUL,
-0x0c7a37a1UL, 0x017139a8UL, 0x166c2bb3UL, 0x1b6725baUL, 0x38560f85UL, 0x355d018cUL, 0x22401397UL, 0x2f4b1d9eUL,
-0x642247e9UL, 0x692949e0UL, 0x7e345bfbUL, 0x733f55f2UL, 0x500e7fcdUL, 0x5d0571c4UL, 0x4a1863dfUL, 0x47136dd6UL,
-0xdccad731UL, 0xd1c1d938UL, 0xc6dccb23UL, 0xcbd7c52aUL, 0xe8e6ef15UL, 0xe5ede11cUL, 0xf2f0f307UL, 0xfffbfd0eUL,
-0xb492a779UL, 0xb999a970UL, 0xae84bb6bUL, 0xa38fb562UL, 0x80be9f5dUL, 0x8db59154UL, 0x9aa8834fUL, 0x97a38d46UL
-};
-static const uint32 Tks3[] = {
+/* TODO: grep for this and move to libbb */
-0x00000000UL, 0x090d0b0eUL, 0x121a161cUL, 0x1b171d12UL, 0x24342c38UL, 0x2d392736UL, 0x362e3a24UL, 0x3f23312aUL,
+#define get_unaligned_be32(buf) ({ uint32_t v; move_from_unaligned32(v, buf); SWAP_BE32(v); })
-0x48685870UL, 0x4165537eUL, 0x5a724e6cUL, 0x537f4562UL, 0x6c5c7448UL, 0x65517f46UL, 0x7e466254UL, 0x774b695aUL,
-0x90d0b0e0UL, 0x99ddbbeeUL, 0x82caa6fcUL, 0x8bc7adf2UL, 0xb4e49cd8UL, 0xbde997d6UL, 0xa6fe8ac4UL, 0xaff381caUL,
-0xd8b8e890UL, 0xd1b5e39eUL, 0xcaa2fe8cUL, 0xc3aff582UL, 0xfc8cc4a8UL, 0xf581cfa6UL, 0xee96d2b4UL, 0xe79bd9baUL,
+// The lookup-tables are marked const so they can be placed in read-only storage instead of RAM
-0x3bbb7bdbUL, 0x32b670d5UL, 0x29a16dc7UL, 0x20ac66c9UL, 0x1f8f57e3UL, 0x16825cedUL, 0x0d9541ffUL, 0x04984af1UL,
+// The numbers below can be computed dynamically trading ROM for RAM -
-0x73d323abUL, 0x7ade28a5UL, 0x61c935b7UL, 0x68c43eb9UL, 0x57e70f93UL, 0x5eea049dUL, 0x45fd198fUL, 0x4cf01281UL,
+// This can be useful in (embedded) bootloader applications, where ROM is often limited.
-0xab6bcb3bUL, 0xa266c035UL, 0xb971dd27UL, 0xb07cd629UL, 0x8f5fe703UL, 0x8652ec0dUL, 0x9d45f11fUL, 0x9448fa11UL,
+static const uint8_t sbox[] = {
-0xe303934bUL, 0xea0e9845UL, 0xf1198557UL, 0xf8148e59UL, 0xc737bf73UL, 0xce3ab47dUL, 0xd52da96fUL, 0xdc20a261UL,
+        0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5,
-0x766df6adUL, 0x7f60fda3UL, 0x6477e0b1UL, 0x6d7aebbfUL, 0x5259da95UL, 0x5b54d19bUL, 0x4043cc89UL, 0x494ec787UL,
+        0x30, 0x01, 0x67, 0x2b, 0xfe, 0xd7, 0xab, 0x76,
-0x3e05aeddUL, 0x3708a5d3UL, 0x2c1fb8c1UL, 0x2512b3cfUL, 0x1a3182e5UL, 0x133c89ebUL, 0x082b94f9UL, 0x01269ff7UL,
+        0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0,
-0xe6bd464dUL, 0xefb04d43UL, 0xf4a75051UL, 0xfdaa5b5fUL, 0xc2896a75UL, 0xcb84617bUL, 0xd0937c69UL, 0xd99e7767UL,
+        0xad, 0xd4, 0xa2, 0xaf, 0x9c, 0xa4, 0x72, 0xc0,
-0xaed51e3dUL, 0xa7d81533UL, 0xbccf0821UL, 0xb5c2032fUL, 0x8ae13205UL, 0x83ec390bUL, 0x98fb2419UL, 0x91f62f17UL,
+        0xb7, 0xfd, 0x93, 0x26, 0x36, 0x3f, 0xf7, 0xcc,
-0x4dd68d76UL, 0x44db8678UL, 0x5fcc9b6aUL, 0x56c19064UL, 0x69e2a14eUL, 0x60efaa40UL, 0x7bf8b752UL, 0x72f5bc5cUL,
+        0x34, 0xa5, 0xe5, 0xf1, 0x71, 0xd8, 0x31, 0x15,
-0x05bed506UL, 0x0cb3de08UL, 0x17a4c31aUL, 0x1ea9c814UL, 0x218af93eUL, 0x2887f230UL, 0x3390ef22UL, 0x3a9de42cUL,
+        0x04, 0xc7, 0x23, 0xc3, 0x18, 0x96, 0x05, 0x9a,
-0xdd063d96UL, 0xd40b3698UL, 0xcf1c2b8aUL, 0xc6112084UL, 0xf93211aeUL, 0xf03f1aa0UL, 0xeb2807b2UL, 0xe2250cbcUL,
+        0x07, 0x12, 0x80, 0xe2, 0xeb, 0x27, 0xb2, 0x75,
-0x956e65e6UL, 0x9c636ee8UL, 0x877473faUL, 0x8e7978f4UL, 0xb15a49deUL, 0xb85742d0UL, 0xa3405fc2UL, 0xaa4d54ccUL,
+        0x09, 0x83, 0x2c, 0x1a, 0x1b, 0x6e, 0x5a, 0xa0,
-0xecdaf741UL, 0xe5d7fc4fUL, 0xfec0e15dUL, 0xf7cdea53UL, 0xc8eedb79UL, 0xc1e3d077UL, 0xdaf4cd65UL, 0xd3f9c66bUL,
+        0x52, 0x3b, 0xd6, 0xb3, 0x29, 0xe3, 0x2f, 0x84,
-0xa4b2af31UL, 0xadbfa43fUL, 0xb6a8b92dUL, 0xbfa5b223UL, 0x80868309UL, 0x898b8807UL, 0x929c9515UL, 0x9b919e1bUL,
+        0x53, 0xd1, 0x00, 0xed, 0x20, 0xfc, 0xb1, 0x5b,
-0x7c0a47a1UL, 0x75074cafUL, 0x6e1051bdUL, 0x671d5ab3UL, 0x583e6b99UL, 0x51336097UL, 0x4a247d85UL, 0x4329768bUL,
+        0x6a, 0xcb, 0xbe, 0x39, 0x4a, 0x4c, 0x58, 0xcf,
-0x34621fd1UL, 0x3d6f14dfUL, 0x267809cdUL, 0x2f7502c3UL, 0x105633e9UL, 0x195b38e7UL, 0x024c25f5UL, 0x0b412efbUL,
+        0xd0, 0xef, 0xaa, 0xfb, 0x43, 0x4d, 0x33, 0x85,
-0xd7618c9aUL, 0xde6c8794UL, 0xc57b9a86UL, 0xcc769188UL, 0xf355a0a2UL, 0xfa58abacUL, 0xe14fb6beUL, 0xe842bdb0UL,
+        0x45, 0xf9, 0x02, 0x7f, 0x50, 0x3c, 0x9f, 0xa8,
-0x9f09d4eaUL, 0x9604dfe4UL, 0x8d13c2f6UL, 0x841ec9f8UL, 0xbb3df8d2UL, 0xb230f3dcUL, 0xa927eeceUL, 0xa02ae5c0UL,
+        0x51, 0xa3, 0x40, 0x8f, 0x92, 0x9d, 0x38, 0xf5,
-0x47b13c7aUL, 0x4ebc3774UL, 0x55ab2a66UL, 0x5ca62168UL, 0x63851042UL, 0x6a881b4cUL, 0x719f065eUL, 0x78920d50UL,
+        0xbc, 0xb6, 0xda, 0x21, 0x10, 0xff, 0xf3, 0xd2,
-0x0fd9640aUL, 0x06d46f04UL, 0x1dc37216UL, 0x14ce7918UL, 0x2bed4832UL, 0x22e0433cUL, 0x39f75e2eUL, 0x30fa5520UL,
+        0xcd, 0x0c, 0x13, 0xec, 0x5f, 0x97, 0x44, 0x17,
-0x9ab701ecUL, 0x93ba0ae2UL, 0x88ad17f0UL, 0x81a01cfeUL, 0xbe832dd4UL, 0xb78e26daUL, 0xac993bc8UL, 0xa59430c6UL,
+        0xc4, 0xa7, 0x7e, 0x3d, 0x64, 0x5d, 0x19, 0x73,
-0xd2df599cUL, 0xdbd25292UL, 0xc0c54f80UL, 0xc9c8448eUL, 0xf6eb75a4UL, 0xffe67eaaUL, 0xe4f163b8UL, 0xedfc68b6UL,
+        0x60, 0x81, 0x4f, 0xdc, 0x22, 0x2a, 0x90, 0x88,
-0x0a67b10cUL, 0x036aba02UL, 0x187da710UL, 0x1170ac1eUL, 0x2e539d34UL, 0x275e963aUL, 0x3c498b28UL, 0x35448026UL,
+        0x46, 0xee, 0xb8, 0x14, 0xde, 0x5e, 0x0b, 0xdb,
-0x420fe97cUL, 0x4b02e272UL, 0x5015ff60UL, 0x5918f46eUL, 0x663bc544UL, 0x6f36ce4aUL, 0x7421d358UL, 0x7d2cd856UL,
+        0xe0, 0x32, 0x3a, 0x0a, 0x49, 0x06, 0x24, 0x5c,
-0xa10c7a37UL, 0xa8017139UL, 0xb3166c2bUL, 0xba1b6725UL, 0x8538560fUL, 0x8c355d01UL, 0x97224013UL, 0x9e2f4b1dUL,
+        0xc2, 0xd3, 0xac, 0x62, 0x91, 0x95, 0xe4, 0x79,
-0xe9642247UL, 0xe0692949UL, 0xfb7e345bUL, 0xf2733f55UL, 0xcd500e7fUL, 0xc45d0571UL, 0xdf4a1863UL, 0xd647136dUL,
+        0xe7, 0xc8, 0x37, 0x6d, 0x8d, 0xd5, 0x4e, 0xa9,
-0x31dccad7UL, 0x38d1c1d9UL, 0x23c6dccbUL, 0x2acbd7c5UL, 0x15e8e6efUL, 0x1ce5ede1UL, 0x07f2f0f3UL, 0x0efffbfdUL,
+        0x6c, 0x56, 0xf4, 0xea, 0x65, 0x7a, 0xae, 0x08,
-0x79b492a7UL, 0x70b999a9UL, 0x6bae84bbUL, 0x62a38fb5UL, 0x5d80be9fUL, 0x548db591UL, 0x4f9aa883UL, 0x4697a38dUL
+        0xba, 0x78, 0x25, 0x2e, 0x1c, 0xa6, 0xb4, 0xc6,
+        0xe8, 0xdd, 0x74, 0x1f, 0x4b, 0xbd, 0x8b, 0x8a,
+        0x70, 0x3e, 0xb5, 0x66, 0x48, 0x03, 0xf6, 0x0e,
+        0x61, 0x35, 0x57, 0xb9, 0x86, 0xc1, 0x1d, 0x9e,
+        0xe1, 0xf8, 0x98, 0x11, 0x69, 0xd9, 0x8e, 0x94,
+        0x9b, 0x1e, 0x87, 0xe9, 0xce, 0x55, 0x28, 0xdf,
+        0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68,
+        0x41, 0x99, 0x2d, 0x0f, 0xb0, 0x54, 0xbb, 0x16,
 };
-#endif /* PS_AES_IMPROVE_PERF_INCREASE_CODESIZE */
+static const uint8_t rsbox[] = {
+        0x52, 0x09, 0x6a, 0xd5, 0x30, 0x36, 0xa5, 0x38,
-static const uint32 rcon[] = {
+        0xbf, 0x40, 0xa3, 0x9e, 0x81, 0xf3, 0xd7, 0xfb,
-        0x01000000UL, 0x02000000UL, 0x04000000UL, 0x08000000UL,
+        0x7c, 0xe3, 0x39, 0x82, 0x9b, 0x2f, 0xff, 0x87,
-        0x10000000UL, 0x20000000UL, 0x40000000UL, 0x80000000UL,
+        0x34, 0x8e, 0x43, 0x44, 0xc4, 0xde, 0xe9, 0xcb,
-        0x1B000000UL, 0x36000000UL, /* for 128-bit blocks, AES never uses more than 10 rcon values */
+        0x54, 0x7b, 0x94, 0x32, 0xa6, 0xc2, 0x23, 0x3d,
+        0xee, 0x4c, 0x95, 0x0b, 0x42, 0xfa, 0xc3, 0x4e,
+        0x08, 0x2e, 0xa1, 0x66, 0x28, 0xd9, 0x24, 0xb2,
+        0x76, 0x5b, 0xa2, 0x49, 0x6d, 0x8b, 0xd1, 0x25,
+        0x72, 0xf8, 0xf6, 0x64, 0x86, 0x68, 0x98, 0x16,
+        0xd4, 0xa4, 0x5c, 0xcc, 0x5d, 0x65, 0xb6, 0x92,
+        0x6c, 0x70, 0x48, 0x50, 0xfd, 0xed, 0xb9, 0xda,
+        0x5e, 0x15, 0x46, 0x57, 0xa7, 0x8d, 0x9d, 0x84,
+        0x90, 0xd8, 0xab, 0x00, 0x8c, 0xbc, 0xd3, 0x0a,
+        0xf7, 0xe4, 0x58, 0x05, 0xb8, 0xb3, 0x45, 0x06,
+        0xd0, 0x2c, 0x1e, 0x8f, 0xca, 0x3f, 0x0f, 0x02,
+        0xc1, 0xaf, 0xbd, 0x03, 0x01, 0x13, 0x8a, 0x6b,
+        0x3a, 0x91, 0x11, 0x41, 0x4f, 0x67, 0xdc, 0xea,
+        0x97, 0xf2, 0xcf, 0xce, 0xf0, 0xb4, 0xe6, 0x73,
+        0x96, 0xac, 0x74, 0x22, 0xe7, 0xad, 0x35, 0x85,
+        0xe2, 0xf9, 0x37, 0xe8, 0x1c, 0x75, 0xdf, 0x6e,
+        0x47, 0xf1, 0x1a, 0x71, 0x1d, 0x29, 0xc5, 0x89,
+        0x6f, 0xb7, 0x62, 0x0e, 0xaa, 0x18, 0xbe, 0x1b,
+        0xfc, 0x56, 0x3e, 0x4b, 0xc6, 0xd2, 0x79, 0x20,
+        0x9a, 0xdb, 0xc0, 0xfe, 0x78, 0xcd, 0x5a, 0xf4,
+        0x1f, 0xdd, 0xa8, 0x33, 0x88, 0x07, 0xc7, 0x31,
+        0xb1, 0x12, 0x10, 0x59, 0x27, 0x80, 0xec, 0x5f,
+        0x60, 0x51, 0x7f, 0xa9, 0x19, 0xb5, 0x4a, 0x0d,
+        0x2d, 0xe5, 0x7a, 0x9f, 0x93, 0xc9, 0x9c, 0xef,
+        0xa0, 0xe0, 0x3b, 0x4d, 0xae, 0x2a, 0xf5, 0xb0,
+        0xc8, 0xeb, 0xbb, 0x3c, 0x83, 0x53, 0x99, 0x61,
+        0x17, 0x2b, 0x04, 0x7e, 0xba, 0x77, 0xd6, 0x26,
+        0xe1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0c, 0x7d,
 };
-#ifdef USE_BURN_STACK
+// SubWord() is a function that takes a four-byte input word and
-static void _aes_ecb_decrypt(const unsigned char *ct, unsigned char *pt,
+// applies the S-box to each of the four bytes to produce an output word.
-                                psAesKey_t *skey);
+static uint32_t Subword(uint32_t x)
-static void _aes_ecb_encrypt(const unsigned char *pt, unsigned char *ct,
-                                psAesKey_t *skey);
-#endif
-static uint32 setup_mix(uint32 temp)
 {
-        return  (Te4_3[byte(temp, 2)]) ^
+        return (sbox[(x >> 24)      ] << 24)
-                        (Te4_2[byte(temp, 1)]) ^
+        |      (sbox[(x >> 16) & 255] << 16)
-                        (Te4_1[byte(temp, 0)]) ^
+        |      (sbox[(x >> 8 ) & 255] << 8 )
-                        (Te4_0[byte(temp, 3)]);
+        |      (sbox[(x      ) & 255]      );
 }
-#ifndef PS_AES_IMPROVE_PERF_INCREASE_CODESIZE
+// This function produces Nb(Nr+1) round keys.
-static uint32 setup_mix2(uint32 temp)
+// The round keys are used in each round to decrypt the states.
+static int KeyExpansion(uint32_t *RoundKey, const void *key, unsigned key_len)
 {
-        return  Td0(255 & Te4[byte(temp, 3)]) ^
+        // The round constant word array, Rcon[i], contains the values given by
-                        Td1(255 & Te4[byte(temp, 2)]) ^
+        // x to th e power (i-1) being powers of x (x is denoted as {02}) in the field GF(2^8).
-                        Td2(255 & Te4[byte(temp, 1)]) ^
+        // Note that i starts at 2, not 0.
-                        Td3(255 & Te4[byte(temp, 0)]);
+        static const uint8_t Rcon[] = {
+                0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36
+        //..... 0x6c, 0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6,...
+        // but aes256 only uses values up to 0x36
+        };
+        int rounds, words_key, words_RoundKey;
+        int i, j, k;
+        // key_len 16: aes128, rounds 10, words_key 4, words_RoundKey 44
+        // key_len 24: aes192, rounds 12, words_key 6, words_RoundKey 52
+        // key_len 32: aes256, rounds 14, words_key 8, words_RoundKey 60
+        words_key = key_len / 4;
+        rounds = 6 + (key_len / 4);
+        words_RoundKey = 28 + key_len;
+        // The first round key is the key itself.
+        for (i = 0; i < words_key; i++)
+                RoundKey[i] = get_unaligned_be32((uint32_t*)key + i);
+        // i == words_key now
+        // All other round keys are found from the previous round keys.
+        j = k = 0;
+        for (; i < words_RoundKey; i++) {
+                uint32_t tempa;
+                tempa = RoundKey[i - 1];
+                if (j == 0) {
+                        // RotWord(): rotates the 4 bytes in a word to the left once.
+                        tempa = (tempa << 8) | (tempa >> 24);
+                        tempa = Subword(tempa);
+                        tempa ^= (uint32_t)Rcon[k] << 24;
+                } else if (words_key > 6 && j == 4) {
+                        tempa = Subword(tempa);
+                }
+                RoundKey[i] = RoundKey[i - words_key] ^ tempa;
+                j++;
+                if (j == words_key) {
+                        j = 0;
+                        k++;
+                }
+        }
+        return rounds;
 }
-#endif /* PS_AES_IMPROVE_PERF_INCREASE_CODESIZE */
-/*
+// This function adds the round key to state.
-        Software implementation of AES CBC APIs
+// The round key is added to the state by an XOR function.
- */
+static void AddRoundKey(unsigned astate[16], const uint32_t *RoundKeys)
-#ifndef USE_AES_CBC_EXTERNAL
-static //bbox
-int32 psAesInit(psCipherContext_t *ctx, unsigned char *IV,
-                                  const unsigned char *key, uint32 keylen)
 {
-        int32           x, err;
+        int i;
-//bbox
+        for (i = 0; i < 16; i += 4) {
-//      if (IV == NULL || key == NULL || ctx == NULL) {
+                uint32_t n = *RoundKeys++;
-//              psTraceCrypto("psAesInit arg fail\n");
+                astate[i + 0] ^= (n >> 24);
-//              return PS_ARG_FAIL;
+                astate[i + 1] ^= (n >> 16) & 255;
-//      }
+                astate[i + 2] ^= (n >> 8) & 255;
-        memset(ctx, 0x0, sizeof(psCipherContext_t));
+                astate[i + 3] ^= n & 255;
-/*
-        setup cipher
- */
-        if ((err = psAesInitKey(key, keylen, &ctx->aes.key)) != PS_SUCCESS) {
-                return err;
-        }
-/*
-        copy IV
- */
-        ctx->aes.blocklen = 16;
-        for (x = 0; x < ctx->aes.blocklen; x++) {
-                ctx->aes.IV[x] = IV[x];
        }
-        return PS_SUCCESS;
 }
-static //bbox
+// The SubBytes Function Substitutes the values in the
-int32 psAesEncrypt(psCipherContext_t *ctx, const unsigned char *pt,
+// state matrix with values in an S-box.
-                                         unsigned char *ct, uint32 len)
+static void SubBytes(unsigned astate[16])
 {
-        int32                   x;
+        int i;
-        uint32                  i;
-        unsigned char   tmp[MAXBLOCKSIZE];
-//bbox
-//      if (pt == NULL || ct == NULL || ctx == NULL || (len & 0x7) != 0) {
-//              psTraceCrypto("Bad parameters to psAesEncrypt\n");
-//              return PS_ARG_FAIL;
-//      }
-        if ((len & 0x7) != 0)
-                bb_error_msg_and_die("AES len:%d", len);
-/*
+        for (i = 0; i < 16; i++)
-        is blocklen valid?
+                astate[i] = sbox[astate[i]];
- */
+}
-        if (ctx->aes.blocklen < 0 || (ctx->aes.blocklen >
-                        (int32)sizeof(ctx->aes.IV))) {
-                psTraceCrypto("Bad blocklen in psAesEncrypt\n");
-                return PS_LIMIT_FAIL;
-        }
-        for (i = 0; i < len; i += ctx->aes.blocklen) {
-/*
-                xor IV against plaintext
- */
-                for (x = 0; x < ctx->aes.blocklen; x++) {
-                        tmp[x] = pt[x] ^ ctx->aes.IV[x];
-                }
-/*
-                encrypt
- */
-                psAesEncryptBlock(tmp, ct, &ctx->aes.key);
-/*
+// Our code actually stores "columns" (in aes encryption terminology)
-                store IV [ciphertext] for a future block
+// of state in rows: first 4 elements are "row 0, col 0", "row 1, col 0".
- */
+// "row 2, col 0", "row 3, col 0". The fifth element is "row 0, col 1",
-                for (x = 0; x < ctx->aes.blocklen; x++) {
+// and so on.
-                        ctx->aes.IV[x] = ct[x];
+#define ASTATE(col,row) astate[(col)*4 + (row)]
-                }
-                ct += ctx->aes.blocklen;
-                pt += ctx->aes.blocklen;
-        }
-        memset_s(tmp, sizeof(tmp), 0x0, sizeof(tmp));
+// The ShiftRows() function shifts the rows in the state to the left.
-        return len;
+// Each row is shifted with different offset.
+// Offset = Row number. So the first row is not shifted.
+static void ShiftRows(unsigned astate[16])
+{
+        unsigned v;
+        // Rotate first row 1 columns to left
+        v = ASTATE(0,1);
+        ASTATE(0,1) = ASTATE(1,1);
+        ASTATE(1,1) = ASTATE(2,1);
+        ASTATE(2,1) = ASTATE(3,1);
+        ASTATE(3,1) = v;
+        // Rotate second row 2 columns to left
+        v = ASTATE(0,2); ASTATE(0,2) = ASTATE(2,2); ASTATE(2,2) = v;
+        v = ASTATE(1,2); ASTATE(1,2) = ASTATE(3,2); ASTATE(3,2) = v;
+        // Rotate third row 3 columns to left
+        v = ASTATE(3,3);
+        ASTATE(3,3) = ASTATE(2,3);
+        ASTATE(2,3) = ASTATE(1,3);
+        ASTATE(1,3) = ASTATE(0,3);
+        ASTATE(0,3) = v;
 }
-static //bbox
+// MixColumns function mixes the columns of the state matrix
-int32 psAesDecrypt(psCipherContext_t *ctx, const unsigned char *ct,
+static void MixColumns(unsigned astate[16])
-                                         unsigned char *pt, uint32 len)
 {
-        int32                   x;
+        int i;
-        uint32                  i;
-        unsigned char   tmp[MAXBLOCKSIZE], tmp2[MAXBLOCKSIZE];
+        for (i = 0; i < 16; i += 4) {
+                unsigned a, b, c, d;
-//bbox
+                unsigned x, y, z, t;
-//      if (pt == NULL || ct == NULL || ctx == NULL || (len & 0x7) != 0) {
-//              psTraceCrypto("Bad parameters to psAesDecrypt\n");
+                a = astate[i + 0];
-//              return PS_ARG_FAIL;
+                b = astate[i + 1];
-//      }
+                c = astate[i + 2];
-        if ((len & 0x7) != 0)
+                d = astate[i + 3];
-                bb_error_msg_and_die("AES len:%d", len);
+                x = (a << 1) ^ b ^ (b << 1) ^ c ^ d;
+                y = a ^ (b << 1) ^ c ^ (c << 1) ^ d;
-/*
+                z = a ^ b ^ (c << 1) ^ d ^ (d << 1);
-        is blocklen valid?
+                t = a ^ (a << 1) ^ b ^ c ^ (d << 1);
- */
+                astate[i + 0] = x ^ ((-(int)(x >> 8)) & 0x11b);
-        if (ctx->aes.blocklen < 0 || (ctx->aes.blocklen >
+                astate[i + 1] = y ^ ((-(int)(y >> 8)) & 0x11b);
-                        (int32)sizeof(ctx->aes.IV))) {
+                astate[i + 2] = z ^ ((-(int)(z >> 8)) & 0x11b);
-                psTraceCrypto("Bad blocklen in psAesDecrypt\n");
+                astate[i + 3] = t ^ ((-(int)(t >> 8)) & 0x11b);
-                return PS_LIMIT_FAIL;
-        }
-        for (i = 0; i < len; i += ctx->aes.blocklen) {
-/*
-                decrypt the block from ct into tmp
- */
-                psAesDecryptBlock(ct, tmp, &ctx->aes.key);
-/*
-                xor IV against the plaintext of the previous step
- */
-                for (x = 0; x < ctx->aes.blocklen; x++) {
-/*
-                        copy CT in case ct == pt
- */
-                        tmp2[x] = ct[x];
-/*
-                        actually decrypt the byte
- */
-                        pt[x] = tmp[x] ^ ctx->aes.IV[x];
-                }
-/*
-                replace IV with this current ciphertext
- */
-                for (x = 0; x < ctx->aes.blocklen; x++) {
-                        ctx->aes.IV[x] = tmp2[x];
-                }
-                ct += ctx->aes.blocklen;
-                pt += ctx->aes.blocklen;
        }
-        memset_s(tmp, sizeof(tmp), 0x0, sizeof(tmp));
-        memset_s(tmp2, sizeof(tmp2), 0x0, sizeof(tmp2));
-        return len;
 }
-#endif /* USE_AES_CBC_EXTERNAL */
+// The SubBytes Function Substitutes the values in the
+// state matrix with values in an S-box.
-/******************************************************************************/
+static void InvSubBytes(unsigned astate[16])
-/*
-        Initialize the AES (Rijndael) block cipher
-        key: The symmetric key you wish to pass
-        keylen:  The key length in bytes
-        skey: The key in as scheduled by this function.
-*/
-static //bbox
-int32 psAesInitKey(const unsigned char *key, uint32 keylen, psAesKey_t *skey)
 {
-        int32           i, j;
+        int i;
-        uint32          temp, *rk, *rrk;
-//bbox
-//      if (key == NULL || skey == NULL) {
-//              psTraceCrypto("Bad args to psAesInitKey\n");
-//              return PS_ARG_FAIL;
-//      }
-        if (keylen != 16 && keylen != 24 && keylen != 32) {
-                psTraceCrypto("Invalid AES key length\n");
-                //bbox return CRYPT_INVALID_KEYSIZE;
-                //unreachable anyway
-                return PS_ARG_FAIL;
-        }
-        memset(skey, 0x0, sizeof(psAesKey_t));
-        skey->Nr = 10 + ((keylen/8)-2)*2;
-/*
+        for (i = 0; i < 16; i++)
-        setup the forward key
+                astate[i] = rsbox[astate[i]];
- */
-        i                               = 0;
-        rk                              = skey->eK;
-        LOAD32H(rk[0], key         );
-        LOAD32H(rk[1], key +  4);
-        LOAD32H(rk[2], key +  8);
-        LOAD32H(rk[3], key + 12);
-        if (keylen == 16) {
-                j = 44;
-                for (;;) {
-                        temp  = rk[3];
-                        rk[4] = rk[0] ^ setup_mix(temp) ^ rcon[i];
-                        rk[5] = rk[1] ^ rk[4];
-                        rk[6] = rk[2] ^ rk[5];
-                        rk[7] = rk[3] ^ rk[6];
-                        if (++i == 10) {
-                                break;
-                        }
-                        rk += 4;
-                }
-        } else if (keylen == 24) {
-                j = 52;
-                LOAD32H(rk[4], key + 16);
-                LOAD32H(rk[5], key + 20);
-                for (;;) {
-                #ifdef _MSC_VER
-                        temp = skey->eK[rk - skey->eK + 5];
-                #else
-                        temp = rk[5];
-                #endif /* _MSC_VER */
-                        rk[ 6] = rk[ 0] ^ setup_mix(temp) ^ rcon[i];
-                        rk[ 7] = rk[ 1] ^ rk[ 6];
-                        rk[ 8] = rk[ 2] ^ rk[ 7];
-                        rk[ 9] = rk[ 3] ^ rk[ 8];
-                        if (++i == 8) {
-                                break;
-                        }
-                        rk[10] = rk[ 4] ^ rk[ 9];
-                        rk[11] = rk[ 5] ^ rk[10];
-                        rk += 6;
-                }
-        } else if (keylen == 32) {
-                j = 60;
-                LOAD32H(rk[4], key + 16);
-                LOAD32H(rk[5], key + 20);
-                LOAD32H(rk[6], key + 24);
-                LOAD32H(rk[7], key + 28);
-                for (;;) {
-                #ifdef _MSC_VER
-                        temp = skey->eK[rk - skey->eK + 7];
-                #else
-                        temp = rk[7];
-                #endif /* _MSC_VER */
-                        rk[ 8] = rk[ 0] ^ setup_mix(temp) ^ rcon[i];
-                        rk[ 9] = rk[ 1] ^ rk[ 8];
-                        rk[10] = rk[ 2] ^ rk[ 9];
-                        rk[11] = rk[ 3] ^ rk[10];
-                        if (++i == 7) {
-                                break;
-                        }
-                        temp = rk[11];
-                        rk[12] = rk[ 4] ^ setup_mix(ROR(temp, 8));
-                        rk[13] = rk[ 5] ^ rk[12];
-                        rk[14] = rk[ 6] ^ rk[13];
-                        rk[15] = rk[ 7] ^ rk[14];
-                        rk += 8;
-                }
-        } else {
-/*
-                this can't happen
- */
-                return PS_FAILURE;
-        }
-/*
-        setup the inverse key now
- */
-        rk              = skey->dK;
-        rrk             = skey->eK + j - 4;
-/*
-        apply the inverse MixColumn transform to all round keys but
-        the first and the last:
- */
-        /* copy first */
-        *rk++   = *rrk++;
-        *rk++   = *rrk++;
-        *rk++   = *rrk++;
-        *rk             = *rrk;
-        rk -= 3; rrk -= 3;
-        for (i = 1; i < skey->Nr; i++) {
-                rrk     -= 4;
-                rk      += 4;
-#ifndef PS_AES_IMPROVE_PERF_INCREASE_CODESIZE
-                temp = rrk[0];
-                rk[0] = setup_mix2(temp);
-                temp = rrk[1];
-                rk[1] = setup_mix2(temp);
-                temp = rrk[2];
-                rk[2] = setup_mix2(temp);
-                temp = rrk[3];
-                rk[3] = setup_mix2(temp);
-#else /* PS_AES_IMPROVE_PERF_INCREASE_CODESIZE */
-                temp = rrk[0];
-                rk[0] =
-                        Tks0[byte(temp, 3)] ^
-                        Tks1[byte(temp, 2)] ^
-                        Tks2[byte(temp, 1)] ^
-                        Tks3[byte(temp, 0)];
-                temp = rrk[1];
-                rk[1] =
-                        Tks0[byte(temp, 3)] ^
-                        Tks1[byte(temp, 2)] ^
-                        Tks2[byte(temp, 1)] ^
-                        Tks3[byte(temp, 0)];
-                temp = rrk[2];
-                rk[2] =
-                        Tks0[byte(temp, 3)] ^
-                        Tks1[byte(temp, 2)] ^
-                        Tks2[byte(temp, 1)] ^
-                        Tks3[byte(temp, 0)];
-                temp = rrk[3];
-                rk[3] =
-                        Tks0[byte(temp, 3)] ^
-                        Tks1[byte(temp, 2)] ^
-                        Tks2[byte(temp, 1)] ^
-                        Tks3[byte(temp, 0)];
-#endif /* PS_AES_IMPROVE_PERF_INCREASE_CODESIZE */
-        }
-        /* copy last */
-        rrk     -= 4;
-        rk      += 4;
-        *rk++ = *rrk++;
-        *rk++ = *rrk++;
-        *rk++ = *rrk++;
-        *rk       = *rrk;
-        return PS_SUCCESS;
 }
+static void InvShiftRows(unsigned astate[16])
-#ifdef USE_BURN_STACK
-static //bbox
-void psAesEncryptBlock(const unsigned char *pt, unsigned char *ct,
-                                psAesKey_t *skey)
 {
-        _aes_ecb_encrypt(pt, ct, skey);
+        unsigned v;
-        psBurnStack(sizeof(uint32)*8 + sizeof(uint32*) + sizeof(int32)*2);
+        // Rotate first row 1 columns to right
+        v = ASTATE(3,1);
+        ASTATE(3,1) = ASTATE(2,1);
+        ASTATE(2,1) = ASTATE(1,1);
+        ASTATE(1,1) = ASTATE(0,1);
+        ASTATE(0,1) = v;
+        // Rotate second row 2 columns to right
+        v = ASTATE(0,2); ASTATE(0,2) = ASTATE(2,2); ASTATE(2,2) = v;
+        v = ASTATE(1,2); ASTATE(1,2) = ASTATE(3,2); ASTATE(3,2) = v;
+        // Rotate third row 3 columns to right
+        v = ASTATE(0,3);
+        ASTATE(0,3) = ASTATE(1,3);
+        ASTATE(1,3) = ASTATE(2,3);
+        ASTATE(2,3) = ASTATE(3,3);
+        ASTATE(3,3) = v;
 }
-static void _aes_ecb_encrypt(const unsigned char *pt, unsigned char *ct,
-                                psAesKey_t *skey)
-#else
-static //bbox
-void psAesEncryptBlock(const unsigned char *pt, unsigned char *ct,
-                                psAesKey_t *skey)
-#endif /* USE_BURN_STACK */
-{
-        uint32  s0, s1, s2, s3, t0, t1, t2, t3, *rk;
-        int32   Nr, r;
-//bbox
-//      if (pt == NULL || ct == NULL || skey == NULL) {
-//              return;
-//      }
-        Nr = skey->Nr;
+static ALWAYS_INLINE unsigned Multiply(unsigned x)
-        rk = skey->eK;
+{
+        unsigned y;
-/*
+        y = x >> 8;
-        map byte array block to cipher state
+        return (x ^ y ^ (y << 1) ^ (y << 3) ^ (y << 4)) & 255;
-        and add initial round key:
+}
- */
-        LOAD32H(s0, pt     ); s0 ^= rk[0];
-        LOAD32H(s1, pt +  4); s1 ^= rk[1];
-        LOAD32H(s2, pt +  8); s2 ^= rk[2];
-        LOAD32H(s3, pt + 12); s3 ^= rk[3];
-#ifndef PS_AES_IMPROVE_PERF_INCREASE_CODESIZE
+// MixColumns function mixes the columns of the state matrix.
-        for (r = 0; ; r++) {
+// The method used to multiply may be difficult to understand for the inexperienced.
-                rk += 4;
+// Please use the references to gain more information.
-                t0 =
+static void InvMixColumns(unsigned astate[16])
-                        Te0(byte(s0, 3)) ^
+{
-                        Te1(byte(s1, 2)) ^
+        int i;
-                        Te2(byte(s2, 1)) ^
-                        Te3(byte(s3, 0)) ^
+        for (i = 0; i < 16; i += 4) {
-                        rk[0];
+                unsigned a, b, c, d;
-                t1 =
+                unsigned x, y, z, t;
-                        Te0(byte(s1, 3)) ^
-                        Te1(byte(s2, 2)) ^
+                a = astate[i + 0];
-                        Te2(byte(s3, 1)) ^
+                b = astate[i + 1];
-                        Te3(byte(s0, 0)) ^
+                c = astate[i + 2];
-                        rk[1];
+                d = astate[i + 3];
-                t2 =
+                x = (a << 1) ^ (a << 2) ^ (a << 3) ^ b ^ (b << 1) ^ (b << 3)
-                        Te0(byte(s2, 3)) ^
+                /***/ ^ c ^ (c << 2) ^ (c << 3) ^ d ^ (d << 3);
-                        Te1(byte(s3, 2)) ^
+                y = a ^ (a << 3) ^ (b << 1) ^ (b << 2) ^ (b << 3)
-                        Te2(byte(s0, 1)) ^
+                /***/ ^ c ^ (c << 1) ^ (c << 3) ^ d ^ (d << 2) ^ (d << 3);
-                        Te3(byte(s1, 0)) ^
+                z = a ^ (a << 2) ^ (a << 3) ^ b ^ (b << 3)
-                        rk[2];
+                /***/ ^ (c << 1) ^ (c << 2) ^ (c << 3) ^ d ^ (d << 1) ^ (d << 3);
-                t3 =
+                t = a ^ (a << 1) ^ (a << 3) ^ b ^ (b << 2) ^ (b << 3)
-                        Te0(byte(s3, 3)) ^
+                /***/ ^ c ^ (c << 3) ^ (d << 1) ^ (d << 2) ^ (d << 3);
-                        Te1(byte(s0, 2)) ^
+                astate[i + 0] = Multiply(x);
-                        Te2(byte(s1, 1)) ^
+                astate[i + 1] = Multiply(y);
-                        Te3(byte(s2, 0)) ^
+                astate[i + 2] = Multiply(z);
-                        rk[3];
+                astate[i + 3] = Multiply(t);
-                if (r == Nr-2) {
-                        break;
-                }
-                s0 = t0; s1 = t1; s2 = t2; s3 = t3;
        }
-        rk += 4;
+}
-#else /* PS_AES_IMPROVE_PERF_INCREASE_CODESIZE */
-/*
+static void aes_encrypt_1(unsigned astate[16], unsigned rounds, const uint32_t *RoundKey)
-        Nr - 1 full rounds:
+{
- */
-        r = Nr >> 1;
        for (;;) {
+                AddRoundKey(astate, RoundKey);
-                t0 =
+                RoundKey += 4;
-                        Te0(byte(s0, 3)) ^
+                SubBytes(astate);
-                        Te1(byte(s1, 2)) ^
+                ShiftRows(astate);
-                        Te2(byte(s2, 1)) ^
+                if (--rounds == 0)
-                        Te3(byte(s3, 0)) ^
-                        rk[4];
-                t1 =
-                        Te0(byte(s1, 3)) ^
-                        Te1(byte(s2, 2)) ^
-                        Te2(byte(s3, 1)) ^
-                        Te3(byte(s0, 0)) ^
-                        rk[5];
-                t2 =
-                        Te0(byte(s2, 3)) ^
-                        Te1(byte(s3, 2)) ^
-                        Te2(byte(s0, 1)) ^
-                        Te3(byte(s1, 0)) ^
-                        rk[6];
-                t3 =
-                        Te0(byte(s3, 3)) ^
-                        Te1(byte(s0, 2)) ^
-                        Te2(byte(s1, 1)) ^
-                        Te3(byte(s2, 0)) ^
-                        rk[7];
-                rk += 8;
-                if (--r == 0) {
                        break;
-                }
+                MixColumns(astate);
-                s0 =
-                        Te0(byte(t0, 3)) ^
-                        Te1(byte(t1, 2)) ^
-                        Te2(byte(t2, 1)) ^
-                        Te3(byte(t3, 0)) ^
-                        rk[0];
-                s1 =
-                        Te0(byte(t1, 3)) ^
-                        Te1(byte(t2, 2)) ^
-                        Te2(byte(t3, 1)) ^
-                        Te3(byte(t0, 0)) ^
-                        rk[1];
-                s2 =
-                        Te0(byte(t2, 3)) ^
-                        Te1(byte(t3, 2)) ^
-                        Te2(byte(t0, 1)) ^
-                        Te3(byte(t1, 0)) ^
-                        rk[2];
-                s3 =
-                        Te0(byte(t3, 3)) ^
-                        Te1(byte(t0, 2)) ^
-                        Te2(byte(t1, 1)) ^
-                        Te3(byte(t2, 0)) ^
-                        rk[3];
        }
-#endif /* PS_AES_IMPROVE_PERF_INCREASE_CODESIZE */
+        AddRoundKey(astate, RoundKey);
-/*
-                apply last round and map cipher state to byte array block:
- */
-        s0 =
-                (Te4_3[byte(t0, 3)]) ^
-                (Te4_2[byte(t1, 2)]) ^
-                (Te4_1[byte(t2, 1)]) ^
-                (Te4_0[byte(t3, 0)]) ^
-                rk[0];
-        STORE32H(s0, ct);
-        s1 =
-                (Te4_3[byte(t1, 3)]) ^
-                (Te4_2[byte(t2, 2)]) ^
-                (Te4_1[byte(t3, 1)]) ^
-                (Te4_0[byte(t0, 0)]) ^
-                rk[1];
-        STORE32H(s1, ct+4);
-        s2 =
-                (Te4_3[byte(t2, 3)]) ^
-                (Te4_2[byte(t3, 2)]) ^
-                (Te4_1[byte(t0, 1)]) ^
-                (Te4_0[byte(t1, 0)]) ^
-                rk[2];
-        STORE32H(s2, ct+8);
-        s3 =
-                (Te4_3[byte(t3, 3)]) ^
-                (Te4_2[byte(t0, 2)]) ^
-                (Te4_1[byte(t1, 1)]) ^
-                (Te4_0[byte(t2, 0)]) ^
-                rk[3];
-        STORE32H(s3, ct+12);
 }
-#ifdef USE_BURN_STACK
+#if 0 // UNUSED
-static //bbox
+static void aes_encrypt_one_block(unsigned rounds, const uint32_t *RoundKey, const void *data, void *dst)
-void psAesDecryptBlock(const unsigned char *ct, unsigned char *pt,
-                                psAesKey_t *skey)
-{
-        _aes_ecb_decrypt(ct, pt, skey);
-        psBurnStack(sizeof(uint32)*8 + sizeof(uint32*) + sizeof(int32)*2);
-}
-static void _aes_ecb_decrypt(const unsigned char *ct, unsigned char *pt,
-                                psAesKey_t *skey)
-#else
-static //bbox
-void psAesDecryptBlock(const unsigned char *ct, unsigned char *pt,
-                                psAesKey_t *skey)
-#endif /* USE_BURN_STACK */
 {
-        uint32          s0, s1, s2, s3, t0, t1, t2, t3, *rk;
+        unsigned astate[16];
-        int32           Nr, r;
+        unsigned i;
-//bbox
+        const uint8_t *pt = data;
-//      if (pt == NULL || ct == NULL || skey == NULL) {
+        uint8_t *ct = dst;
-//              return;
-//      }
-        Nr = skey->Nr;
+        for (i = 0; i < 16; i++)
-        rk = skey->dK;
+                astate[i] = pt[i];
+        aes_encrypt_1(astate, rounds, RoundKey);
+        for (i = 0; i < 16; i++)
+                ct[i] = astate[i];
+}
+#endif
-/*
+void aes_cbc_encrypt(const void *key, int klen, void *iv, const void *data, size_t len, void *dst)
-        map byte array block to cipher state and add initial round key:
+{
- */
+        uint32_t RoundKey[60];
-        LOAD32H(s0, ct          ); s0 ^= rk[0];
+        uint8_t iv2[16];
-        LOAD32H(s1, ct  +  4); s1 ^= rk[1];
+        unsigned rounds;
-        LOAD32H(s2, ct  +  8); s2 ^= rk[2];
-        LOAD32H(s3, ct  + 12); s3 ^= rk[3];
+        const uint8_t *pt = data;
+        uint8_t *ct = dst;
+        memcpy(iv2, iv, 16);
+        rounds = KeyExpansion(RoundKey, key, klen);
+        while (len > 0) {
+                {
+                        /* almost aes_encrypt_one_block(rounds, RoundKey, pt, ct);
+                         * but xor'ing of IV with plaintext[] is combined
+                         * with plaintext[] -> astate[]
+                         */
+                        int i;
+                        unsigned astate[16];
+                        for (i = 0; i < 16; i++)
+                                astate[i] = pt[i] ^ iv2[i];
+                        aes_encrypt_1(astate, rounds, RoundKey);
+                        for (i = 0; i < 16; i++)
+                                iv2[i] = ct[i] = astate[i];
+                }
+                ct += 16;
+                pt += 16;
+                len -= 16;
+        }
+}
-#ifndef PS_AES_IMPROVE_PERF_INCREASE_CODESIZE
+static void aes_decrypt_1(unsigned astate[16], unsigned rounds, const uint32_t *RoundKey)
-        for (r = 0; ; r++) {
+{
-                rk += 4;
+        RoundKey += rounds * 4;
-                t0 =
+        AddRoundKey(astate, RoundKey);
-                        Td0(byte(s0, 3)) ^
+        for (;;) {
-                        Td1(byte(s3, 2)) ^
+                InvShiftRows(astate);
-                        Td2(byte(s2, 1)) ^
+                InvSubBytes(astate);
-                        Td3(byte(s1, 0)) ^
+                RoundKey -= 4;
-                        rk[0];
+                AddRoundKey(astate, RoundKey);
-                t1 =
+                if (--rounds == 0)
-                        Td0(byte(s1, 3)) ^
-                        Td1(byte(s0, 2)) ^
-                        Td2(byte(s3, 1)) ^
-                        Td3(byte(s2, 0)) ^
-                        rk[1];
-                t2 =
-                        Td0(byte(s2, 3)) ^
-                        Td1(byte(s1, 2)) ^
-                        Td2(byte(s0, 1)) ^
-                        Td3(byte(s3, 0)) ^
-                        rk[2];
-                t3 =
-                        Td0(byte(s3, 3)) ^
-                        Td1(byte(s2, 2)) ^
-                        Td2(byte(s1, 1)) ^
-                        Td3(byte(s0, 0)) ^
-                        rk[3];
-                if (r == Nr-2) {
                        break;
-                }
+                InvMixColumns(astate);
-                s0 = t0; s1 = t1; s2 = t2; s3 = t3;
        }
-        rk += 4;
+}
-#else /* PS_AES_IMPROVE_PERF_INCREASE_CODESIZE */
+#if 0 //UNUSED
+static void aes_decrypt_one_block(unsigned rounds, const uint32_t *RoundKey, const void *data, void *dst)
+{
+        unsigned astate[16];
+        unsigned i;
-/*
+        const uint8_t *ct = data;
-        Nr - 1 full rounds:
+        uint8_t *pt = dst;
- */
-        r = Nr >> 1;
-        for     (;;) {
-                t0 =
+        for (i = 0; i < 16; i++)
-                        Td0(byte(s0, 3)) ^
+                astate[i] = ct[i];
-                        Td1(byte(s3, 2)) ^
+        aes_decrypt_1(astate, rounds, RoundKey);
-                        Td2(byte(s2, 1)) ^
+        for (i = 0; i < 16; i++)
-                        Td3(byte(s1, 0)) ^
+                pt[i] = astate[i];
-                        rk[4];
+}
-                t1 =
+#endif
-                        Td0(byte(s1, 3)) ^
-                        Td1(byte(s0, 2)) ^
-                        Td2(byte(s3, 1)) ^
-                        Td3(byte(s2, 0)) ^
-                        rk[5];
-                t2 =
-                        Td0(byte(s2, 3)) ^
-                        Td1(byte(s1, 2)) ^
-                        Td2(byte(s0, 1)) ^
-                        Td3(byte(s3, 0)) ^
-                        rk[6];
-                t3 =
-                        Td0(byte(s3, 3)) ^
-                        Td1(byte(s2, 2)) ^
-                        Td2(byte(s1, 1)) ^
-                        Td3(byte(s0, 0)) ^
-                        rk[7];
-                rk += 8;
+void aes_cbc_decrypt(const void *key, int klen, void *iv, const void *data, size_t len, void *dst)
-                if (--r == 0) {
+{
-                        break;
+        uint32_t RoundKey[60];
+        uint8_t iv2[16];
+        uint8_t iv3[16];
+        unsigned rounds;
+        uint8_t *ivbuf;
+        uint8_t *ivnext;
+        const uint8_t *ct = data;
+        uint8_t *pt = dst;
+        rounds = KeyExpansion(RoundKey, key, klen);
+        ivbuf = memcpy(iv2, iv, 16);
+        while (len) {
+                ivnext = (ivbuf==iv2) ? iv3 : iv2;
+                {
+                        /* almost aes_decrypt_one_block(rounds, RoundKey, ct, pt)
+                         * but xor'ing of ivbuf is combined with astate[] -> plaintext[]
+                         */
+                        int i;
+                        unsigned astate[16];
+                        for (i = 0; i < 16; i++)
+                                ivnext[i] = astate[i] = ct[i];
+                        aes_decrypt_1(astate, rounds, RoundKey);
+                        for (i = 0; i < 16; i++)
+                                pt[i] = astate[i] ^ ivbuf[i];
                }
+                ivbuf = ivnext;
-                s0 =
+                ct += 16;
-                        Td0(byte(t0, 3)) ^
+                pt += 16;
-                        Td1(byte(t3, 2)) ^
+                len -= 16;
-                        Td2(byte(t2, 1)) ^
-                        Td3(byte(t1, 0)) ^
-                        rk[0];
-                s1 =
-                        Td0(byte(t1, 3)) ^
-                        Td1(byte(t0, 2)) ^
-                        Td2(byte(t3, 1)) ^
-                        Td3(byte(t2, 0)) ^
-                        rk[1];
-                s2 =
-                        Td0(byte(t2, 3)) ^
-                        Td1(byte(t1, 2)) ^
-                        Td2(byte(t0, 1)) ^
-                        Td3(byte(t3, 0)) ^
-                        rk[2];
-                s3 =
-                        Td0(byte(t3, 3)) ^
-                        Td1(byte(t2, 2)) ^
-                        Td2(byte(t1, 1)) ^
-                        Td3(byte(t0, 0)) ^
-                        rk[3];
        }
-#endif /* PS_AES_IMPROVE_PERF_INCREASE_CODESIZE */
-/*
-        apply last round and map cipher state to byte array block:
- */
-        s0 =
-                (Td4[byte(t0, 3)] & 0xff000000) ^
-                (Td4[byte(t3, 2)] & 0x00ff0000) ^
-                (Td4[byte(t2, 1)] & 0x0000ff00) ^
-                (Td4[byte(t1, 0)] & 0x000000ff) ^
-                rk[0];
-        STORE32H(s0, pt);
-        s1 =
-                (Td4[byte(t1, 3)] & 0xff000000) ^
-                (Td4[byte(t0, 2)] & 0x00ff0000) ^
-                (Td4[byte(t3, 1)] & 0x0000ff00) ^
-                (Td4[byte(t2, 0)] & 0x000000ff) ^
-                rk[1];
-        STORE32H(s1, pt+4);
-        s2 =
-                (Td4[byte(t2, 3)] & 0xff000000) ^
-                (Td4[byte(t1, 2)] & 0x00ff0000) ^
-                (Td4[byte(t0, 1)] & 0x0000ff00) ^
-                (Td4[byte(t3, 0)] & 0x000000ff) ^
-                rk[2];
-        STORE32H(s2, pt+8);
-        s3 =
-                (Td4[byte(t3, 3)] & 0xff000000) ^
-                (Td4[byte(t2, 2)] & 0x00ff0000) ^
-                (Td4[byte(t1, 1)] & 0x0000ff00) ^
-                (Td4[byte(t0, 0)] & 0x000000ff) ^
-                rk[3];
-        STORE32H(s3, pt+12);
 }
-/******************************************************************************/
-/******************************************************************************/
-#endif /* !USE_AES_CBC_EXTERNAL */
-#endif /* USE_AES */
-/******************************************************************************/
diff --git a/networking/tls_pstm.c b/networking/tls_pstm.c
index acd800307..bd5bae0b7 100644
--- a/networking/tls_pstm.c
+++ b/networking/tls_pstm.c
@@ -47,7 +47,7 @@
 //#include "../cryptoApi.h"
 #ifndef DISABLE_PSTM
-static int32 pstm_mul_2d(pstm_int *a, int16 b, pstm_int *c);
+static int32 pstm_mul_2d(pstm_int *a, int b, pstm_int *c); //bbox: was int16 b
 /******************************************************************************/
 /*
@@ -64,7 +64,7 @@ int32 pstm_init_size(psPool_t *pool, pstm_int * a, uint32 size)
        a->dp = xzalloc(sizeof (pstm_digit) * size);//bbox
 //bbox  a->pool = pool;
        a->used  = 0;
-        a->alloc = (int16)size;
+        a->alloc = size;
        a->sign  = PSTM_ZPOS;
 /*
        zero the digits
@@ -111,9 +111,9 @@ int32 pstm_init(psPool_t *pool, pstm_int * a)
 /*
        Grow as required
 */
-int32 pstm_grow(pstm_int * a, int16 size)
+int32 pstm_grow(pstm_int * a, int size)
 {
-        int16                   i;
+        int                     i; //bbox: was int16
        pstm_digit              *tmp;
 /*
@@ -298,7 +298,7 @@ void pstm_zero(pstm_int * a)
 */
 int32 pstm_cmp_mag(pstm_int * a, pstm_int * b)
 {
-        int16           n;
+        int             n; //bbox: was int16
        pstm_digit      *tmpa, *tmpb;
 /*
@@ -406,7 +406,7 @@ int32 pstm_read_unsigned_bin(pstm_int *a, unsigned char *b, int32 c)
                        c -= excess;
                        b += excess;
                }
-                a->used = (int16)((c + sizeof(pstm_digit) - 1)/sizeof(pstm_digit));
+                a->used = ((c + sizeof(pstm_digit) - 1)/sizeof(pstm_digit));
                if (a->alloc < a->used) {
                        if (pstm_grow(a, a->used) != PSTM_OKAY) {
                                return PSTM_MEM;
@@ -460,9 +460,9 @@ int32 pstm_read_unsigned_bin(pstm_int *a, unsigned char *b, int32 c)
 /******************************************************************************/
 /*
 */
-int16 pstm_count_bits (pstm_int * a)
+int pstm_count_bits (pstm_int * a)
 {
-        int16     r;
+        int     r; //bbox: was int16
        pstm_digit q;
        if (a->used == 0) {
@@ -500,9 +500,9 @@ void pstm_set(pstm_int *a, pstm_digit b)
 /*
        Right shift
 */
-void pstm_rshd(pstm_int *a, int16 x)
+void pstm_rshd(pstm_int *a, int x)
 {
-        int16 y;
+        int y; //bbox: was int16
        /* too many digits just zero and return */
        if (x >= a->used) {
@@ -529,9 +529,9 @@ void pstm_rshd(pstm_int *a, int16 x)
 /*
        Shift left a certain amount of digits.
 */
-int32 pstm_lshd(pstm_int * a, int16 b)
+int32 pstm_lshd(pstm_int * a, int b)
 {
-        int16   x;
+        int     x; //bbox: was int16
        int32   res;
 /*
@@ -582,9 +582,9 @@ int32 pstm_lshd(pstm_int * a, int16 b)
 /*
        computes a = 2**b
 */
-int32 pstm_2expt(pstm_int *a, int16 b)
+int32 pstm_2expt(pstm_int *a, int b)
 {
-        int16     z;
+        int     z; //bbox: was int16
   /* zero a as per default */
        pstm_zero (a);
@@ -619,7 +619,7 @@ int32 pstm_2expt(pstm_int *a, int16 b)
 int32 pstm_mul_2(pstm_int * a, pstm_int * b)
 {
        int32   res;
-        int16   x, oldused;
+        int     x, oldused; //bbox: was int16
 /*
        grow to accomodate result
@@ -684,7 +684,7 @@ int32 pstm_mul_2(pstm_int * a, pstm_int * b)
 */
 int32 s_pstm_sub(pstm_int *a, pstm_int *b, pstm_int *c)
 {
-        int16           oldbused, oldused;
+        int             oldbused, oldused; //bbox: was int16
        int32           x;
        pstm_word       t;
@@ -724,7 +724,7 @@ int32 s_pstm_sub(pstm_int *a, pstm_int *b, pstm_int *c)
 */
 static int32 s_pstm_add(pstm_int *a, pstm_int *b, pstm_int *c)
 {
-        int16                           x, y, oldused;
+        int                             x, y, oldused; //bbox: was int16
        register pstm_word      t, adp, bdp;
        y = a->used;
@@ -781,8 +781,8 @@ static int32 s_pstm_add(pstm_int *a, pstm_int *b, pstm_int *c)
 */
 int32 pstm_sub(pstm_int *a, pstm_int *b, pstm_int *c)
 {
-        int32     res;
+        int32   res;
-        int16     sa, sb;
+        int     sa, sb; //bbox: was int16
        sa = a->sign;
        sb = b->sign;
@@ -881,7 +881,7 @@ int32 pstm_montgomery_setup(pstm_int *a, pstm_digit *rho)
 int32 pstm_montgomery_calc_normalization(pstm_int *a, pstm_int *b)
 {
        int32     x;
-        int16     bits;
+        int     bits; //bbox: was int16
        /* how many bits of last digit does b use */
        bits = pstm_count_bits (b) % DIGIT_BIT;
@@ -916,10 +916,10 @@ int32 pstm_montgomery_calc_normalization(pstm_int *a, pstm_int *b)
 /*
        c = a * 2**d
 */
-static int32 pstm_mul_2d(pstm_int *a, int16 b, pstm_int *c)
+static int32 pstm_mul_2d(pstm_int *a, int b, pstm_int *c)
 {
        pstm_digit      carry, carrytmp, shift;
-        int16           x;
+        int             x; //bbox: was int16
        /* copy it */
        if (pstm_copy(a, c) != PSTM_OKAY) {
@@ -961,9 +961,9 @@ static int32 pstm_mul_2d(pstm_int *a, int16 b, pstm_int *c)
 /*
        c = a mod 2**d
 */
-static int32 pstm_mod_2d(pstm_int *a, int16 b, pstm_int *c)
+static int32 pstm_mod_2d(pstm_int *a, int b, pstm_int *c) //bbox: was int16 b
 {
-        int16   x;
+        int     x; //bbox: was int16
        /* zero if count less than or equal to zero */
        if (b <= 0) {
@@ -1001,7 +1001,7 @@ int32 pstm_mul_d(pstm_int *a, pstm_digit b, pstm_int *c)
 {
        pstm_word       w;
        int32           res;
-        int16           x, oldused;
+        int             x, oldused; //bbox: was int16
        if (c->alloc < a->used + 1) {
                if ((res = pstm_grow (c, a->used + 1)) != PSTM_OKAY) {
@@ -1032,12 +1032,12 @@ int32 pstm_mul_d(pstm_int *a, pstm_digit b, pstm_int *c)
 /*
        c = a / 2**b
 */
-int32 pstm_div_2d(psPool_t *pool, pstm_int *a, int16 b, pstm_int *c,
+int32 pstm_div_2d(psPool_t *pool, pstm_int *a, int b, pstm_int *c,
                                        pstm_int *d)
 {
        pstm_digit      D, r, rr;
        int32           res;
-        int16           x;
+        int             x; //bbox: was int16
        pstm_int        t;
        /* if the shift count is <= 0 then we do no work */
@@ -1120,7 +1120,7 @@ LBL_DONE:
 */
 int32 pstm_div_2(pstm_int * a, pstm_int * b)
 {
-        int16   x, oldused;
+        int     x, oldused; //bbox: was int16
        if (b->alloc < a->used) {
                if (pstm_grow(b, a->used) != PSTM_OKAY) {
@@ -1166,9 +1166,9 @@ int32 pstm_div_2(pstm_int * a, pstm_int * b)
 /*
        Creates "a" then copies b into it
 */
-int32 pstm_init_copy(psPool_t *pool, pstm_int * a, pstm_int * b, int16 toSqr)
+int32 pstm_init_copy(psPool_t *pool, pstm_int * a, pstm_int * b, int toSqr)
 {
-        int16   x;
+        int     x; //bbox: was int16
        int32   res;
        if (a == b) {
@@ -1279,7 +1279,7 @@ int32 pstm_div(psPool_t *pool, pstm_int *a, pstm_int *b, pstm_int *c,
 {
        pstm_int        q, x, y, t1, t2;
        int32           res;
-        int16           n, t, i, norm, neg;
+        int             n, t, i, norm, neg; //bbox: was int16
        /* is divisor zero ? */
        if (pstm_iszero (b) == 1) {
@@ -1531,7 +1531,7 @@ int32 pstm_mulmod(psPool_t *pool, pstm_int *a, pstm_int *b, pstm_int *c,
                        pstm_int *d)
 {
        int32           res;
-        int16           size;
+        int             size; //bbox: was int16
        pstm_int        tmp;
 /*
@@ -1567,7 +1567,7 @@ int32 pstm_exptmod(psPool_t *pool, pstm_int *G, pstm_int *X, pstm_int *P,
        pstm_digit      buf, mp;
        pstm_digit      *paD;
        int32           err, bitbuf;
-        int16           bitcpy, bitcnt, mode, digidx, x, y, winsize;
+        int             bitcpy, bitcnt, mode, digidx, x, y, winsize; //bbox: was int16
        uint32          paDlen;
        /* set window size from what user set as optimization */
@@ -1624,7 +1624,7 @@ int32 pstm_exptmod(psPool_t *pool, pstm_int *G, pstm_int *X, pstm_int *P,
        paDlen = ((M[1].used + 3) * 2) * sizeof(pstm_digit);
        paD = xzalloc(paDlen);//bbox
 /*
-        compute the value at M[1<<(winsize-1)] by squaring M[1] (winsize-1) times
+        compute the value at M[1<<(winsize-1)] by squaring M[1] (winsize-1) times
 */
        if (pstm_init_copy(pool, &M[1 << (winsize - 1)], &M[1], 1) != PSTM_OKAY) {
                err = PS_MEM_FAIL;
@@ -1804,7 +1804,7 @@ LBL_RES:pstm_clear(&res);
 int32 pstm_add(pstm_int *a, pstm_int *b, pstm_int *c)
 {
        int32   res;
-        int16   sa, sb;
+        int     sa, sb; //bbox: was int16
        /* get sign of both inputs */
        sa = a->sign;
@@ -1817,7 +1817,7 @@ int32 pstm_add(pstm_int *a, pstm_int *b, pstm_int *c)
                if ((res = s_pstm_add (a, b, c)) != PSTM_OKAY) {
                        return res;
                }
-  } else {
+        } else {
 /*
                one positive, the other negative
                subtract the one with the greater magnitude from the one of the lesser
@@ -1842,7 +1842,7 @@ int32 pstm_add(pstm_int *a, pstm_int *b, pstm_int *c)
 /*
        reverse an array, used for radix code
 */
-static void pstm_reverse (unsigned char *s, int16 len)
+static void pstm_reverse (unsigned char *s, int len) //bbox: was int16 len
 {
        int32     ix, iy;
        unsigned char t;
@@ -1865,7 +1865,7 @@ static void pstm_reverse (unsigned char *s, int16 len)
 int32 pstm_to_unsigned_bin_nr(psPool_t *pool, pstm_int *a, unsigned char *b)
 {
        int32     res;
-        int16     x;
+        int     x; //bbox: was int16
        pstm_int  t = { 0 };
        if ((res = pstm_init_copy(pool, &t, a, 0)) != PSTM_OKAY) {
@@ -1890,7 +1890,7 @@ int32 pstm_to_unsigned_bin_nr(psPool_t *pool, pstm_int *a, unsigned char *b)
 int32 pstm_to_unsigned_bin(psPool_t *pool, pstm_int *a, unsigned char *b)
 {
        int32     res;
-        int16     x;
+        int     x; //bbox: was int16
        pstm_int  t = { 0 };
        if ((res = pstm_init_copy(pool, &t, a, 0)) != PSTM_OKAY) {
diff --git a/networking/tls_pstm.h b/networking/tls_pstm.h
index 3a0fd8ce6..df705adce 100644
--- a/networking/tls_pstm.h
+++ b/networking/tls_pstm.h
@@ -122,7 +122,7 @@
 #define PSTM_MAX_SIZE   4096
 typedef struct  {
-        int16   used, alloc, sign;
+        int     used, alloc, sign; //bbox: was int16
        pstm_digit      *dp;
 //bbox  psPool_t        *pool;
 } pstm_int;
@@ -154,9 +154,9 @@ extern int32 pstm_init_size(psPool_t *pool, pstm_int * a, uint32 size);
 #define pstm_init_copy(pool, a, b, toSqr) \
        pstm_init_copy(      a, b, toSqr)
 extern int32 pstm_init_copy(psPool_t *pool, pstm_int * a, pstm_int * b,
-                                int16 toSqr);
+                                int toSqr); //bbox: was int16 toSqr
-extern int16 pstm_count_bits (pstm_int * a);
+extern int pstm_count_bits (pstm_int * a); //bbox: was returning int16
 //bbox: pool unused
 #define pstm_init_for_read_unsigned_bin(pool, a, len) \
@@ -178,7 +178,7 @@ extern void pstm_clear_multi(pstm_int *mp0, pstm_int *mp1, pstm_int *mp2,
                                pstm_int *mp3, pstm_int *mp4, pstm_int *mp5, pstm_int *mp6,
                                pstm_int *mp7);
-extern int32 pstm_grow(pstm_int * a, int16 size);
+extern int32 pstm_grow(pstm_int * a, int size); //bbox: was int16 size
 extern void pstm_clamp(pstm_int * a);
@@ -186,9 +186,9 @@ extern int32 pstm_cmp(pstm_int * a, pstm_int * b);
 extern int32 pstm_cmp_mag(pstm_int * a, pstm_int * b);
-extern void pstm_rshd(pstm_int *a, int16 x);
+extern void pstm_rshd(pstm_int *a, int x); //bbox: was int16 x
-extern int32 pstm_lshd(pstm_int * a, int16 b);
+extern int32 pstm_lshd(pstm_int * a, int b); //bbox: was int16 b
 //bbox: pool unused
 #define pstm_div(pool, a, b, c, d) \
@@ -199,8 +199,8 @@ extern int32 pstm_div(psPool_t *pool, pstm_int *a, pstm_int *b, pstm_int *c,
 //bbox: pool unused
 #define pstm_div_2d(pool, a, b, c, d) \
        pstm_div_2d(      a, b, c, d)
-extern int32 pstm_div_2d(psPool_t *pool, pstm_int *a, int16 b, pstm_int *c,
+extern int32 pstm_div_2d(psPool_t *pool, pstm_int *a, int b, pstm_int *c,
-                                pstm_int *d);
+                                pstm_int *d); //bbox: was int16 b
 extern int32 pstm_div_2(pstm_int * a, pstm_int * b);
@@ -232,7 +232,7 @@ extern int32 pstm_mulmod(psPool_t *pool, pstm_int *a, pstm_int *b, pstm_int *c,
 extern int32 pstm_exptmod(psPool_t *pool, pstm_int *G, pstm_int *X, pstm_int *P,
                                pstm_int *Y);
-extern int32 pstm_2expt(pstm_int *a, int16 b);
+extern int32 pstm_2expt(pstm_int *a, int b); //bbox: was int16 b
 extern int32 pstm_add(pstm_int *a, pstm_int *b, pstm_int *c);
diff --git a/networking/udhcp/common.h b/networking/udhcp/common.h
index a526494d7..ee12cf91b 100644
--- a/networking/udhcp/common.h
+++ b/networking/udhcp/common.h
@@ -300,8 +300,8 @@ int udhcp_send_kernel_packet(struct dhcp_packet *dhcp_pkt,
                uint32_t dest_nip, int dest_port) FAST_FUNC;
 void udhcp_sp_setup(void) FAST_FUNC;
-int udhcp_sp_fd_set(fd_set *rfds, int extra_fd) FAST_FUNC;
+void udhcp_sp_fd_set(struct pollfd *pfds, int extra_fd) FAST_FUNC;
-int udhcp_sp_read(const fd_set *rfds) FAST_FUNC;
+int udhcp_sp_read(struct pollfd *pfds) FAST_FUNC;
 int udhcp_read_interface(const char *interface, int *ifindex, uint32_t *nip, uint8_t *mac) FAST_FUNC;
diff --git a/networking/udhcp/d6_common.h b/networking/udhcp/d6_common.h
index eb211ea0f..fcec8c15a 100644
--- a/networking/udhcp/d6_common.h
+++ b/networking/udhcp/d6_common.h
@@ -81,9 +81,14 @@ struct d6_option {
 #define D6_OPT_RECONF_MSG    19
 #define D6_OPT_RECONF_ACCEPT 20
+#define D6_OPT_DNS_SERVERS   23
+#define D6_OPT_DOMAIN_LIST   24
 #define D6_OPT_IA_PD         25
 #define D6_OPT_IAPREFIX      26
+#define D6_OPT_CLIENT_FQDN   39
 /*** Other shared functions ***/
 struct client6_data_t {
@@ -91,10 +96,14 @@ struct client6_data_t {
        struct d6_option *ia_na;
        char **env_ptr;
        unsigned env_idx;
+        /* link-local IPv6 address */
+        struct in6_addr ll_ip6;
 };
 #define client6_data (*(struct client6_data_t*)(&bb_common_bufsiz1[COMMON_BUFSIZE - sizeof(struct client6_data_t)]))
+int FAST_FUNC d6_read_interface(const char *interface, int *ifindex, struct in6_addr *nip6, uint8_t *mac);
 int FAST_FUNC d6_listen_socket(int port, const char *inf);
 int FAST_FUNC d6_recv_kernel_packet(
@@ -112,7 +121,8 @@ int FAST_FUNC d6_send_raw_packet(
 int FAST_FUNC d6_send_kernel_packet(
                struct d6_packet *d6_pkt, unsigned d6_pkt_size,
                struct in6_addr *src_ipv6, int source_port,
-                struct in6_addr *dst_ipv6, int dest_port
+                struct in6_addr *dst_ipv6, int dest_port,
+                int ifindex
 );
 #if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 2
diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c
index 64339c9b5..18a104c61 100644
--- a/networking/udhcp/d6_dhcpc.c
+++ b/networking/udhcp/d6_dhcpc.c
@@ -54,7 +54,9 @@ static const char udhcpc6_longopts[] ALIGN1 =
        "request-option\0" Required_argument "O"
        "no-default-options\0" No_argument   "o"
        "foreground\0"     No_argument       "f"
+        USE_FOR_MMU(
        "background\0"     No_argument       "b"
+        )
 ///     IF_FEATURE_UDHCPC_ARPING("arping\0"     No_argument       "a")
        IF_FEATURE_UDHCP_PORT("client-port\0"   Required_argument "P")
        ;
@@ -86,6 +88,19 @@ enum {
        IF_FEATURE_UDHCP_PORT(   OPT_P = 1 << OPTBIT_P,)
 };
+static const char opt_req[] = {
+        (D6_OPT_ORO >> 8), (D6_OPT_ORO & 0xff),
+        0, 6,
+        (D6_OPT_DNS_SERVERS >> 8), (D6_OPT_DNS_SERVERS & 0xff),
+        (D6_OPT_DOMAIN_LIST >> 8), (D6_OPT_DOMAIN_LIST & 0xff),
+        (D6_OPT_CLIENT_FQDN >> 8), (D6_OPT_CLIENT_FQDN & 0xff)
+};
+static const char opt_fqdn_req[] = {
+        (D6_OPT_CLIENT_FQDN >> 8), (D6_OPT_CLIENT_FQDN & 0xff),
+        0, 2,
+        0, 0
+};
 /*** Utility functions ***/
@@ -107,8 +122,8 @@ static void *d6_find_option(uint8_t *option, uint8_t *option_end, unsigned code)
                /* Does its code match? */
                if (option[1] == code)
                        return option; /* yes! */
-                option += option[3] + 4;
                len_m4 -= option[3] + 4;
+                option += option[3] + 4;
        }
        return NULL;
 }
@@ -139,8 +154,10 @@ static char** new_env(void)
 /* put all the parameters into the environment */
 static void option_to_env(uint8_t *option, uint8_t *option_end)
 {
+        char *dlist, *ptr;
        /* "length minus 4" */
        int len_m4 = option_end - option - 4;
+        int olen, ooff;
        while (len_m4 >= 0) {
                uint32_t v32;
                char ipv6str[sizeof("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff")];
@@ -217,9 +234,54 @@ static void option_to_env(uint8_t *option, uint8_t *option_end)
                        sprint_nip6(ipv6str, option + 4 + 4 + 1);
                        *new_env() = xasprintf("ipv6prefix=%s/%u", ipv6str, (unsigned)(option[4 + 4]));
+                        break;
+                case D6_OPT_DNS_SERVERS:
+                        olen = ((option[2] << 8) | option[3]) / 16;
+                        dlist = ptr = malloc (4 + olen * 40 - 1);
+                        memcpy (ptr, "dns=", 4);
+                        ptr += 4;
+                        ooff = 0;
+                        while (olen--) {
+                                sprint_nip6(ptr, option + 4 + ooff);
+                                ptr += 39;
+                                ooff += 16;
+                                if (olen)
+                                        *ptr++ = ' ';
+                        }
+                        *new_env() = dlist;
+                        break;
+                case D6_OPT_DOMAIN_LIST:
+                        dlist = dname_dec(option + 4, (option[2] << 8) | option[3], "search=");
+                        if (!dlist)
+                                break;
+                        *new_env() = dlist;
+                        break;
+                case D6_OPT_CLIENT_FQDN:
+                        // Work around broken ISC DHCPD6
+                        if (option[4] & 0xf8) {
+                                olen = ((option[2] << 8) | option[3]);
+                                dlist = xmalloc(olen);
+//fixme:
+//- explain
+//- add len error check
+//- merge two allocs into one
+                                memcpy(dlist, option + 4, olen);
+                                *new_env() = xasprintf("fqdn=%s", dlist);
+                                free(dlist);
+                                break;
+                        }
+                        dlist = dname_dec(option + 5, ((option[2] << 8) | option[3]) - 1, "fqdn=");
+                        if (!dlist)
+                                break;
+                        *new_env() = dlist;
+                        break;
                }
-                option += 4 + option[3];
                len_m4 -= 4 + option[3];
+                option += 4 + option[3];
        }
 }
@@ -311,7 +373,7 @@ static int d6_mcast_from_client_config_ifindex(struct d6_packet *packet, uint8_t
        return d6_send_raw_packet(
                packet, (end - (uint8_t*) packet),
-                /*src*/ NULL, CLIENT_PORT6,
+                /*src*/ &client6_data.ll_ip6, CLIENT_PORT6,
                /*dst*/ (struct in6_addr*)FF02__1_2, SERVER_PORT6, MAC_BCAST_ADDR,
                client_config.ifindex
        );
@@ -423,6 +485,10 @@ static NOINLINE int send_d6_discover(uint32_t xid, struct in6_addr *requested_ip
        }
        opt_ptr = d6_store_blob(opt_ptr, client6_data.ia_na, len);
+        /* Request additional options */
+        opt_ptr = d6_store_blob(opt_ptr, &opt_req, sizeof(opt_req));
+        opt_ptr = d6_store_blob(opt_ptr, &opt_fqdn_req, sizeof(opt_fqdn_req));
        /* Add options:
         * "param req" option according to -O, options specified with -x
         */
@@ -476,6 +542,10 @@ static NOINLINE int send_d6_select(uint32_t xid)
        /* IA NA (contains requested IP) */
        opt_ptr = d6_store_blob(opt_ptr, client6_data.ia_na, client6_data.ia_na->len + 2+2);
+        /* Request additional options */
+        opt_ptr = d6_store_blob(opt_ptr, &opt_req, sizeof(opt_req));
+        opt_ptr = d6_store_blob(opt_ptr, &opt_fqdn_req, sizeof(opt_fqdn_req));
        /* Add options:
         * "param req" option according to -O, options specified with -x
         */
@@ -555,7 +625,8 @@ static NOINLINE int send_d6_renew(uint32_t xid, struct in6_addr *server_ipv6, st
                return d6_send_kernel_packet(
                        &packet, (opt_ptr - (uint8_t*) &packet),
                        our_cur_ipv6, CLIENT_PORT6,
-                        server_ipv6, SERVER_PORT6
+                        server_ipv6, SERVER_PORT6,
+                        client_config.ifindex
                );
        return d6_mcast_from_client_config_ifindex(&packet, opt_ptr);
 }
@@ -577,15 +648,14 @@ static int send_d6_release(struct in6_addr *server_ipv6, struct in6_addr *our_cu
        return d6_send_kernel_packet(
                &packet, (opt_ptr - (uint8_t*) &packet),
                our_cur_ipv6, CLIENT_PORT6,
-                server_ipv6, SERVER_PORT6
+                server_ipv6, SERVER_PORT6,
+                client_config.ifindex
        );
 }
 /* Returns -1 on errors that are fatal for the socket, -2 for those that aren't */
 /* NOINLINE: limit stack usage in caller */
-static NOINLINE int d6_recv_raw_packet(struct in6_addr *peer_ipv6
+static NOINLINE int d6_recv_raw_packet(struct in6_addr *peer_ipv6, struct d6_packet *d6_pkt, int fd)
-        UNUSED_PARAM
-        , struct d6_packet *d6_pkt, int fd)
 {
        int bytes;
        struct ip6_udp_d6_packet packet;
@@ -634,6 +704,9 @@ static NOINLINE int d6_recv_raw_packet(struct in6_addr *peer_ipv6
 //              return -2;
 //      }
+        if (peer_ipv6)
+                *peer_ipv6 = packet.ip6.ip6_src; /* struct copy */
        log1("received %s", "a packet");
        d6_dump_packet(&packet.data);
@@ -935,9 +1008,7 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
        int timeout; /* must be signed */
        unsigned already_waited_sec;
        unsigned opt;
-        int max_fd;
        int retval;
-        fd_set rfds;
        setup_common_bufsiz();
@@ -1003,11 +1074,13 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                /* now it looks similar to udhcpd's config file line:
                 * "optname optval", using the common routine: */
                udhcp_str2optset(optstr, &client_config.options);
+                if (colon)
+                        *colon = ':'; /* restore it for NOMMU reexec */
        }
-        if (udhcp_read_interface(client_config.interface,
+        if (d6_read_interface(client_config.interface,
                        &client_config.ifindex,
-                        NULL,
+                        &client6_data.ll_ip6,
                        client_config.client_mac)
        ) {
                return 1;
@@ -1063,7 +1136,8 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
         * "continue" statements in code below jump to the top of the loop.
         */
        for (;;) {
-                struct timeval tv;
+                int tv;
+                struct pollfd pfds[2];
                struct d6_packet packet;
                uint8_t *packet_end;
                /* silence "uninitialized!" warning */
@@ -1078,16 +1152,15 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                 * to change_listen_mode(). Thus we open listen socket
                 * BEFORE we send renew request (see "case BOUND:"). */
-                max_fd = udhcp_sp_fd_set(&rfds, sockfd);
+                udhcp_sp_fd_set(pfds, sockfd);
-                tv.tv_sec = timeout - already_waited_sec;
+                tv = timeout - already_waited_sec;
-                tv.tv_usec = 0;
                retval = 0;
                /* If we already timed out, fall through with retval = 0, else... */
-                if ((int)tv.tv_sec > 0) {
+                if (tv > 0) {
-                        log1("waiting on select %u seconds", (int)tv.tv_sec);
+                        log1("waiting on select %u seconds", tv);
                        timestamp_before_wait = (unsigned)monotonic_sec();
-                        retval = select(max_fd + 1, &rfds, NULL, NULL, &tv);
+                        retval = poll(pfds, 2, tv < INT_MAX/1000 ? tv * 1000 : INT_MAX);
                        if (retval < 0) {
                                /* EINTR? A signal was caught, don't panic */
                                if (errno == EINTR) {
@@ -1108,13 +1181,14 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                         * or if the status of the bridge changed).
                         * Refresh ifindex and client_mac:
                         */
-                        if (udhcp_read_interface(client_config.interface,
+                        if (d6_read_interface(client_config.interface,
                                        &client_config.ifindex,
-                                        NULL,
+                                        &client6_data.ll_ip6,
                                        client_config.client_mac)
                        ) {
                                goto ret0; /* iface is gone? */
                        }
                        memcpy(clientid_mac_ptr, client_config.client_mac, 6);
                        /* We will restart the wait in any case */
@@ -1222,8 +1296,8 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                /* select() didn't timeout, something happened */
                /* Is it a signal? */
-                /* note: udhcp_sp_read checks FD_ISSET before reading */
+                /* note: udhcp_sp_read checks poll result before reading */
-                switch (udhcp_sp_read(&rfds)) {
+                switch (udhcp_sp_read(pfds)) {
                case SIGUSR1:
                        client_config.first_secs = 0; /* make secs field count from 0 */
                        already_waited_sec = 0;
@@ -1258,7 +1332,7 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                }
                /* Is it a packet? */
-                if (listen_mode == LISTEN_NONE || !FD_ISSET(sockfd, &rfds))
+                if (listen_mode == LISTEN_NONE || !pfds[1].revents)
                        continue; /* no */
                {
@@ -1307,7 +1381,7 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                                struct d6_option *option, *iaaddr;
 type_is_ok:
                                option = d6_find_option(packet.d6_options, packet_end, D6_OPT_STATUS_CODE);
-                                if (option && option->data[4] != 0) {
+                                if (option && (option->data[0] | option->data[1]) != 0) {
                                        /* return to init state */
                                        bb_error_msg("received DHCP NAK (%u)", option->data[4]);
                                        d6_run_script(&packet, "nak");
@@ -1460,8 +1534,8 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                                if (lease_seconds < 0x10)
                                        lease_seconds = 0x10;
 /// TODO: check for 0 lease time?
-                                if (lease_seconds >= 0x10000000)
+                                if (lease_seconds > 0x7fffffff / 1000)
-                                        lease_seconds = 0x0fffffff;
+                                        lease_seconds = 0x7fffffff / 1000;
                                /* enter bound state */
                                timeout = lease_seconds / 2;
                                bb_error_msg("lease obtained, lease time %u",
diff --git a/networking/udhcp/d6_packet.c b/networking/udhcp/d6_packet.c
index e166f520d..79a0ac8a8 100644
--- a/networking/udhcp/d6_packet.c
+++ b/networking/udhcp/d6_packet.c
@@ -127,7 +127,8 @@ int FAST_FUNC d6_send_raw_packet(
 int FAST_FUNC d6_send_kernel_packet(
                struct d6_packet *d6_pkt, unsigned d6_pkt_size,
                struct in6_addr *src_ipv6, int source_port,
-                struct in6_addr *dst_ipv6, int dest_port)
+                struct in6_addr *dst_ipv6, int dest_port,
+                int ifindex)
 {
        struct sockaddr_in6 sa;
        int fd;
@@ -154,6 +155,7 @@ int FAST_FUNC d6_send_kernel_packet(
        sa.sin6_family = AF_INET6;
        sa.sin6_port = htons(dest_port);
        sa.sin6_addr = *dst_ipv6; /* struct copy */
+        sa.sin6_scope_id = ifindex;
        if (connect(fd, (struct sockaddr *)&sa, sizeof(sa)) == -1) {
                msg = "connect";
                goto ret_close;
diff --git a/networking/udhcp/d6_socket.c b/networking/udhcp/d6_socket.c
index 910f296a3..930e5e4f5 100644
--- a/networking/udhcp/d6_socket.c
+++ b/networking/udhcp/d6_socket.c
@@ -7,6 +7,67 @@
 #include "common.h"
 #include "d6_common.h"
 #include <net/if.h>
+#include <ifaddrs.h>
+#include <netpacket/packet.h>
+int FAST_FUNC d6_read_interface(const char *interface, int *ifindex, struct in6_addr *nip6, uint8_t *mac)
+{
+        int retval = 3;
+        struct ifaddrs *ifap, *ifa;
+        getifaddrs(&ifap);
+        for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
+                struct sockaddr_in6 *sip6;
+                if (!ifa->ifa_addr || (strcmp(ifa->ifa_name, interface) != 0))
+                        continue;
+                sip6 = (struct sockaddr_in6*)(ifa->ifa_addr);
+                if (ifa->ifa_addr->sa_family == AF_PACKET) {
+                        struct sockaddr_ll *sll = (struct sockaddr_ll*)(ifa->ifa_addr);
+                        memcpy(mac, sll->sll_addr, 6);
+                        log1("MAC %02x:%02x:%02x:%02x:%02x:%02x", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
+                        log1("adapter index %d", sll->sll_ifindex);
+                        *ifindex = sll->sll_ifindex;
+                        retval &= (0xf - (1<<0));
+                }
+#if 0
+                if (ifa->ifa_addr->sa_family == AF_INET) {
+                        *nip = ((struct sockaddr_in *)ifa->ifa_addr)->sin_addr.s_addr;
+                        log1("IP %s", inet_ntoa(((struct sockaddr_in *)ifa->ifa_addr)->sin_addr));
+                }
+#endif
+                if (ifa->ifa_addr->sa_family == AF_INET6
+                 && IN6_IS_ADDR_LINKLOCAL(&sip6->sin6_addr)
+                ) {
+                        *nip6 = sip6->sin6_addr; /* struct copy */
+                        log1(
+                                "IPv6 %02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x",
+                                nip6->s6_addr[0], nip6->s6_addr[1],
+                                nip6->s6_addr[2], nip6->s6_addr[3],
+                                nip6->s6_addr[4], nip6->s6_addr[5],
+                                nip6->s6_addr[6], nip6->s6_addr[7],
+                                nip6->s6_addr[8], nip6->s6_addr[9],
+                                nip6->s6_addr[10], nip6->s6_addr[11],
+                                nip6->s6_addr[12], nip6->s6_addr[13],
+                                nip6->s6_addr[14], nip6->s6_addr[15]
+                        );
+                        retval &= (0xf - (1<<1));
+                }
+        }
+        freeifaddrs(ifap);
+        if (retval == 0)
+                return retval;
+        if (retval & (1<<0))
+                bb_error_msg("can't get %s", "MAC");
+        if (retval & (1<<1))
+                bb_error_msg("can't get %s", "link-local IPv6 address");
+        return -1;
+}
 int FAST_FUNC d6_listen_socket(int port, const char *inf)
 {
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index 0e236261b..6aa6731fb 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -73,7 +73,9 @@ static const char udhcpc_longopts[] ALIGN1 =
        "request-option\0" Required_argument "O"
        "no-default-options\0" No_argument   "o"
        "foreground\0"     No_argument       "f"
+        USE_FOR_MMU(
        "background\0"     No_argument       "b"
+        )
        "broadcast\0"      No_argument       "B"
        IF_FEATURE_UDHCPC_ARPING("arping\0"     Optional_argument "a")
        IF_FEATURE_UDHCP_PORT("client-port\0"   Required_argument "P")
@@ -1281,9 +1283,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
        unsigned already_waited_sec;
        unsigned opt;
        IF_FEATURE_UDHCPC_ARPING(unsigned arpping_ms;)
-        int max_fd;
        int retval;
-        fd_set rfds;
        setup_common_bufsiz();
@@ -1367,6 +1367,8 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                /* now it looks similar to udhcpd's config file line:
                 * "optname optval", using the common routine: */
                udhcp_str2optset(optstr, &client_config.options);
+                if (colon)
+                        *colon = ':'; /* restore it for NOMMU reexec */
        }
        if (udhcp_read_interface(client_config.interface,
@@ -1432,7 +1434,8 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
         * "continue" statements in code below jump to the top of the loop.
         */
        for (;;) {
-                struct timeval tv;
+                int tv;
+                struct pollfd pfds[2];
                struct dhcp_packet packet;
                /* silence "uninitialized!" warning */
                unsigned timestamp_before_wait = timestamp_before_wait;
@@ -1446,23 +1449,22 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                 * to change_listen_mode(). Thus we open listen socket
                 * BEFORE we send renew request (see "case BOUND:"). */
-                max_fd = udhcp_sp_fd_set(&rfds, sockfd);
+                udhcp_sp_fd_set(pfds, sockfd);
-                tv.tv_sec = timeout - already_waited_sec;
+                tv = timeout - already_waited_sec;
-                tv.tv_usec = 0;
                retval = 0;
                /* If we already timed out, fall through with retval = 0, else... */
-                if ((int)tv.tv_sec > 0) {
+                if (tv > 0) {
-                        log1("waiting on select %u seconds", (int)tv.tv_sec);
+                        log1("waiting on select %u seconds", tv);
                        timestamp_before_wait = (unsigned)monotonic_sec();
-                        retval = select(max_fd + 1, &rfds, NULL, NULL, &tv);
+                        retval = poll(pfds, 2, tv < INT_MAX/1000 ? tv * 1000 : INT_MAX);
                        if (retval < 0) {
                                /* EINTR? A signal was caught, don't panic */
                                if (errno == EINTR) {
                                        already_waited_sec += (unsigned)monotonic_sec() - timestamp_before_wait;
                                        continue;
                                }
-                                /* Else: an error occured, panic! */
+                                /* Else: an error occurred, panic! */
                                bb_perror_msg_and_die("select");
                        }
                }
@@ -1591,8 +1593,8 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                /* select() didn't timeout, something happened */
                /* Is it a signal? */
-                /* note: udhcp_sp_read checks FD_ISSET before reading */
+                /* note: udhcp_sp_read checks poll result before reading */
-                switch (udhcp_sp_read(&rfds)) {
+                switch (udhcp_sp_read(pfds)) {
                case SIGUSR1:
                        client_config.first_secs = 0; /* make secs field count from 0 */
                        already_waited_sec = 0;
@@ -1627,7 +1629,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                }
                /* Is it a packet? */
-                if (listen_mode == LISTEN_NONE || !FD_ISSET(sockfd, &rfds))
+                if (listen_mode == LISTEN_NONE || !pfds[1].revents)
                        continue; /* no */
                {
@@ -1742,8 +1744,8 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                                        /* paranoia: must not be too small and not prone to overflows */
                                        if (lease_seconds < 0x10)
                                                lease_seconds = 0x10;
-                                        if (lease_seconds >= 0x10000000)
+                                        if (lease_seconds > 0x7fffffff / 1000)
-                                                lease_seconds = 0x0fffffff;
+                                                lease_seconds = 0x7fffffff / 1000;
                                }
 #if ENABLE_FEATURE_UDHCPC_ARPING
                                if (opt & OPT_a) {
diff --git a/networking/udhcp/dhcpd.c b/networking/udhcp/dhcpd.c
index e116ba3af..5eff026bc 100644
--- a/networking/udhcp/dhcpd.c
+++ b/networking/udhcp/dhcpd.c
@@ -794,7 +794,7 @@ static NOINLINE void send_inform(struct dhcp_packet *oldpacket)
 int udhcpd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int udhcpd_main(int argc UNUSED_PARAM, char **argv)
 {
-        int server_socket = -1, retval, max_sock;
+        int server_socket = -1, retval;
        uint8_t *state;
        unsigned timeout_end;
        unsigned num_ips;
@@ -891,10 +891,10 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
 continue_with_autotime:
        timeout_end = monotonic_sec() + server_config.auto_time;
        while (1) { /* loop until universe collapses */
-                fd_set rfds;
+                struct pollfd pfds[2];
                struct dhcp_packet packet;
                int bytes;
-                struct timeval tv;
+                int tv;
                uint8_t *server_id_opt;
                uint8_t *requested_ip_opt;
                uint32_t requested_nip = requested_nip; /* for compiler */
@@ -906,16 +906,11 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
                                        server_config.interface);
                }
-                max_sock = udhcp_sp_fd_set(&rfds, server_socket);
+                udhcp_sp_fd_set(pfds, server_socket);
-                if (server_config.auto_time) {
+                tv = timeout_end - monotonic_sec();
-                        /* cast to signed is essential if tv_sec is wider than int */
-                        tv.tv_sec = (int)(timeout_end - monotonic_sec());
-                        tv.tv_usec = 0;
-                }
                retval = 0;
-                if (!server_config.auto_time || tv.tv_sec > 0) {
+                if (!server_config.auto_time || tv > 0) {
-                        retval = select(max_sock + 1, &rfds, NULL, NULL,
+                        retval = poll(pfds, 2, server_config.auto_time ? tv * 1000 : -1);
-                                        server_config.auto_time ? &tv : NULL);
                }
                if (retval == 0) {
                        write_leases();
@@ -926,7 +921,7 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
                        continue;
                }
-                switch (udhcp_sp_read(&rfds)) {
+                switch (udhcp_sp_read(pfds)) {
                case SIGUSR1:
                        bb_error_msg("received %s", "SIGUSR1");
                        write_leases();
diff --git a/networking/udhcp/dhcprelay.c b/networking/udhcp/dhcprelay.c
index 7cb19b14e..ea84c0dd7 100644
--- a/networking/udhcp/dhcprelay.c
+++ b/networking/udhcp/dhcprelay.c
@@ -361,7 +361,7 @@ int dhcprelay_main(int argc, char **argv)
 //   which the reply must be sent (i.e., the host or router interface
 //   connected to the same network as the BOOTP client).  If the content
 //   of the 'giaddr' field does not match one of the relay agent's
-//   directly-connected logical interfaces, the BOOTREPLY messsage MUST be
+//   directly-connected logical interfaces, the BOOTREPLY message MUST be
 //   silently discarded.
                                if (udhcp_read_interface(iface_list[i], NULL, &dhcp_msg.gateway_nip, NULL)) {
                                        /* Fall back to our IP on server iface */
diff --git a/networking/udhcp/signalpipe.c b/networking/udhcp/signalpipe.c
index 6355c5e90..b101b4ce4 100644
--- a/networking/udhcp/signalpipe.c
+++ b/networking/udhcp/signalpipe.c
@@ -25,9 +25,11 @@ static struct fd_pair signal_pipe;
 static void signal_handler(int sig)
 {
+        int sv = errno;
        unsigned char ch = sig; /* use char, avoid dealing with partial writes */
        if (write(signal_pipe.wr, &ch, 1) != 1)
                bb_perror_msg("can't send signal");
+        errno = sv;
 }
 /* Call this before doing anything else. Sets up the socket pair
@@ -46,28 +48,29 @@ void FAST_FUNC udhcp_sp_setup(void)
                , signal_handler);
 }
-/* Quick little function to setup the rfds. Will return the
+/* Quick little function to setup the pfds.
- * max_fd for use with select. Limited in that you can only pass
+ * Limited in that you can only pass one extra fd.
- * one extra fd */
+ */
-int FAST_FUNC udhcp_sp_fd_set(fd_set *rfds, int extra_fd)
+void FAST_FUNC udhcp_sp_fd_set(struct pollfd pfds[2], int extra_fd)
 {
-        FD_ZERO(rfds);
+        pfds[0].fd = signal_pipe.rd;
-        FD_SET(signal_pipe.rd, rfds);
+        pfds[0].events = POLLIN;
+        pfds[1].fd = -1;
        if (extra_fd >= 0) {
                close_on_exec_on(extra_fd);
-                FD_SET(extra_fd, rfds);
+                pfds[1].fd = extra_fd;
+                pfds[1].events = POLLIN;
        }
-        return signal_pipe.rd > extra_fd ? signal_pipe.rd : extra_fd;
 }
 /* Read a signal from the signal pipe. Returns 0 if there is
 * no signal, -1 on error (and sets errno appropriately), and
 * your signal on success */
-int FAST_FUNC udhcp_sp_read(const fd_set *rfds)
+int FAST_FUNC udhcp_sp_read(struct pollfd pfds[2])
 {
        unsigned char sig;
-        if (!FD_ISSET(signal_pipe.rd, rfds))
+        if (!pfds[0].revents)
                return 0;
        if (safe_read(signal_pipe.rd, &sig, 1) != 1)
diff --git a/networking/vconfig.c b/networking/vconfig.c
index f3020409a..854eca0a1 100644
--- a/networking/vconfig.c
+++ b/networking/vconfig.c
@@ -138,7 +138,7 @@ int vconfig_main(int argc, char **argv)
                /* I suppose one could try to combine some of the function calls below,
                 * since ifr.u.flag, ifr.u.VID, and ifr.u.skb_priority are all same-sized
                 * (unsigned) int members of a unions.  But because of the range checking,
-                 * doing so wouldn't save that much space and would also make maintainence
+                 * doing so wouldn't save that much space and would also make maintenance
                 * more of a pain.
                 */
                if (ifr.cmd == SET_VLAN_FLAG_CMD) {
diff --git a/procps/kill.c b/procps/kill.c
index 7ae5beead..975a3e8c5 100644
--- a/procps/kill.c
+++ b/procps/kill.c
@@ -201,7 +201,7 @@ int kill_main(int argc UNUSED_PARAM, char **argv)
                pid_t sid;
                procps_status_t* p = NULL;
                /* compat: exitcode 2 is "no one was signaled" */
-                int ret = 2;
+                errors = 2;
                /* Find out our session id */
                sid = getsid(pid);
@@ -229,7 +229,7 @@ int kill_main(int argc UNUSED_PARAM, char **argv)
                                arg = *args++;
                                if (arg[0] != '-' || arg[1] != 'o') {
                                        bb_error_msg("bad option '%s'", arg);
-                                        ret = 1;
+                                        errors = 1;
                                        goto resume;
                                }
                                arg += 2;
@@ -238,21 +238,21 @@ int kill_main(int argc UNUSED_PARAM, char **argv)
                                omit = bb_strtoi(arg, NULL, 10);
                                if (errno) {
                                        bb_error_msg("invalid number '%s'", arg);
-                                        ret = 1;
+                                        errors = 1;
                                        goto resume;
                                }
                                if (p->pid == omit)
                                        goto dont_kill;
                        }
                        kill(p->pid, signo);
-                        ret = 0;
+                        errors = 0;
 dont_kill: ;
                }
 resume:
                /* And let them continue */
                if (signo != SIGSTOP && signo != SIGCONT)
                        kill(-1, SIGCONT);
-                return ret;
+                return errors;
        }
 #if ENABLE_KILL || ENABLE_KILLALL
diff --git a/runit/chpst.c b/runit/chpst.c
index 846c846d3..ee3a33153 100644
--- a/runit/chpst.c
+++ b/runit/chpst.c
@@ -463,6 +463,13 @@ int chpst_main(int argc UNUSED_PARAM, char **argv)
                xchroot(root);
        }
+        /* nice should be done before xsetuid */
+        if (opt & OPT_n) {
+                errno = 0;
+                if (nice(xatoi(nicestr)) == -1)
+                        bb_perror_msg_and_die("nice");
+        }
        if (opt & OPT_u) {
                if (setgroups(1, &ugid.gid) == -1)
                        bb_perror_msg_and_die("setgroups");
@@ -470,12 +477,6 @@ int chpst_main(int argc UNUSED_PARAM, char **argv)
                xsetuid(ugid.uid);
        }
-        if (opt & OPT_n) {
-                errno = 0;
-                if (nice(xatoi(nicestr)) == -1)
-                        bb_perror_msg_and_die("nice");
-        }
        if (opt & OPT_0)
                close(STDIN_FILENO);
        if (opt & OPT_1)
diff --git a/runit/runsv.c b/runit/runsv.c
index e0e31508a..939653d12 100644
--- a/runit/runsv.c
+++ b/runit/runsv.c
@@ -134,9 +134,13 @@ static void fatal2x_cannot(const char *m1, const char *m2)
        bb_error_msg_and_die("%s: fatal: can't %s%s", dir, m1, m2);
        /* was exiting 111 */
 }
+static void warn2_cannot(const char *m1, const char *m2)
+{
+        bb_perror_msg("%s: warning: can't %s%s", dir, m1, m2);
+}
 static void warn_cannot(const char *m)
 {
-        bb_perror_msg("%s: warning: cannot %s", dir, m);
+        warn2_cannot(m, "");
 }
 static void s_child(int sig_no UNUSED_PARAM)
@@ -165,10 +169,25 @@ static void update_status(struct svdir *s)
        ssize_t sz;
        int fd;
        svstatus_t status;
+        const char *fstatus ="log/supervise/status";
+        const char *fstatusnew ="log/supervise/status.new";
+        const char *f_stat ="log/supervise/stat";
+        const char *fstatnew ="log/supervise/stat.new";
+        const char *fpid ="log/supervise/pid";
+        const char *fpidnew ="log/supervise/pid.new";
+        if (!s->islog) {
+                fstatus += 4;
+                fstatusnew += 4;
+                f_stat += 4;
+                fstatnew += 4;
+                fpid += 4;
+                fpidnew += 4;
+        }
        /* pid */
        if (pidchanged) {
-                fd = open_trunc_or_warn("supervise/pid.new");
+                fd = open_trunc_or_warn(fpidnew);
                if (fd < 0)
                        return;
                if (s->pid) {
@@ -177,14 +196,13 @@ static void update_status(struct svdir *s)
                        write(fd, spid, size);
                }
                close(fd);
-                if (rename_or_warn("supervise/pid.new",
+                if (rename_or_warn(fpidnew, fpid))
-                                s->islog ? "log/supervise/pid" : "log/supervise/pid"+4))
                        return;
                pidchanged = 0;
        }
        /* stat */
-        fd = open_trunc_or_warn("supervise/stat.new");
+        fd = open_trunc_or_warn(fstatnew);
        if (fd < -1)
                return;
@@ -220,8 +238,7 @@ static void update_status(struct svdir *s)
                close(fd);
        }
-        rename_or_warn("supervise/stat.new",
+        rename_or_warn(fstatnew, f_stat);
-                s->islog ? "log/supervise/stat" : "log/supervise/stat"+4);
        /* supervise compatibility */
        memset(&status, 0, sizeof(status));
@@ -237,18 +254,17 @@ static void update_status(struct svdir *s)
        if (s->ctrl & C_TERM)
                status.got_term = 1;
        status.run_or_finish = s->state;
-        fd = open_trunc_or_warn("supervise/status.new");
+        fd = open_trunc_or_warn(fstatusnew);
        if (fd < 0)
                return;
        sz = write(fd, &status, sizeof(status));
        close(fd);
        if (sz != sizeof(status)) {
-                warn_cannot("write supervise/status.new");
+                warn2_cannot("write ", fstatusnew);
-                unlink("supervise/status.new");
+                unlink(fstatusnew);
                return;
        }
-        rename_or_warn("supervise/status.new",
+        rename_or_warn(fstatusnew, fstatus);
-                s->islog ? "log/supervise/status" : "log/supervise/status"+4);
 }
 static unsigned custom(struct svdir *s, char c)
@@ -266,26 +282,26 @@ static unsigned custom(struct svdir *s, char c)
                if (st.st_mode & S_IXUSR) {
                        pid = vfork();
                        if (pid == -1) {
-                                warn_cannot("vfork for control/?");
+                                warn2_cannot("vfork for ", a);
                                return 0;
                        }
                        if (pid == 0) {
                                /* child */
                                if (haslog && dup2(logpipe.wr, 1) == -1)
-                                        warn_cannot("setup stdout for control/?");
+                                        warn2_cannot("setup stdout for ", a);
                                execl(a, a, (char *) NULL);
-                                fatal_cannot("run control/?");
+                                fatal2_cannot("run ", a);
                        }
                        /* parent */
                        if (safe_waitpid(pid, &w, 0) == -1) {
-                                warn_cannot("wait for child control/?");
+                                warn2_cannot("wait for child ", a);
                                return 0;
                        }
                        return WEXITSTATUS(w) == 0;
                }
        } else {
                if (errno != ENOENT)
-                        warn_cannot("stat control/?");
+                        warn2_cannot("stat ", a);
        }
        return 0;
 }
@@ -387,13 +403,13 @@ static int ctrl(struct svdir *s, char c)
        case 'd': /* down */
                s->sd_want = W_DOWN;
                update_status(s);
-                if (s->pid && s->state != S_FINISH)
+                if (s->state == S_RUN)
                        stopservice(s);
                break;
        case 'u': /* up */
                s->sd_want = W_UP;
                update_status(s);
-                if (s->pid == 0)
+                if (s->state == S_DOWN)
                        startservice(s);
                break;
        case 'x': /* exit */
@@ -403,22 +419,22 @@ static int ctrl(struct svdir *s, char c)
                update_status(s);
                /* FALLTHROUGH */
        case 't': /* sig term */
-                if (s->pid && s->state != S_FINISH)
+                if (s->state == S_RUN)
                        stopservice(s);
                break;
        case 'k': /* sig kill */
-                if (s->pid && !custom(s, c))
+                if ((s->state == S_RUN) && !custom(s, c))
                        kill(s->pid, SIGKILL);
                s->state = S_DOWN;
                break;
        case 'p': /* sig pause */
-                if (s->pid && !custom(s, c))
+                if ((s->state == S_RUN) && !custom(s, c))
                        kill(s->pid, SIGSTOP);
                s->ctrl |= C_PAUSE;
                update_status(s);
                break;
        case 'c': /* sig cont */
-                if (s->pid && !custom(s, c))
+                if ((s->state == S_RUN) && !custom(s, c))
                        kill(s->pid, SIGCONT);
                s->ctrl &= ~C_PAUSE;
                update_status(s);
@@ -426,7 +442,7 @@ static int ctrl(struct svdir *s, char c)
        case 'o': /* once */
                s->sd_want = W_DOWN;
                update_status(s);
-                if (!s->pid)
+                if (s->state == S_DOWN)
                        startservice(s);
                break;
        case 'a': /* sig alarm */
@@ -450,11 +466,26 @@ static int ctrl(struct svdir *s, char c)
        }
        return 1;
 sendsig:
-        if (s->pid && !custom(s, c))
+        if ((s->state == S_RUN) && !custom(s, c))
                kill(s->pid, sig);
        return 1;
 }
+static void open_control(const char *f, struct svdir *s)
+{
+        struct stat st;
+        mkfifo(f, 0600);
+        if (stat(f, &st) == -1)
+                fatal2_cannot("stat ", f);
+        if (!S_ISFIFO(st.st_mode))
+                bb_error_msg_and_die("%s: fatal: %s exists but is not a fifo", dir, f);
+        s->fdcontrol = xopen(f, O_RDONLY|O_NDELAY);
+        close_on_exec_on(s->fdcontrol);
+        s->fdcontrolwrite = xopen(f, O_WRONLY|O_NDELAY);
+        close_on_exec_on(s->fdcontrolwrite);
+        update_status(s);
+}
 int runsv_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int runsv_main(int argc UNUSED_PARAM, char **argv)
 {
@@ -554,19 +585,9 @@ int runsv_main(int argc UNUSED_PARAM, char **argv)
                close_on_exec_on(svd[1].fdlock);
        }
-        mkfifo("log/supervise/control"+4, 0600);
+        open_control("log/supervise/control"+4, &svd[0]);
-        svd[0].fdcontrol = xopen("log/supervise/control"+4, O_RDONLY|O_NDELAY);
-        close_on_exec_on(svd[0].fdcontrol);
-        svd[0].fdcontrolwrite = xopen("log/supervise/control"+4, O_WRONLY|O_NDELAY);
-        close_on_exec_on(svd[0].fdcontrolwrite);
-        update_status(&svd[0]);
        if (haslog) {
-                mkfifo("log/supervise/control", 0600);
+                open_control("log/supervise/control", &svd[1]);
-                svd[1].fdcontrol = xopen("log/supervise/control", O_RDONLY|O_NDELAY);
-                close_on_exec_on(svd[1].fdcontrol);
-                svd[1].fdcontrolwrite = xopen("log/supervise/control", O_WRONLY|O_NDELAY);
-                close_on_exec_on(svd[1].fdcontrolwrite);
-                update_status(&svd[1]);
        }
        mkfifo("log/supervise/ok"+4, 0600);
        fd = xopen("log/supervise/ok"+4, O_RDONLY|O_NDELAY);
diff --git a/runit/sv.c b/runit/sv.c
index 9e2132259..faa31d4fa 100644
--- a/runit/sv.c
+++ b/runit/sv.c
@@ -25,7 +25,7 @@ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-/* Taken from http://smarden.sunsite.dk/runit/sv.8.html:
+/* Taken from http://smarden.org/runit/sv.8.html:
 sv - control and manage services monitored by runsv
@@ -36,17 +36,13 @@ The sv program reports the current status and controls the state of services
 monitored by the runsv(8) supervisor.
 services consists of one or more arguments, each argument naming a directory
-service used by runsv(8). If service doesn't start with a dot or slash,
+service used by runsv(8). If service doesn't start with a dot or slash and
-it is searched in the default services directory /var/service/, otherwise
+doesn't end with a slash, it is searched in the default services directory
-relative to the current directory.
+/var/service/, otherwise relative to the current directory.
 command is one of up, down, status, once, pause, cont, hup, alarm, interrupt,
-1, 2, term, kill, or exit, or start, stop, restart, shutdown, force-stop,
+1, 2, term, kill, or exit, or start, stop, reload, restart, shutdown,
-force-reload, force-restart, force-shutdown.
+force-stop, force-reload, force-restart, force-shutdown, try-restart.
-The sv program can be sym-linked to /etc/init.d/ to provide an LSB init
-script interface. The service to be controlled then is specified by the
-base name of the "init script".
 status
    Report the current status of the service, and the appendant log service
@@ -66,9 +62,9 @@ exit
    If the service is running, send it the TERM signal, and the CONT signal.
    Do not restart the service. If the service is down, and no log service
    exists, runsv(8) exits. If the service is down and a log service exists,
-    send the TERM signal to the log service. If the log service is down,
+    runsv(8) closes the standard input of the log service and waits for it to
-    runsv(8) exits. This command is ignored if it is given to an appendant
+    terminate. If the log service is down, runsv(8) exits. This command is
-    log service.
+    ignored if it is given to an appendant log service.
 sv actually looks only at the first character of above commands.
@@ -85,6 +81,8 @@ start
 stop
    Same as down, but wait up to 7 seconds for the service to become down.
    Then report the status or timeout.
+reload
+    Same as hup, and additionally report the status afterwards.
 restart
    Send the commands term, cont, and up to the service, and wait up to
    7 seconds for the service to restart. Then report the status or timeout.
@@ -112,6 +110,9 @@ force-shutdown
    Same as exit, but wait up to 7 seconds for the runsv(8) process to
    terminate. Then report the status, and on timeout send the service
    the kill command.
+try-restart
+    if the service is running, send it the term and cont commands, and wait up to
+    7 seconds for the service to restart. Then report the status or timeout.
 Additional Commands
@@ -126,8 +127,8 @@ check
 Options
 -v
-    wait up to 7 seconds for the command to take effect.
+    If the command is up, down, term, once, cont, or exit, then wait up to 7
-    Then report the status or timeout.
+    seconds for the command to take effect. Then report the status or timeout.
 -w sec
    Override the default timeout of 7 seconds with sec seconds. Implies -v.
@@ -192,6 +193,7 @@ struct globals {
 /* "Bernstein" time format: unix + 0x400000000000000aULL */
        uint64_t tstart, tnow;
        svstatus_t svstatus;
+        unsigned islog;
 } FIX_ALIASING;
 #define G (*(struct globals*)bb_common_bufsiz1)
 #define acts         (G.acts        )
@@ -200,6 +202,7 @@ struct globals {
 #define tstart       (G.tstart      )
 #define tnow         (G.tnow        )
 #define svstatus     (G.svstatus    )
+#define islog        (G.islog       )
 #define INIT_G() do { setup_common_bufsiz(); } while (0)
@@ -215,7 +218,7 @@ static void fatal_cannot(const char *m1)
 static void out(const char *p, const char *m1)
 {
-        printf("%s%s: %s", p, *service, m1);
+        printf("%s%s%s: %s", p, *service, islog ? "/log" : "", m1);
        if (errno) {
                printf(": %s", strerror(errno));
        }
@@ -300,15 +303,14 @@ static unsigned svstatus_print(const char *m)
        }
        pid = SWAP_LE32(svstatus.pid_le32);
        timestamp = SWAP_BE64(svstatus.time_be64);
-        if (pid) {
+        switch (svstatus.run_or_finish) {
-                switch (svstatus.run_or_finish) {
+                case 0: printf("down: "); break;
                case 1: printf("run: "); break;
                case 2: printf("finish: "); break;
-                }
-                printf("%s: (pid %d) ", m, pid);
-        } else {
-                printf("down: %s: ", m);
        }
+        printf("%s: ", m);
+        if (svstatus.run_or_finish)
+                printf("(pid %d) ", pid);
        diff = tnow - timestamp;
        printf("%us", (diff < 0 ? 0 : diff));
        if (pid) {
@@ -331,16 +333,21 @@ static int status(const char *unused UNUSED_PARAM)
                return 0;
        r = svstatus_print(*service);
+        islog = 1;
        if (chdir("log") == -1) {
                if (errno != ENOENT) {
-                        printf("; log: "WARN"can't change to log service directory: %s",
+                        printf("; ");
-                                        strerror(errno));
+                        warn("can't change directory");
-                }
+                } else
-        } else if (svstatus_get()) {
+                        bb_putchar('\n');
+        } else {
                printf("; ");
-                svstatus_print("log");
+                if (svstatus_get()) {
+                        r = svstatus_print("log");
+                        bb_putchar('\n');
+                }
        }
-        bb_putchar('\n'); /* will also flush the output */
+        islog = 0;
        return r;
 }
@@ -379,35 +386,53 @@ static int check(const char *a)
        r = svstatus_get();
        if (r == -1)
                return -1;
-        if (r == 0) {
+        while (*a) {
-                if (*a == 'x')
+                if (r == 0) {
-                        return 1;
+                        if (*a == 'x')
-                return -1;
+                                return 1;
-        }
+                        return -1;
-        pid_le32 = svstatus.pid_le32;
+                }
-        switch (*a) {
+                pid_le32 = svstatus.pid_le32;
-        case 'x':
+                switch (*a) {
-                return 0;
+                case 'x':
-        case 'u':
-                if (!pid_le32 || svstatus.run_or_finish != 1) return 0;
-                if (!checkscript()) return 0;
-                break;
-        case 'd':
-                if (pid_le32) return 0;
-                break;
-        case 'c':
-                if (pid_le32 && !checkscript()) return 0;
-                break;
-        case 't':
-                if (!pid_le32 && svstatus.want == 'd') break;
-                timestamp = SWAP_BE64(svstatus.time_be64);
-                if ((tstart > timestamp) || !pid_le32 || svstatus.got_term || !checkscript())
-                        return 0;
-                break;
-        case 'o':
-                timestamp = SWAP_BE64(svstatus.time_be64);
-                if ((!pid_le32 && tstart > timestamp) || (pid_le32 && svstatus.want != 'd'))
                        return 0;
+                case 'u':
+                        if (!pid_le32 || svstatus.run_or_finish != 1)
+                                return 0;
+                        if (!checkscript())
+                                return 0;
+                        break;
+                case 'd':
+                        if (pid_le32 || svstatus.run_or_finish != 0)
+                                return 0;
+                        break;
+                case 'C':
+                        if (pid_le32 && !checkscript())
+                                return 0;
+                        break;
+                case 't':
+                case 'k':
+                        if (!pid_le32 && svstatus.want == 'd')
+                                break;
+                        timestamp = SWAP_BE64(svstatus.time_be64);
+                        if ((tstart > timestamp) || !pid_le32 || svstatus.got_term || !checkscript())
+                                return 0;
+                        break;
+                case 'o':
+                        timestamp = SWAP_BE64(svstatus.time_be64);
+                        if ((!pid_le32 && tstart > timestamp) || (pid_le32 && svstatus.want != 'd'))
+                                return 0;
+                        break;
+                case 'p':
+                        if (pid_le32 && !svstatus.paused)
+                                return 0;
+                        break;
+                case 'c':
+                        if (pid_le32 && svstatus.paused)
+                                return 0;
+                        break;
+                }
+                ++a;
        }
        printf(OK);
        svstatus_print(*service);
@@ -419,14 +444,10 @@ static int control(const char *a)
 {
        int fd, r, l;
-/* Is it an optimization?
-   It causes problems with "sv o SRV; ...; sv d SRV"
-   ('d' is not passed to SRV because its .want == 'd'):
        if (svstatus_get() <= 0)
                return -1;
-        if (svstatus.want == *a)
+        if (svstatus.want == *a && (*a != 'd' || svstatus.got_term == 1))
                return 0;
-*/
        fd = open("supervise/control", O_WRONLY|O_NDELAY);
        if (fd == -1) {
                if (errno != ENODEV)
@@ -516,17 +537,23 @@ static int sv(char **argv)
                acts = "tc";
                kll = 1;
                break;
+        case 't':
+                if (str_equal(action, "try-restart")) {
+                        acts = "tc";
+                        break;
+                }
        case 'c':
                if (str_equal(action, "check")) {
                        act = NULL;
-                        acts = "c";
+                        acts = "C";
                        break;
                }
-        case 'u': case 'd': case 'o': case 't': case 'p': case 'h':
+        case 'u': case 'd': case 'o': case 'p': case 'h':
        case 'a': case 'i': case 'k': case 'q': case '1': case '2':
                action[1] = '\0';
                acts = action;
-                if (!verbose) cbk = NULL;
+                if (!verbose)
+                        cbk = NULL;
                break;
        case 's':
                if (str_equal(action, "shutdown")) {
@@ -550,6 +577,10 @@ static int sv(char **argv)
                        acts = "tcu";
                        break;
                }
+                if (str_equal(action, "reload")) {
+                        acts = "h";
+                        break;
+                }
                bb_show_usage();
        case 'f':
                if (str_equal(action, "force-reload")) {
@@ -578,7 +609,9 @@ static int sv(char **argv)
        service = argv;
        while ((x = *service) != NULL) {
-                if (x[0] != '/' && x[0] != '.') {
+                if (x[0] != '/' && x[0] != '.'
+                 && x[0] != '\0' && x[strlen(x) - 1] != '/'
+                ) {
                        if (chdir(varservice) == -1)
                                goto chdir_failed_0;
                }
@@ -688,12 +721,7 @@ int svc_main(int argc UNUSED_PARAM, char **argv)
        /* getopt32() was already called:
         * reset the libc getopt() function, which keeps internal state.
         */
-#ifdef __GLIBC__
+        GETOPT_RESET();
-        optind = 0;
-#else /* BSD style */
-        optind = 1;
-        /* optreset = 1; */
-#endif
        do {
                if (opts & 1) {
diff --git a/runit/svlogd.c b/runit/svlogd.c
index 3ed13b67b..795bf48bb 100644
--- a/runit/svlogd.c
+++ b/runit/svlogd.c
@@ -137,9 +137,9 @@ log message, you can use a pattern like this instead
 //kbuild:lib-$(CONFIG_SVLOGD) += svlogd.o
 //usage:#define svlogd_trivial_usage
-//usage:       "[-ttv] [-r C] [-R CHARS] [-l MATCHLEN] [-b BUFLEN] DIR..."
+//usage:       "[-tttv] [-r C] [-R CHARS] [-l MATCHLEN] [-b BUFLEN] DIR..."
 //usage:#define svlogd_full_usage "\n\n"
-//usage:       "Continuously read log data from stdin and write to rotated log files in DIRs"
+//usage:       "Read log data from stdin and write to rotated log files in DIRs"
 //usage:   "\n"
 //usage:   "\n""DIR/config file modifies behavior:"
 //usage:   "\n""sSIZE - when to rotate logs"
@@ -339,17 +339,18 @@ static unsigned pmatch(const char *p, const char *s, unsigned len)
 /*** ex fmt_ptime.[ch] ***/
 /* NUL terminated */
-static void fmt_time_human_30nul(char *s)
+static void fmt_time_human_30nul(char *s, char dt_delim)
 {
        struct tm *ptm;
        struct timeval tv;
        gettimeofday(&tv, NULL);
        ptm = gmtime(&tv.tv_sec);
-        sprintf(s, "%04u-%02u-%02u_%02u:%02u:%02u.%06u000",
+        sprintf(s, "%04u-%02u-%02u%c%02u:%02u:%02u.%06u000",
                (unsigned)(1900 + ptm->tm_year),
                (unsigned)(ptm->tm_mon + 1),
                (unsigned)(ptm->tm_mday),
+                dt_delim,
                (unsigned)(ptm->tm_hour),
                (unsigned)(ptm->tm_min),
                (unsigned)(ptm->tm_sec),
@@ -1160,8 +1161,8 @@ int svlogd_main(int argc, char **argv)
                if (timestamp) {
                        if (timestamp == 1)
                                fmt_time_bernstein_25(stamp);
-                        else /* 2: */
+                        else /* 2+: */
-                                fmt_time_human_30nul(stamp);
+                                fmt_time_human_30nul(stamp, timestamp == 2 ? '_' : 'T');
                        printlen += 26;
                        printptr -= 26;
                        memcpy(printptr, stamp, 25);
diff --git a/shell/ash.c b/shell/ash.c
index 0325a325c..bdbcd6987 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -3554,11 +3554,9 @@ unaliascmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 {
        int i;
-        while ((i = nextopt("a")) != '\0') {
+        while (nextopt("a") != '\0') {
-                if (i == 'a') {
+                rmaliases();
-                        rmaliases();
+                return 0;
-                        return 0;
-                }
        }
        for (i = 0; *argptr; argptr++) {
                if (unalias(*argptr)) {
@@ -4069,7 +4067,7 @@ setjobctl(int on)
                }
                /* fd is a tty at this point */
                fd = fcntl(fd, F_DUPFD, 10);
-                if (ofd >= 0) /* if it is "/dev/tty", close. If 0/1/2, dont */
+                if (ofd >= 0) /* if it is "/dev/tty", close. If 0/1/2, don't */
                        close(ofd);
                if (fd < 0)
                        goto out; /* F_DUPFD failed */
@@ -6692,7 +6690,7 @@ static char *evalvar(char *p, int flags, struct strlist *var_str_list);
 * $@ like $* since no splitting will be performed.
 *
 * var_str_list (can be NULL) is a list of "VAR=val" strings which take precedence
- * over shell varables. Needed for "A=a B=$A; echo $B" case - we use it
+ * over shell variables. Needed for "A=a B=$A; echo $B" case - we use it
 * for correct expansion of "B=$A" word.
 */
 static void
@@ -6902,8 +6900,8 @@ scanright(char *startp, char *rmesc, char *rmescend,
                if (try2optimize) {
                        /* Maybe we can optimize this:
                         * if pattern ends with unescaped *, we can avoid checking
-                         * shorter strings: if "foo*" doesnt match "raw_value_of_v",
+                         * shorter strings: if "foo*" doesn't match "raw_value_of_v",
-                         * it wont match truncated "raw_value_of_" strings too.
+                         * it won't match truncated "raw_value_of_" strings too.
                         */
                        unsigned plen = strlen(pattern);
                        /* Does it end with "*"? */
@@ -7630,7 +7628,7 @@ expandmeta(struct strlist *str /*, int flag*/)
 // Which means you need to unescape the string, right? Not so fast:
 // if there _is_ a file named "file\?" (with backslash), it is returned
 // as "file\?" too (whichever pattern you used to find it, say, "file*").
-// You DONT KNOW by looking at the result whether you need to unescape it.
+// You DON'T KNOW by looking at the result whether you need to unescape it.
 //
 // Worse, globbing of "file\?" in a directory with two files, "file?" and "file\?",
 // returns "file\?" - which is WRONG: "file\?" pattern matches "file?" file.
@@ -8124,9 +8122,8 @@ tryexec(IF_FEATURE_SH_STANDALONE(int applet_no,) char *cmd, char **argv, char **
 * have to change the find_command routine as well.
 * argv[-1] must exist and be writable! See tryexec() for why.
 */
-static void shellexec(char **, const char *, int) NORETURN;
+static void shellexec(char *prog, char **argv, const char *path, int idx) NORETURN;
-static void
+static void shellexec(char *prog, char **argv, const char *path, int idx)
-shellexec(char **argv, const char *path, int idx)
 {
        char *cmdname;
        int e;
@@ -8135,12 +8132,12 @@ shellexec(char **argv, const char *path, int idx)
        int applet_no = -1; /* used only by FEATURE_SH_STANDALONE */
        envp = listvars(VEXPORT, VUNSET, /*end:*/ NULL);
-        if ((strchr(argv[0], '/') || (ENABLE_PLATFORM_MINGW32 && strchr(argv[0], '\\')))
+        if ((strchr(prog, '/') || (ENABLE_PLATFORM_MINGW32 && strchr(prog, '\\')))
 #if ENABLE_FEATURE_SH_STANDALONE
-         || (applet_no = find_applet_by_name(argv[0])) >= 0
+         || (applet_no = find_applet_by_name(prog)) >= 0
 #endif
        ) {
-                tryexec(IF_FEATURE_SH_STANDALONE(applet_no,) argv[0], argv, envp);
+                tryexec(IF_FEATURE_SH_STANDALONE(applet_no,) prog, argv, envp);
                if (applet_no >= 0) {
                        /* We tried execing ourself, but it didn't work.
                         * Maybe /proc/self/exe doesn't exist?
@@ -8157,7 +8154,7 @@ shellexec(char **argv, const char *path, int idx)
        } else {
 try_PATH:
                e = ENOENT;
-                while ((cmdname = path_advance(&path, argv[0])) != NULL) {
+                while ((cmdname = path_advance(&path, prog)) != NULL) {
                        if (--idx < 0 && pathopt == NULL) {
                                tryexec(IF_FEATURE_SH_STANDALONE(-1,) cmdname, argv, envp);
                                if (errno != ENOENT && errno != ENOTDIR)
@@ -8181,8 +8178,8 @@ shellexec(char **argv, const char *path, int idx)
        }
        exitstatus = exerrno;
        TRACE(("shellexec failed for %s, errno %d, suppress_int %d\n",
-                argv[0], e, suppress_int));
+                prog, e, suppress_int));
-        ash_msg_and_raise(EXEXIT, "%s: %s", argv[0], errmsg(e, "not found"));
+        ash_msg_and_raise(EXEXIT, "%s: %s", prog, errmsg(e, "not found"));
        /* NOTREACHED */
 }
@@ -8551,7 +8548,6 @@ static int
 describe_command(char *command, const char *path, int describe_command_verbose)
 {
        struct cmdentry entry;
-        struct tblentry *cmdp;
 #if ENABLE_ASH_ALIAS
        const struct alias *ap;
 #endif
@@ -8581,15 +8577,8 @@ describe_command(char *command, const char *path, int describe_command_verbose)
                goto out;
        }
 #endif
-        /* Then check if it is a tracked alias */
+        /* Brute force */
-        cmdp = cmdlookup(command, 0);
+        find_command(command, &entry, DO_ABS, path);
-        if (cmdp != NULL) {
-                entry.cmdtype = cmdp->cmdtype;
-                entry.u = cmdp->param;
-        } else {
-                /* Finally use brute force */
-                find_command(command, &entry, DO_ABS, path);
-        }
        switch (entry.cmdtype) {
        case CMDNORMAL: {
@@ -8604,9 +8593,7 @@ describe_command(char *command, const char *path, int describe_command_verbose)
                        } while (--j >= 0);
                }
                if (describe_command_verbose) {
-                        out1fmt(" is%s %s",
+                        out1fmt(" is %s", p);
-                                (cmdp ? " a tracked alias for" : nullstr), p
-                        );
                } else {
                        out1str(p);
                }
@@ -9814,7 +9801,14 @@ truecmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 static int FAST_FUNC
 execcmd(int argc UNUSED_PARAM, char **argv)
 {
-        if (argv[1]) {
+        optionarg = NULL;
+        while (nextopt("a:") != '\0')
+                /* nextopt() sets optionarg to "-a ARGV0" */;
+        argv = argptr;
+        if (argv[0]) {
+                char *prog;
                iflag = 0;              /* exit on error */
                mflag = 0;
                optschanged();
@@ -9830,7 +9824,10 @@ execcmd(int argc UNUSED_PARAM, char **argv)
                /*setsignal(SIGTSTP); - unnecessary because of mflag=0 */
                /*setsignal(SIGTTOU); - unnecessary because of mflag=0 */
-                shellexec(argv + 1, pathval(), 0);
+                prog = argv[0];
+                if (optionarg)
+                        argv[0] = optionarg;
+                shellexec(prog, argv, pathval(), 0);
                /* NOTREACHED */
        }
        return 0;
@@ -10255,7 +10252,7 @@ evalcommand(union node *cmd, int flags)
                }
 #endif
                listsetvar(varlist.list, VEXPORT|VSTACK);
-                shellexec(argv, path, cmdentry.u.index);
+                shellexec(argv[0], argv, path, cmdentry.u.index);
                /* NOTREACHED */
        } /* default */
        case CMDBUILTIN:
@@ -13605,7 +13602,7 @@ exportcmd(int argc UNUSED_PARAM, char **argv)
        }
        flag_off = ~flag_off;
-        /*if (opt_p_not_specified) - bash doesnt check this. Try "export -p NAME" */
+        /*if (opt_p_not_specified) - bash doesn't check this. Try "export -p NAME" */
        {
                aptr = argptr;
                name = *aptr;
@@ -13785,6 +13782,7 @@ readcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
        /* "read -s" needs to save/restore termios, can't allow ^C
         * to jump out of it.
         */
+ again:
        INT_OFF;
        r = shell_builtin_read(setvar0,
                argptr,
@@ -13797,6 +13795,12 @@ readcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
        );
        INT_ON;
+        if ((uintptr_t)r == 1 && errno == EINTR) {
+                /* to get SIGCHLD: sleep 1 & read x; echo $x */
+                if (pending_sig == 0)
+                        goto again;
+        }
        if ((uintptr_t)r > 1)
                ash_msg_and_raise_error(r);
@@ -14420,7 +14424,7 @@ forkshell_shellexec(struct forkshell *fs)
        char *path = fs->string;
        listsetvar(varlist, VEXPORT|VSTACK);
-        shellexec(argv, path, idx);
+        shellexec(argv[0], argv, path, idx);
 }
 static void
diff --git a/shell/ash_test/ash-misc/unicode1.tests b/shell/ash_test/ash-misc/unicode1.tests
index 8788ba910..b8479cb41 100755
--- a/shell/ash_test/ash-misc/unicode1.tests
+++ b/shell/ash_test/ash-misc/unicode1.tests
@@ -5,7 +5,7 @@ a=`printf "\xcc\x80"`
 # Should print 1
 echo ${#a}
-# A Japanese katakana charachter U+30a3
+# A Japanese katakana character U+30a3
 a=`printf "\xe3\x82\xa3"`
 # Should print 1
 echo ${#a}
diff --git a/shell/ash_test/ash-read/read_SIGCHLD.right b/shell/ash_test/ash-read/read_SIGCHLD.right
new file mode 100644
index 000000000..b3dc7ab0c
--- /dev/null
+++ b/shell/ash_test/ash-read/read_SIGCHLD.right
@@ -0,0 +1,2 @@
+x='Ok'
+exitcode:0
diff --git a/shell/ash_test/ash-read/read_SIGCHLD.tests b/shell/ash_test/ash-read/read_SIGCHLD.tests
new file mode 100755
index 000000000..c5f673aff
--- /dev/null
+++ b/shell/ash_test/ash-read/read_SIGCHLD.tests
@@ -0,0 +1,4 @@
+x=BAD
+{ sleep 0.4; echo Ok; } | { sleep 0.2 & read x; echo "x='$x'"; }
+echo "exitcode:$?"
diff --git a/shell/hush.c b/shell/hush.c
index 4123cc19e..125463a56 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -1908,7 +1908,7 @@ static int check_and_run_traps(void)
                        G.count_SIGCHLD++;
 //bb_error_msg("[%d] check_and_run_traps: G.count_SIGCHLD:%d G.handled_SIGCHLD:%d", getpid(), G.count_SIGCHLD, G.handled_SIGCHLD);
                        /* Note:
-                         * We dont do 'last_sig = sig' here -> NOT returning this sig.
+                         * We don't do 'last_sig = sig' here -> NOT returning this sig.
                         * This simplifies wait builtin a bit.
                         */
                        break;
@@ -1917,7 +1917,7 @@ static int check_and_run_traps(void)
                        debug_printf_exec("%s: sig:%d default handling is to ignore\n", __func__, sig);
                        /* SIGTERM, SIGQUIT, SIGTTIN, SIGTTOU, SIGTSTP */
                        /* Note:
-                         * We dont do 'last_sig = sig' here -> NOT returning this sig.
+                         * We don't do 'last_sig = sig' here -> NOT returning this sig.
                         * Example: wait is not interrupted by TERM
                         * in interactive shell, because TERM is ignored.
                         */
@@ -2280,7 +2280,7 @@ static void reinit_unicode_for_hush(void)
 *      AT\
 *      H\
 *      \
- * It excercises a lot of corner cases.
+ * It exercises a lot of corner cases.
 */
 static void cmdedit_update_prompt(void)
 {
@@ -5235,7 +5235,7 @@ static void o_addblock_duplicate_backslash(o_string *o, const char *str, int len
                        /* And now we want to add { or } and continue:
                         *  o_addchr(o, c);
                         *  continue;
-                         * luckily, just falling throught achieves this.
+                         * luckily, just falling through achieves this.
                         */
                }
 #endif
@@ -5830,7 +5830,7 @@ static NOINLINE int expand_vars_to_list(o_string *output, int n, char *arg)
                        arg++;
                        /* Can't just stuff it into output o_string,
                         * expanded result may need to be globbed
-                         * and $IFS-splitted */
+                         * and $IFS-split */
                        debug_printf_subst("SUBST '%s' first_ch %x\n", arg, first_ch);
                        G.last_exitcode = process_command_subs(&subst_result, arg);
                        debug_printf_subst("SUBST RES:%d '%s'\n", G.last_exitcode, subst_result.data);
@@ -7320,7 +7320,7 @@ static int process_wait_result(struct pipe *fg_pipe, pid_t childpid, int status)
                        /* There are still running processes in the fg_pipe */
                        return -1;
                }
-                /* It wasnt in fg_pipe, look for process in bg pipes */
+                /* It wasn't in fg_pipe, look for process in bg pipes */
        }
 #if ENABLE_HUSH_JOB
@@ -9038,6 +9038,9 @@ static int FAST_FUNC builtin_type(char **argv)
 * - terminates shell (regardless of interactivity);
 * if it has non-empty trap:
 * - executes trap and returns to read;
+ * SIGCHLD from children:
+ * - does not interrupt read regardless of interactivity:
+ *   try: sleep 1 & read x; echo $x
 */
 static int FAST_FUNC builtin_read(char **argv)
 {
@@ -9071,7 +9074,7 @@ static int FAST_FUNC builtin_read(char **argv)
        if ((uintptr_t)r == 1 && errno == EINTR) {
                unsigned sig = check_and_run_traps();
-                if (sig && sig != SIGINT)
+                if (sig != SIGINT)
                        goto again;
        }
diff --git a/shell/hush_test/hush-misc/unicode1.tests b/shell/hush_test/hush-misc/unicode1.tests
index 8788ba910..b8479cb41 100755
--- a/shell/hush_test/hush-misc/unicode1.tests
+++ b/shell/hush_test/hush-misc/unicode1.tests
@@ -5,7 +5,7 @@ a=`printf "\xcc\x80"`
 # Should print 1
 echo ${#a}
-# A Japanese katakana charachter U+30a3
+# A Japanese katakana character U+30a3
 a=`printf "\xe3\x82\xa3"`
 # Should print 1
 echo ${#a}
diff --git a/shell/hush_test/hush-read/read_SIGCHLD.right b/shell/hush_test/hush-read/read_SIGCHLD.right
new file mode 100644
index 000000000..b3dc7ab0c
--- /dev/null
+++ b/shell/hush_test/hush-read/read_SIGCHLD.right
@@ -0,0 +1,2 @@
+x='Ok'
+exitcode:0
diff --git a/shell/hush_test/hush-read/read_SIGCHLD.tests b/shell/hush_test/hush-read/read_SIGCHLD.tests
new file mode 100755
index 000000000..c5f673aff
--- /dev/null
+++ b/shell/hush_test/hush-read/read_SIGCHLD.tests
@@ -0,0 +1,4 @@
+x=BAD
+{ sleep 0.4; echo Ok; } | { sleep 0.2 & read x; echo "x='$x'"; }
+echo "exitcode:$?"
diff --git a/shell/shell_common.c b/shell/shell_common.c
index 653154e34..55617b167 100644
--- a/shell/shell_common.c
+++ b/shell/shell_common.c
@@ -210,15 +210,17 @@ shell_builtin_read(void FAST_FUNC (*setvar)(const char *name, const char *val),
                c = buffer[bufpos];
                if (c == '\0' || (ENABLE_PLATFORM_MINGW32 && c == '\r'))
                        continue;
-                if (backslash) {
+                if (!(read_flags & BUILTIN_READ_RAW)) {
-                        backslash = 0;
+                        if (backslash) {
-                        if (c != '\n')
+                                backslash = 0;
-                                goto put;
+                                if (c != '\n')
-                        continue;
+                                        goto put;
-                }
+                                continue;
-                if (!(read_flags & BUILTIN_READ_RAW) && c == '\\') {
+                        }
-                        backslash = 1;
+                        if (c == '\\') {
-                        continue;
+                                backslash = 1;
+                                continue;
+                        }
                }
                if (c == '\n')
                        break;
@@ -408,13 +410,7 @@ shell_builtin_ulimit(char **argv)
        /* In case getopt was already called:
         * reset the libc getopt() function, which keeps internal state.
         */
-#ifdef __GLIBC__
+        GETOPT_RESET();
-        optind = 0;
-#else /* BSD style */
-        optind = 1;
-        /* optreset = 1; */
-#endif
-        /* optarg = NULL; opterr = 0; optopt = 0; - do we need this?? */
        argc = 1;
        while (argv[argc])
diff --git a/sysklogd/logread.c b/sysklogd/logread.c
index 1f0c6252d..71459941e 100644
--- a/sysklogd/logread.c
+++ b/sysklogd/logread.c
@@ -24,7 +24,7 @@
 //config:       default y
 //config:       depends on LOGREAD
 //config:       help
-//config:         'logread' ouput to slow serial terminals can have
+//config:         'logread' output to slow serial terminals can have
 //config:         side effects on syslog because of the semaphore.
 //config:         This option make logread to double buffer copy
 //config:         from circular buffer, minimizing semaphore
@@ -159,7 +159,7 @@ int logread_main(int argc UNUSED_PARAM, char **argv)
                                        cur, shbuf_tail, shbuf_size);
                if (!(follow & 1)) { /* not -f */
-                        /* if -F, "convert" it to -f, so that we dont
+                        /* if -F, "convert" it to -f, so that we don't
                         * dump the entire buffer on each iteration
                         */
                        follow >>= 1;
diff --git a/testsuite/factor.tests b/testsuite/factor.tests
new file mode 100755
index 000000000..2cf4a54ce
--- /dev/null
+++ b/testsuite/factor.tests
@@ -0,0 +1,48 @@
+#!/bin/sh
+# Copyright 2017 by Denys Vlasenko <vda.linux@googlemail.com>
+# Licensed under GPLv2, see file LICENSE in this source tree.
+. ./testing.sh
+# testing "test name" "command" "expected result" "file input" "stdin"
+#   file input will be file called "input"
+#   test can create a file "actual" instead of writing to stdout
+testing "factor '  0'" \
+        "factor '  0'" \
+        "0:\n" \
+        "" ""
+testing "factor +1" \
+        "factor +1" \
+        "1:\n" \
+        "" ""
+testing "factor ' +2'" \
+        "factor ' +2'" \
+        "2: 2\n" \
+        "" ""
+testing "factor 1024" \
+        "factor 1024" \
+        "1024: 2 2 2 2 2 2 2 2 2 2\n" \
+        "" ""
+testing "factor 2^61-1" \
+        "factor 2305843009213693951" \
+        "2305843009213693951: 2305843009213693951\n" \
+        "" ""
+testing "factor 2^62-1" \
+        "factor 4611686018427387903" \
+        "4611686018427387903: 3 715827883 2147483647\n" \
+        "" ""
+testing "factor 2^64-1" \
+        "factor 18446744073709551615" \
+        "18446744073709551615: 3 5 17 257 641 65537 6700417\n" \
+        "" ""
+# This is a 60-bit number (0x888 86ff db34 4692): first few primes multiplied together:
+testing "factor \$((2*3*5*7*11*13*17*19*23*29*31*37*41*43*47))" \
+        "factor \$((2*3*5*7*11*13*17*19*23*29*31*37*41*43*47))" \
+        "614889782588491410: 2 3 5 7 11 13 17 19 23 29 31 37 41 43 47\n" \
+        "" ""
+exit $FAILCOUNT
diff --git a/testsuite/paste/paste b/testsuite/paste/paste
new file mode 100644
index 000000000..349b49d49
--- /dev/null
+++ b/testsuite/paste/paste
@@ -0,0 +1,20 @@
+cat > foo <<EOF
+foo1
+foo2
+foo3
+EOF
+cat > bar <<EOF
+bar1
+bar2
+bar3
+EOF
+cat > baz <<EOF
+foo1    bar1
+foo2    bar2
+foo3    bar3
+EOF
+busybox paste foo bar > qux
+diff -u baz qux
diff --git a/testsuite/paste/paste-back-cuted-lines b/testsuite/paste/paste-back-cuted-lines
new file mode 100644
index 000000000..a8171bf1e
--- /dev/null
+++ b/testsuite/paste/paste-back-cuted-lines
@@ -0,0 +1,9 @@
+cat > foo <<EOF
+this is the first line
+this is the second line
+this is the third line
+EOF
+cut -b 1-13 -n foo > foo1
+cut -b 14- -n foo > foo2
+busybox paste -d '\0' foo1 foo2 > bar
+cmp foo bar
diff --git a/testsuite/paste/paste-multi-stdin b/testsuite/paste/paste-multi-stdin
new file mode 100644
index 000000000..fee543058
--- /dev/null
+++ b/testsuite/paste/paste-multi-stdin
@@ -0,0 +1,16 @@
+cat > foo <<EOF
+line1
+line2
+line3
+line4
+line5
+line6
+EOF
+cat > bar <<EOF
+line1   line2   line3
+line4   line5   line6
+EOF
+busybox paste - - - < foo > baz
+cmp bar baz
diff --git a/testsuite/paste/paste-pairs b/testsuite/paste/paste-pairs
new file mode 100644
index 000000000..90725fa87
--- /dev/null
+++ b/testsuite/paste/paste-pairs
@@ -0,0 +1,16 @@
+cat > foo <<EOF
+foo1
+bar1
+foo2
+bar2
+foo3
+EOF
+cat > bar <<EOF
+foo1    bar1
+foo2    bar2
+foo3
+EOF
+busybox paste -s -d "\t\n" foo > baz
+cmp bar baz
diff --git a/testsuite/paste/paste-separate b/testsuite/paste/paste-separate
new file mode 100644
index 000000000..40793fb31
--- /dev/null
+++ b/testsuite/paste/paste-separate
@@ -0,0 +1,19 @@
+cat > foo <<EOF
+foo1
+foo2
+foo3
+EOF
+cat > bar <<EOF
+bar1
+bar2
+bar3
+EOF
+cat > baz <<EOF
+foo1    foo2    foo3
+bar1    bar2    bar3
+EOF
+busybox paste -s foo bar > qux
+cmp baz qux
diff --git a/testsuite/readlink.tests b/testsuite/readlink.tests
index e9d8da0fc..27b52f6c4 100755
--- a/testsuite/readlink.tests
+++ b/testsuite/readlink.tests
@@ -29,7 +29,7 @@ pwd=`$pwd`
 testing "readlink -f on a file" "readlink -f ./$TESTFILE" "$pwd/$TESTFILE\n" "" ""
 testing "readlink -f on a link" "readlink -f ./$TESTLINK" "$pwd/$TESTFILE\n" "" ""
 testing "readlink -f on an invalid link" "readlink -f ./$FAILLINK" "" "" ""
-testing "readlink -f on a wierd dir" "readlink -f $TESTDIR/../$TESTFILE" "$pwd/$TESTFILE\n" "" ""
+testing "readlink -f on a weird dir" "readlink -f $TESTDIR/../$TESTFILE" "$pwd/$TESTFILE\n" "" ""
 # clean up
diff --git a/coreutils/cal.c b/util-linux/cal.c
index af02608f0..8196619b0 100644
--- a/coreutils/cal.c
+++ b/util-linux/cal.c
@@ -35,7 +35,7 @@
 #include "libbb.h"
 #include "unicode.h"
-/* We often use "unsigned" intead of "int", it's easier to div on most CPUs */
+/* We often use "unsigned" instead of "int", it's easier to div on most CPUs */
 #define THURSDAY                4               /* for reformation */
 #define SATURDAY                6               /* 1 Jan 1 was a Saturday */
diff --git a/miscutils/chrt.c b/util-linux/chrt.c
index 1604a6890..1604a6890 100644
--- a/miscutils/chrt.c
+++ b/util-linux/chrt.c
diff --git a/miscutils/eject.c b/util-linux/eject.c
index 667932f6c..667932f6c 100644
--- a/miscutils/eject.c
+++ b/util-linux/eject.c
diff --git a/util-linux/fallocate.c b/util-linux/fallocate.c
new file mode 100644
index 000000000..1cd851bde
--- /dev/null
+++ b/util-linux/fallocate.c
@@ -0,0 +1,104 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Copyright (C) 2017 Denys Vlasenko <vda.linux@googlemail.com>
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
+ */
+//config:config FALLOCATE
+//config:       bool "fallocate"
+//config:       default y
+//config:       help
+//config:         Preallocate space for files.
+//applet:IF_FALLOCATE(APPLET(fallocate, BB_DIR_USR_BIN, BB_SUID_DROP))
+//kbuild:lib-$(CONFIG_FALLOCATE) += fallocate.o
+//usage:#define fallocate_trivial_usage
+//usage:       "[-o OFS] -l LEN FILE"
+//              fallocate [-c|-p|-z] [-n] [-o OFS] -l LEN FILE
+//              fallocate -d [-o OFS] [-l LEN] FILE
+//usage:#define fallocate_full_usage "\n\n"
+//usage:        "Preallocate space for FILE\n"
+//           "\n        -c      Remove range"
+//           "\n        -p      Make hole"
+//           "\n        -z      Zero and allocate range"
+//           "\n        -d      Convert zeros to holes"
+//           "\n        -n      Keep size"
+//usage:     "\n        -o OFS  Offset of range"
+//usage:     "\n        -l LEN  Length of range"
+//Upstream options:
+//The options --collapse-range, --dig-holes, --punch-hole and --zero-range
+//are mutually exclusive.
+//-c, --collapse-range
+//    Removes a byte range from a file, without leaving a hole. The byte range
+//    to be collapsed starts at offset and continues for length bytes.
+//    At the completion of the operation, the contents of the file starting
+//    at the location offset+length will be appended at the location offset,
+//    and the file will be length bytes smaller. The option --keep-size may
+//    not be specified for the collapse-range operation.
+//-d, --dig-holes
+//    Detect and dig holes. This makes the file sparse in-place, without using
+//    extra disk space. The minimum size of the hole depends on filesystem I/O
+//    block size (usually 4096 bytes). Also,
+//-l, --length length
+//    Specifies the length of the range, in bytes.
+//-n, --keep-size
+//    Do not modify the apparent length of the file. This may effectively
+//    allocate blocks past EOF, which can be removed with a truncate.
+//-o, --offset offset
+//    Specifies the beginning offset of the range, in bytes.
+//-p, --punch-hole
+//    Deallocates space (i.e., creates a hole) in the byte range starting
+//    at offset and continuing for length bytes. Within the specified range,
+//    partial filesystem blocks are zeroed, and whole
+//    filesystem blocks are removed from the file. After a successful call,
+//    subsequent reads from this range will return zeroes. This option may not
+//    be specified at the same time as the
+//    --zero-range option. Also, when using this option, --keep-size is implied.
+//-z, --zero-range
+//    Zeroes space in the byte range starting at offset and continuing for
+//    length bytes. Within the specified range, blocks are preallocated for
+//    the regions that span the holes in the file. After
+//    a successful call, subsequent reads from this range will return zeroes.
+//    Zeroing is done within the filesystem preferably by converting the range
+//    into unwritten extents. This approach means that the specified range
+//    will not be physically zeroed out on the device (except for partial
+//    blocks at the either end of the range), and I/O is (otherwise) required
+//    only to update metadata.
+//    Option --keep-size can be specified to prevent file length modification.
+#include "libbb.h"
+int fallocate_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int fallocate_main(int argc UNUSED_PARAM, char **argv)
+{
+        const char *str_l;
+        const char *str_o = "0";
+        off_t ofs, len;
+        unsigned opts;
+        int fd;
+        /* exactly one non-option arg */
+        opt_complementary = "=1";
+        opts = getopt32(argv, "l:o:", &str_l, &str_o);
+        if (!(opts & 1))
+                bb_show_usage();
+        ofs = xatoull_sfx(str_o, kmg_i_suffixes);
+        len = xatoull_sfx(str_l, kmg_i_suffixes);
+        argv += optind;
+        fd = xopen3(*argv, O_RDWR | O_CREAT, 0666);
+        /* posix_fallocate has unusual method of returning error */
+        /* maybe use Linux-specific fallocate(int fd, int mode, off_t offset, off_t len) instead? */
+        if ((errno = posix_fallocate(fd, ofs, len)) != 0)
+                bb_perror_msg_and_die("fallocate '%s'", *argv);
+        /* util-linux also performs fsync(fd); */
+        return EXIT_SUCCESS;
+}
diff --git a/util-linux/fsfreeze.c b/util-linux/fsfreeze.c
new file mode 100644
index 000000000..70dec24ec
--- /dev/null
+++ b/util-linux/fsfreeze.c
@@ -0,0 +1,54 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Copyright (C) 2017 Denys Vlasenko <vda.linux@googlemail.com>
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
+ */
+//config:config FSFREEZE
+//config:       bool "fsfreeze"
+//config:       default y
+//config:       select PLATFORM_LINUX
+//config:       select LONG_OPTS
+//config:       help
+//config:         Halt new accesses and flush writes on a mounted filesystem.
+//applet:IF_FSFREEZE(APPLET(fsfreeze, BB_DIR_USR_SBIN, BB_SUID_DROP))
+//kbuild:lib-$(CONFIG_FSFREEZE) += fsfreeze.o
+//usage:#define fsfreeze_trivial_usage
+//usage:       "--[un]freeze MOUNTPOINT"
+//usage:#define fsfreeze_full_usage "\n\n"
+//usage:        "Flush and halt writes to MOUNTPOINT"
+#include "libbb.h"
+#include <linux/fs.h>
+#ifndef FIFREEZE
+# define FIFREEZE _IOWR('X', 119, int)
+# define FITHAW   _IOWR('X', 120, int)
+#endif
+int fsfreeze_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int fsfreeze_main(int argc UNUSED_PARAM, char **argv)
+{
+        unsigned opts;
+        int fd;
+        applet_long_options =
+                "freeze\0"   No_argument "\xff"
+                "unfreeze\0" No_argument "\xfe"
+        ;
+        /* exactly one non-option arg: the mountpoint */
+        /* one of opts is required */
+        /* opts are mutually exclusive */
+        opt_complementary = "=1:""\xff:\xfe:""\xff--\xfe:\xfe--\xff";
+        opts = getopt32(argv, "");
+        fd = xopen(argv[optind], O_RDONLY);
+        /* Works with NULL arg on linux-4.8.0 */
+        xioctl(fd, (opts & 1) ? FIFREEZE : FITHAW, NULL);
+        return EXIT_SUCCESS;
+}
diff --git a/util-linux/getopt.c b/util-linux/getopt.c
index 63294c520..79d54854b 100644
--- a/util-linux/getopt.c
+++ b/util-linux/getopt.c
@@ -246,12 +246,7 @@ static int generate_output(char **argv, int argc, const char *optstr, const stru
        /* We used it already in main() in getopt32(),
         * we *must* reset getopt(3): */
-#ifdef __GLIBC__
+        GETOPT_RESET();
-        optind = 0;
-#else /* BSD style */
-        optind = 1;
-        /* optreset = 1; */
-#endif
        while (1) {
 #if ENABLE_FEATURE_GETOPT_LONG
diff --git a/util-linux/hwclock.c b/util-linux/hwclock.c
index d65011a71..8cb908cb3 100644
--- a/util-linux/hwclock.c
+++ b/util-linux/hwclock.c
@@ -167,7 +167,7 @@ static void from_sys_clock(const char **pp_rtcname, int utc)
 * On x86, even though code does set hw clock within <1ms of exact
 * whole seconds, apparently hw clock (at least on some machines)
 * doesn't reset internal fractional seconds to 0,
- * making all this a pointless excercise.
+ * making all this a pointless exercise.
 */
        /* If we see that we are N usec away from whole second,
         * we'll sleep for N-ADJ usecs. ADJ corrects for the fact
diff --git a/miscutils/ionice.c b/util-linux/ionice.c
index c54b3a6e1..c54b3a6e1 100644
--- a/miscutils/ionice.c
+++ b/util-linux/ionice.c
diff --git a/miscutils/last.c b/util-linux/last.c
index b3f125c3f..b3f125c3f 100644
--- a/miscutils/last.c
+++ b/util-linux/last.c
diff --git a/miscutils/last_fancy.c b/util-linux/last_fancy.c
index e56e0ba85..e56e0ba85 100644
--- a/miscutils/last_fancy.c
+++ b/util-linux/last_fancy.c
diff --git a/util-linux/losetup.c b/util-linux/losetup.c
index 4424d9cbb..d356f49c2 100644
--- a/util-linux/losetup.c
+++ b/util-linux/losetup.c
@@ -127,12 +127,37 @@ int losetup_main(int argc UNUSED_PARAM, char **argv)
                        d = *argv++;
                if (argv[0]) {
-                        if (set_loop(&d, argv[0], offset, (opt & OPT_r)) < 0)
+                        if (set_loop(&d, argv[0], offset, (opt & OPT_r) ? BB_LO_FLAGS_READ_ONLY : 0) < 0)
                                bb_simple_perror_msg_and_die(argv[0]);
                        return EXIT_SUCCESS;
                }
        }
+        /* TODO: util-linux 2.28 shows this when run w/o params:
+         * NAME       SIZELIMIT OFFSET AUTOCLEAR RO BACK-FILE     DIO
+         * /dev/loop0         0      0         1  0 /PATH/TO/FILE   0
+         *
+         * implemented by reading /sys:
+         *
+         * open("/sys/block", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = 3
+         * newfstatat(3, "loop0/loop/backing_file", {st_mode=S_IFREG|0444, st_size=4096, ...}, 0) = 0
+         * stat("/dev/loop0", {st_mode=S_IFBLK|0660, st_rdev=makedev(7, 0), ...}) = 0
+         * open("/sys/dev/block/7:0/loop/offset", O_RDONLY|O_CLOEXEC) = 5
+         * read(5, "0\n", 4096)                    = 2
+         * open("/sys/dev/block/7:0/loop/sizelimit", O_RDONLY|O_CLOEXEC) = 5
+         * read(5, "0\n", 4096)                    = 2
+         * open("/sys/dev/block/7:0/loop/offset", O_RDONLY|O_CLOEXEC) = 5
+         * read(5, "0\n", 4096)                    = 2
+         * open("/sys/dev/block/7:0/loop/autoclear", O_RDONLY|O_CLOEXEC) = 5
+         * read(5, "1\n", 4096)                    = 2
+         * open("/sys/dev/block/7:0/ro", O_RDONLY|O_CLOEXEC)     = 5
+         * read(5, "0\n", 4096)                    = 2
+         * open("/sys/dev/block/7:0/loop/backing_file", O_RDONLY|O_CLOEXEC) = 5
+         * read(5, "/PATH/TO/FILE", 4096) = 37
+         * open("/sys/dev/block/7:0/loop/dio", O_RDONLY|O_CLOEXEC) = 5
+         * read(5, "0\n", 4096)                    = 2
+         */
        bb_show_usage(); /* does not return */
        /*return EXIT_FAILURE;*/
 }
diff --git a/init/mesg.c b/util-linux/mesg.c
index 45c13b8e0..45c13b8e0 100644
--- a/init/mesg.c
+++ b/util-linux/mesg.c
diff --git a/util-linux/mount.c b/util-linux/mount.c
index f0245f714..6bb18524d 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -1887,6 +1887,7 @@ static int nfsmount(struct mntent *mp, unsigned long vfsflags, char *filteropts)
 // NB: mp->xxx fields may be trashed on exit
 static int singlemount(struct mntent *mp, int ignore_busy)
 {
+        int loopfd = -1;
        int rc = -1;
        unsigned long vfsflags;
        char *loopFile = NULL, *filteropts = NULL;
@@ -2026,7 +2027,20 @@ static int singlemount(struct mntent *mp, int ignore_busy)
                if (ENABLE_FEATURE_MOUNT_LOOP && S_ISREG(st.st_mode)) {
                        loopFile = bb_simplify_path(mp->mnt_fsname);
                        mp->mnt_fsname = NULL; // will receive malloced loop dev name
-                        if (set_loop(&mp->mnt_fsname, loopFile, 0, /*ro:*/ (vfsflags & MS_RDONLY)) < 0) {
+                        // mount always creates AUTOCLEARed loopdevs, so that umounting
+                        // drops them without any code in the userspace.
+                        // This happens since circa linux-2.6.25:
+                        // commit 96c5865559cee0f9cbc5173f3c949f6ce3525581
+                        // Date:    Wed Feb 6 01:36:27 2008 -0800
+                        // Subject: Allow auto-destruction of loop devices
+                        loopfd = set_loop(&mp->mnt_fsname,
+                                        loopFile,
+                                        0,
+                                        ((vfsflags & MS_RDONLY) ? BB_LO_FLAGS_READ_ONLY : 0)
+                                                | BB_LO_FLAGS_AUTOCLEAR
+                        );
+                        if (loopfd < 0) {
                                if (errno == EPERM || errno == EACCES)
                                        bb_error_msg(bb_msg_perm_denied_are_you_root);
                                else
@@ -2074,6 +2088,8 @@ static int singlemount(struct mntent *mp, int ignore_busy)
        }
        // If mount failed, clean up loop file (if any).
+        // (Newer kernels which support LO_FLAGS_AUTOCLEAR should not need this,
+        // merely "close(loopfd)" should do it?)
        if (ENABLE_FEATURE_MOUNT_LOOP && rc && loopFile) {
                del_loop(mp->mnt_fsname);
                if (ENABLE_FEATURE_CLEAN_UP) {
@@ -2086,6 +2102,9 @@ static int singlemount(struct mntent *mp, int ignore_busy)
        if (ENABLE_FEATURE_CLEAN_UP)
                free(filteropts);
+        if (loopfd >= 0)
+                close(loopfd);
        if (errno == EBUSY && ignore_busy)
                return 0;
        if (errno == ENOENT && (vfsflags & MOUNT_NOFAIL))
diff --git a/miscutils/mountpoint.c b/util-linux/mountpoint.c
index 8b9e1d779..8b9e1d779 100644
--- a/miscutils/mountpoint.c
+++ b/util-linux/mountpoint.c
diff --git a/procps/renice.c b/util-linux/renice.c
index 64213c680..4da3394a8 100644
--- a/procps/renice.c
+++ b/util-linux/renice.c
@@ -141,7 +141,7 @@ int renice_main(int argc UNUSED_PARAM, char **argv)
                retval = EXIT_FAILURE;
        }
-        /* No need to check for errors outputing to stderr since, if it
+        /* No need to check for errors outputting to stderr since, if it
         * was used, the HAD_ERROR label was reached and retval was set. */
        return retval;
diff --git a/miscutils/setsid.c b/util-linux/setsid.c
index 143a8f8fa..143a8f8fa 100644
--- a/miscutils/setsid.c
+++ b/util-linux/setsid.c
diff --git a/util-linux/switch_root.c b/util-linux/switch_root.c
index 6034485d7..f18e8a5ce 100644
--- a/util-linux/switch_root.c
+++ b/util-linux/switch_root.c
@@ -141,10 +141,12 @@ int switch_root_main(int argc UNUSED_PARAM, char **argv)
        // If a new console specified, redirect stdin/stdout/stderr to it
        if (console) {
-                close(0);
+                int fd = open_or_warn(console, O_RDWR);
-                xopen(console, O_RDWR);
+                if (fd >= 0) {
-                xdup2(0, 1);
+                        xmove_fd(fd, 0);
-                xdup2(0, 2);
+                        xdup2(0, 1);
+                        xdup2(0, 2);
+                }
        }
        // Exec real init
@@ -181,7 +183,7 @@ So there's a step that needs to be sort of atomic but can't be as a shell
 script.  (You can work around this with static linking or very carefully laid
 out paths and sequencing, but it's brittle, ugly, and non-obvious.)
-2) The "find | rm" bit will acually delete everything because the mount points
+2) The "find | rm" bit will actually delete everything because the mount points
 still show up (even if their contents don't), and rm -rf will then happily zap
 that.  So the first line is an oversimplification of what you need to do _not_
 to descend into other filesystems and delete their contents.
diff --git a/miscutils/taskset.c b/util-linux/taskset.c
index 94a07383a..94a07383a 100644
--- a/miscutils/taskset.c
+++ b/util-linux/taskset.c
diff --git a/util-linux/umount.c b/util-linux/umount.c
index c958fd552..0c50dc9ee 100644
--- a/util-linux/umount.c
+++ b/util-linux/umount.c
@@ -42,7 +42,7 @@
 //usage:     "\n        -l      Lazy umount (detach filesystem)"
 //usage:     "\n        -f      Force umount (i.e., unreachable NFS server)"
 //usage:        IF_FEATURE_MOUNT_LOOP(
-//usage:     "\n        -D      Don't free loop device even if it has been used"
+//usage:     "\n        -d      Free loop device if it has been used"
 //usage:        )
 //usage:
 //usage:#define umount_example_usage
@@ -68,22 +68,14 @@ static struct mntent *getmntent_r(FILE* stream, struct mntent* result,
 }
 #endif
-/* Ignored: -v -t -i
+/* ignored: -v -t -i */
- * bbox always acts as if -d is present.
+#define OPTION_STRING           "fldnra" "vt:i"
- * -D can be used to suppress it (bbox extension).
- * Rationale:
- * (1) util-linux's umount does it if "loop=..." is seen in /etc/mtab:
- * thus, on many systems, bare umount _does_ drop loop devices.
- * (2) many users request this feature.
- */
-#define OPTION_STRING           "fldDnra" "vt:i"
 #define OPT_FORCE               (1 << 0) // Same as MNT_FORCE
 #define OPT_LAZY                (1 << 1) // Same as MNT_DETACH
-//#define OPT_FREE_LOOP           (1 << 2) // -d is assumed always present
+#define OPT_FREELOOP            (1 << 2)
-#define OPT_DONT_FREE_LOOP      (1 << 3)
+#define OPT_NO_MTAB             (1 << 3)
-#define OPT_NO_MTAB             (1 << 4)
+#define OPT_REMOUNT             (1 << 4)
-#define OPT_REMOUNT             (1 << 5)
+#define OPT_ALL                 (ENABLE_FEATURE_UMOUNT_ALL ? (1 << 5) : 0)
-#define OPT_ALL                 (ENABLE_FEATURE_UMOUNT_ALL ? (1 << 6) : 0)
 int umount_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int umount_main(int argc UNUSED_PARAM, char **argv)
@@ -206,7 +198,7 @@ int umount_main(int argc UNUSED_PARAM, char **argv)
                } else {
                        // De-allocate the loop device.  This ioctl should be ignored on
                        // any non-loop block devices.
-                        if (ENABLE_FEATURE_MOUNT_LOOP && !(opt & OPT_DONT_FREE_LOOP) && m)
+                        if (ENABLE_FEATURE_MOUNT_LOOP && (opt & OPT_FREELOOP) && m)
                                del_loop(m->device);
                        if (ENABLE_FEATURE_MTAB_SUPPORT && !(opt & OPT_NO_MTAB) && m)
                                erase_mtab(m->dir);
diff --git a/util-linux/volume_id/udf.c b/util-linux/volume_id/udf.c
index 613c80c86..fa5dccee7 100644
--- a/util-linux/volume_id/udf.c
+++ b/util-linux/volume_id/udf.c
@@ -137,7 +137,7 @@ anchor:
        if (type != 2) /* TAG_ID_AVDP */
                goto found;
-        /* get desriptor list address and block count */
+        /* get descriptor list address and block count */
        count = le32_to_cpu(vd->type.anchor.length) / bs;
        loc = le32_to_cpu(vd->type.anchor.location);
        dbg("0x%x descriptors starting at logical secor 0x%x", count, loc);
diff --git a/miscutils/wall.c b/util-linux/wall.c
index 50658f457..50658f457 100644
--- a/miscutils/wall.c
+++ b/util-linux/wall.c