Merge pull request #885 from padelsbach/padelsbach/finding-401-402-403

Fix multibyte passwords, file mode and attrib reporting

Author: ejohnstown

apps/wolfsshd/auth.c

@@ -816,7 +816,7 @@ static int CheckPasswordWIN(const char* usr, const byte* pw, word32 pwSz, WOLFSS
     }
 
     if (ret == WSSHD_AUTH_SUCCESS) {
-        if (MultiByteToWideChar(CP_UTF8, 0, pw, pwSz, pwW, pwWSz) != pwSz) {
+        if (MultiByteToWideChar(CP_UTF8, 0, pw, pwSz, pwW, pwWSz) != pwWSz) {
             ret = WSSHD_AUTH_FAILURE;
         }
         else {

src/wolfscp.c

@@ -2253,9 +2253,9 @@ static int GetFileStats(void *fs, ScpSendCtx* ctx, const char* fileName,
         *fileMode = 0755;
         /* Mimic S_IFMT */
         if (ctx->s.type == FS_DIR_ENTRY_FILE)
-            *fileMode |= 0040000;
+            *fileMode |= 0100000;  /* S_IFREG */
         else if (ctx->s.type == FS_DIR_ENTRY_DIR)
-            *fileMode |= 0100000;
+            *fileMode |= 0040000;  /* S_IFDIR */
         else
             ret = WS_BAD_FILE_E;
 

src/wolfsftp.c

@@ -4687,7 +4687,7 @@ int SFTP_GetAttributes(void* fs, const char* fileName, WS_SFTP_FILEATRB* atr,
 
     atr->flags |= WOLFSSH_FILEATRB_PERM;
     atr->per = 0555 |
-        ((stats.dwFileAttributes | FILE_ATTRIBUTE_READONLY) ? 0 : 0200);
+        ((stats.dwFileAttributes & FILE_ATTRIBUTE_READONLY) ? 0 : 0200);
     atr->per |= ((stats.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
         ? FILEATRB_PER_DIR : FILEATRB_PER_FILE);