[Openvpn-devel,v1] Use USER_PASS_LEN for private key password buffer size

Message ID 20260305065952.24348-1-gert@greenie.muc.de
State New
Headers show
Series [Openvpn-devel,v1] Use USER_PASS_LEN for private key password buffer size | expand

Commit Message

Gert Doering March 5, 2026, 6:59 a.m. UTC
From: Selva Nair <selva.nair@gmail.com>

GitHub: fixes OpenVPN/openvpn#993

Change-Id: I5e17e184f666317df21460108da4f70670358ece
Signed-off-by: Selva Nair <selva.nair@gmail.com>
Acked-by: Arne Schwabe <arne-openvpn@rfc2549.org>
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1553
---

This change was reviewed on Gerrit and approved by at least one
developer. I request to merge it to master.

Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1553
This mail reflects revision 1 of this Change.

Signed-off-by line for the author was added as per our policy.

Acked-by according to Gerrit (reflected above):
Arne Schwabe <arne-openvpn@rfc2549.org>

Comments

Gert Doering March 6, 2026, 4:24 p.m. UTC | #1
Well spotted... change makes sense, getting rid of magic numbers is
good, ensuring all "use this for a password" arrays have the same
size is even better ;-)

Your patch has been applied to the master and release/2.7 branch (bugfix).

commit 5f7b1c548b69e0ba0c54bfb63c94243c4ffaea97 (master)
commit 6a1ae7f24d3179146bb7464bd8dc8a36f18353fb (release/2.7)
Author: Selva Nair
Date:   Thu Mar 5 07:59:45 2026 +0100

     Use USER_PASS_LEN for private key password buffer size

     Signed-off-by: Selva Nair <selva.nair@gmail.com>
     Acked-by: Arne Schwabe <arne-openvpn@rfc2549.org>
     Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1553
     Message-Id: <20260305065952.24348-1-gert@greenie.muc.de>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg35914.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering

Patch

diff --git a/src/openvpn/ssl_openssl.c b/src/openvpn/ssl_openssl.c
index 09f23964..80aef69 100644
--- a/src/openvpn/ssl_openssl.c
+++ b/src/openvpn/ssl_openssl.c
@@ -796,7 +796,7 @@ 
         }
         else /* use our generic 'Private Key' passphrase callback */
         {
-            char password[64];
+            char password[USER_PASS_LEN];
             pem_password_cb *cb = SSL_CTX_get_default_passwd_cb(ctx);
             void *d = SSL_CTX_get_default_passwd_cb_userdata(ctx);