6 files changed, 23 insertions, 26 deletions

diff --git a/networking/ftpd.c b/networking/ftpd.c
index c3125410e..96db5d9fd 100644
--- a/networking/ftpd.c
+++ b/networking/ftpd.c
@@ -491,19 +491,18 @@ static void
 handle_pasv(void)
 {
         unsigned port;
-        char *addr, *response;
+        char *response;
 
         port = bind_for_passive_mode();
 
         if (G.local_addr->u.sa.sa_family == AF_INET)
-                addr = xmalloc_sockaddr2dotted_noport(&G.local_addr->u.sa);
+                response = xmalloc_sockaddr2dotted_noport(&G.local_addr->u.sa);
         else /* seen this in the wild done by other ftp servers: */
-                addr = xstrdup("0.0.0.0");
-        replace_char(addr, '.', ',');
+                response = xstrdup("0.0.0.0");
+        replace_char(response, '.', ',');
 
-        response = xasprintf(STR(FTP_PASVOK)" PASV ok (%s,%u,%u)\r\n",
-                        addr, (int)(port >> 8), (int)(port & 255));
-        free(addr);
+        xasprintf_inplace(response, STR(FTP_PASVOK)" PASV ok (%s,%u,%u)\r\n",
+                        response, (int)(port >> 8), (int)(port & 255));
         cmdio_write_raw(response);
         free(response);
 }
diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index 9c3640be7..bc2dca506 100644
--- a/networking/ifupdown.c
+++ b/networking/ifupdown.c
@@ -895,16 +895,15 @@ static struct interfaces_file_t *read_interfaces(const char *filename, struct in
         while ((buf = xmalloc_fgetline(f)) != NULL) {
 #if ENABLE_DESKTOP
                 /* Trailing "\" concatenates lines */
+//TODO: check how to handle "line\\" (double backslashes)
                 char *p;
                 while ((p = last_char_is(buf, '\\')) != NULL) {
                         *p = '\0';
                         rest_of_line = xmalloc_fgetline(f);
                         if (!rest_of_line)
                                 break;
-                        p = xasprintf("%s%s", buf, rest_of_line);
-                        free(buf);
+                        xasprintf_inplace(buf, "%s%s", buf, rest_of_line);
                         free(rest_of_line);
-                        buf = p;
                 }
 #endif
                 rest_of_line = buf;
diff --git a/networking/netstat.c b/networking/netstat.c
index 807800a62..d7afa8fdd 100644
--- a/networking/netstat.c
+++ b/networking/netstat.c
@@ -391,7 +391,7 @@ static const char *get_sname(int port, const char *proto, int numeric)
 
 static char *ip_port_str(struct sockaddr *addr, int port, const char *proto, int numeric)
 {
-        char *host, *host_port;
+        char *host;
 
         /* Code which used "*" for INADDR_ANY is removed: it's ambiguous
          * in IPv6, while "0.0.0.0" is not. */
@@ -402,9 +402,8 @@ static char *ip_port_str(struct sockaddr *addr, int port, const char *proto, int
         if (!host)
                 host = xmalloc_sockaddr2dotted_noport(addr);
 
-        host_port = xasprintf("%s:%s", host, get_sname(htons(port), proto, numeric));
-        free(host);
-        return host_port;
+        xasprintf_inplace(host, "%s:%s", host, get_sname(htons(port), proto, numeric));
+        return host;
 }
 
 struct inet_params {
diff --git a/networking/ntpd.c b/networking/ntpd.c
index efe9f5326..595000b11 100644
--- a/networking/ntpd.c
+++ b/networking/ntpd.c
@@ -2395,7 +2395,7 @@ static NOINLINE void ntp_init(char **argv)
                 while (peers) {
                         char *peer = llist_pop(&peers);
                         key_entry_t *key_entry = NULL;
-                        if (strncmp(peer, "keyno:", 6) == 0) {
+                        if (is_prefixed_with(peer, "keyno:")) {
                                 char *end;
                                 int key_id;
                                 peer += 6;
diff --git a/networking/tls.h b/networking/tls.h
index eee5a7617..fde2e4d3d 100644
--- a/networking/tls.h
+++ b/networking/tls.h
@@ -10,7 +10,6 @@
  */
 #include "libbb.h"
 
-
 #if !ENABLE_FEATURE_TLS_SCHANNEL
 /* Config tweaks */
 #define HAVE_NATIVE_INT64
@@ -32,16 +31,18 @@
 # define PSTM_32BIT
 # define PSTM_X86
 #endif
-//#if defined(__GNUC__) && defined(__x86_64__)
-//  /* PSTM_X86_64 works correctly, but +782 bytes. */
-//  /* Looks like most of the growth is because of PSTM_64BIT. */
+#if defined(__GNUC__) && defined(__x86_64__)
+  /* PSTM_64BIT + PSTM_X86_64 works correctly, but:
+   * +928 bytes if PSTM_64BIT but !PSTM_X86_64
+   * +1003 bytes with INNERMUL8 (loop unrolling in pstm_montgomery_reduce())
+   * +664 bytes without INNERMUL8
+   */
 //# define PSTM_64BIT
 //# define PSTM_X86_64
-//#endif
+#endif
 //#if SOME_COND #define PSTM_MIPS, #define PSTM_32BIT
 //#if SOME_COND #define PSTM_ARM,  #define PSTM_32BIT
 
-
 #define PS_SUCCESS              0
 #define PS_FAILURE              -1
 #define PS_ARG_FAIL             -6      /* Failure due to bad function param */
@@ -52,14 +53,14 @@
 #define PS_TRUE         1
 #define PS_FALSE        0
 
+#undef ENDIAN_BIG
+#undef ENDIAN_LITTLE
 #if BB_BIG_ENDIAN
 # define ENDIAN_BIG     1
-# undef  ENDIAN_LITTLE
 //#????  ENDIAN_32BITWORD
 // controls only STORE32L, which we don't use
 #else
 # define ENDIAN_LITTLE  1
-# undef  ENDIAN_BIG
 #endif
 
 typedef uint64_t uint64;
@@ -99,7 +100,6 @@ void tls_get_random(void *buf, unsigned len) FAST_FUNC;
 #undef  min
 #define min(x, y) ((x) < (y) ? (x) : (y))
 
-
 #include "tls_pstm.h"
 #include "tls_aes.h"
 #include "tls_aesgcm.h"
diff --git a/networking/tls_pstm_montgomery_reduce.c b/networking/tls_pstm_montgomery_reduce.c
index 4181a0590..e63e590db 100644
--- a/networking/tls_pstm_montgomery_reduce.c
+++ b/networking/tls_pstm_montgomery_reduce.c
@@ -135,7 +135,7 @@ asm(                                                       \
         :"0"(_c[LO]), "1"(cy), "r"(mu), "r"(*tmpm++)           \
         : "%rax", "%rdx", "cc")
 
-#define INNERMUL8                               \
+#define INNERMUL8_disabled_for_bbox                             \
 asm(                                                    \
         "movq 0(%5),%%rax    \n\t"  \
         "movq 0(%2),%%r10    \n\t"  \
@@ -398,7 +398,7 @@ int32 FAST_FUNC pstm_montgomery_reduce(psPool_t *pool, pstm_int *a, pstm_int *m,
                 _c   = c + x;
                 tmpm = m->dp;
                 y = 0;
-#ifdef PSTM_X86_64
+#ifdef INNERMUL8 //bbox: PSTM_X86_64
                 for (; y < (pa & ~7); y += 8) {
                         INNERMUL8;
                         _c   += 8;