Fix more of uninitialized struct user_pass local vars

Not all of these touch uninitialzed members of the struct, but that
could change in future.

Change-Id: I71bc847b48da54b70f60ccd7c4521ec699daf9cb
Signed-off-by: Selva Nair <selva.nair@gmail.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <20240909204829.10379-1-selva.nair@gmail.com>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg29152.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
(cherry picked from commit aa1dd09b5fc196499c84d2ef9b0c254ebb1745d8)

diff --git a/src/openvpn/auth_token.c b/src/openvpn/auth_token.c
index 5de65cb62a431be0356b6b91b3d24d12d833da49..c4b59b9946d53130e49ca379b561d39ee7e590e8 100644 (file)
--- a/src/openvpn/auth_token.c
+++ b/src/openvpn/auth_token.c
@@ -452,6 +452,7 @@ check_send_auth_token(struct context *c)
     }
 
     struct user_pass up;
+    CLEAR(up);
     strncpynt(up.username, multi->locked_username, sizeof(up.username));
 
     generate_auth_token(&up, multi);

diff --git a/src/openvpn/pkcs11.c b/src/openvpn/pkcs11.c
index 35a02c27cb765ebc115b046b8f04dd76816905cd..d21ce3164e07133fd68924831db9bc2fada6f4ea 100644 (file)
--- a/src/openvpn/pkcs11.c
+++ b/src/openvpn/pkcs11.c
@@ -238,6 +238,7 @@ _pkcs11_openvpn_pin_prompt(
 {
     struct user_pass token_pass;
     char prompt[1024];
+    CLEAR(token_pass);
 
     (void)global_data;
     (void)user_data;

diff --git a/src/openvpn/socks.c b/src/openvpn/socks.c
index 93f6b4b1adf964a14e7a8745239ac4b7c19788f2..b5cd536b12509360f5e04e15cbfc75c2100b2e52 100644 (file)
--- a/src/openvpn/socks.c
+++ b/src/openvpn/socks.c
@@ -96,7 +96,7 @@ socks_username_password_auth(struct socks_proxy_info *p,
     ssize_t size;
     bool ret = false;
 
-    creds.defined = 0;
+    CLEAR(creds);
     if (!get_user_pass(&creds, p->authfile, UP_TYPE_SOCKS, GET_USER_PASS_MANAGEMENT))
     {
         msg(M_NONFATAL, "SOCKS failed to get username/password.");