Merge branch 'busybox' into merge

2 files changed, 9 insertions, 3 deletions

diff --git a/libbb/missing_syscalls.c b/libbb/missing_syscalls.c
index e3c1e924b..093412811 100644
--- a/libbb/missing_syscalls.c
+++ b/libbb/missing_syscalls.c
@@ -40,8 +40,10 @@ int pivot_root(const char *new_root, const char *put_old)
         return syscall(__NR_pivot_root, new_root, put_old);
 }
 
+# if __ANDROID_API__ < 21
 int tcdrain(int fd)
 {
         return ioctl(fd, TCSBRK, 1);
 }
+# endif
 #endif
diff --git a/libbb/pw_encrypt.c b/libbb/pw_encrypt.c
index bfc7030a8..dbc15e5fc 100644
--- a/libbb/pw_encrypt.c
+++ b/libbb/pw_encrypt.c
@@ -52,14 +52,18 @@ char* FAST_FUNC crypt_make_pw_salt(char salt[MAX_PW_SALT_LEN], const char *algo)
 {
         int len = 2/2;
         char *salt_ptr = salt;
-        if (algo[0] != 'd') { /* not des */
+
+        /* Standard chpasswd uses uppercase algos ("MD5", not "md5").
+         * Need to be case-insensitive in the code below.
+         */
+        if ((algo[0]|0x20) != 'd') { /* not des */
                 len = 8/2; /* so far assuming md5 */
                 *salt_ptr++ = '$';
                 *salt_ptr++ = '1';
                 *salt_ptr++ = '$';
 #if !ENABLE_USE_BB_CRYPT || ENABLE_USE_BB_CRYPT_SHA
-                if (algo[0] == 's') { /* sha */
-                        salt[1] = '5' + (strcmp(algo, "sha512") == 0);
+                if ((algo[0]|0x20) == 's') { /* sha */
+                        salt[1] = '5' + (strcasecmp(algo, "sha512") == 0);
                         len = 16/2;
                 }
 #endif