Fix minor issues

Author: yosuke-wolfssl

src/internal.c

@@ -8345,7 +8345,7 @@ static int DoUserAuthRequest(WOLFSSH* ssh,
 {
     word32 begin;
     int ret = WS_SUCCESS;
-    byte authNameId;
+    byte authNameId = ID_UNKNOWN;
     byte serviceValid = 1;
     WS_UserAuthData authData;
 
@@ -8412,6 +8412,7 @@ static int DoUserAuthRequest(WOLFSSH* ssh,
         }
 
         if (ret == WS_SUCCESS) {
+            /* Set the username for valid service only */
             ret = wolfSSH_SetUsernameRaw(ssh,
                     authData.username, authData.usernameSz);
         }

tests/unit.c

@@ -1331,13 +1331,15 @@ static int test_DoChannelRequest(void)
  * request capture so the two tests can run independently in any order. */
 static byte   s_authSvcCapture[256];
 static word32 s_authSvcCaptureSz = 0;
+static word32 s_authSvcSendCount = 0;
 
 static int CaptureIoSendAuthSvc(WOLFSSH* ssh, void* buf, word32 sz, void* ctx)
 {
     (void)ssh; (void)ctx;
     s_authSvcCaptureSz = (sz < (word32)sizeof(s_authSvcCapture))
                          ? sz : (word32)sizeof(s_authSvcCapture);
     WMEMCPY(s_authSvcCapture, buf, s_authSvcCaptureSz);
+    s_authSvcSendCount++;
     return (int)sz;
 }
 
@@ -1413,16 +1415,17 @@ static int test_DoUserAuthRequest_serviceName(void)
     if (ctx == NULL) return -500;
     wolfSSH_SetIOSend(ctx, CaptureIoSendAuthSvc);
 
-    ssh = wolfSSH_new(ctx);
-    if (ssh == NULL) { wolfSSH_CTX_free(ctx); return -501; }
-
     for (i = 0; i < (int)(sizeof(cases)/sizeof(cases[0])); i++) {
         byte   buf[128];
         word32 len = 0, idx = 0;
         word32 snsz = cases[i].svcNameSz;
         int    ret;
 
+        ssh = wolfSSH_new(ctx);
+        if (ssh == NULL) { result = -501; goto done; }
+
         s_authSvcCaptureSz = 0;
+        s_authSvcSendCount = 0;
         WMEMSET(s_authSvcCapture, 0, sizeof(s_authSvcCapture));
 
         /* username: "user" */
@@ -1449,11 +1452,18 @@ static int test_DoUserAuthRequest_serviceName(void)
 
         ret = wolfSSH_TestDoUserAuthRequest(ssh, buf, len, &idx);
 
+        if (s_authSvcSendCount != 1) {
+            printf("DoUserAuthRequest_svcName[%s]: expected 1 send, got %u\n",
+                   cases[i].label, s_authSvcSendCount);
+            result = -540 - i;
+            goto done;
+        }
+
         if (ret != cases[i].expectRet) {
             printf("DoUserAuthRequest_svcName[%s]: ret=%d expected=%d\n",
                    cases[i].label, ret, cases[i].expectRet);
             result = -502 - i;
-            break;
+            goto done;
         }
 
         /* MSGID_USERAUTH_FAILURE must be in the captured packet. */
@@ -1466,7 +1476,7 @@ static int test_DoUserAuthRequest_serviceName(void)
                        s_authSvcCaptureSz,
                        capMsgId >= 0 ? capMsgId : 0);
                 result = -520 - i;
-                break;
+                goto done;
             }
         }
 
@@ -1475,10 +1485,14 @@ static int test_DoUserAuthRequest_serviceName(void)
             printf("DoUserAuthRequest_svcName[%s]: idx=%u expected len=%u\n",
                    cases[i].label, idx, len);
             result = -510 - i;
-            break;
+            goto done;
         }
+
+        wolfSSH_free(ssh);
+        ssh = NULL;
     }
 
+done:
     wolfSSH_free(ssh);
     wolfSSH_CTX_free(ctx);
     return result;