From: "cron2 (Code Review)" Date: Sun, 19 Apr 2026 13:37:05 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., selva.nair@...277..., openvpn-devel@lists.sourceforge.net, antonio@...2726... Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="Yhcu+ijaJ20="; charset=UTF-8 Subject: [Openvpn-devel] [S] Change in openvpn[master]: verify_x509_name: Improve the error message on failure List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: selvanair Cc: plaisthos , openvpn-devel --Yhcu+ijaJ20= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/16= 24?usp=3Demail ) Change subject: verify_x509_name: Improve the error message on failure ...................................................................... verify_x509_name: Improve the error message on failure Print the actual string that was used for the match instead of the whole subject. Github: closes OpenVPN/openvpn#992 Change-Id: I6e7947ab81cf229f0d27714dd563a07ace6bd38a Signed-off-by: Selva Nair Acked-by: Arne Schwabe Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1624 Message-Id: <20260414055830.17032-1-gert@...1296...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg36= 606.html Signed-off-by: Gert Doering --- M src/openvpn/ssl_verify.c 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/src/openvpn/ssl_verify.c b/src/openvpn/ssl_verify.c index d44f25f..21b516d 100644 --- a/src/openvpn/ssl_verify.c +++ b/src/openvpn/ssl_verify.c @@ -369,21 +369,32 @@ /* verify X509 name or username against --verify-x509-[user]name */ if (opt->verify_x509_type !=3D VERIFY_X509_NONE) { - if ((opt->verify_x509_type =3D=3D VERIFY_X509_SUBJECT_DN - && strcmp(opt->verify_x509_name, subject) =3D=3D 0) - || (opt->verify_x509_type =3D=3D VERIFY_X509_SUBJECT_RDN - && strcmp(opt->verify_x509_name, common_name) =3D=3D 0) - || (opt->verify_x509_type =3D=3D VERIFY_X509_SUBJECT_RDN_PREFIX - && strncmp(opt->verify_x509_name, common_name, strlen(opt-= >verify_x509_name)) =3D=3D 0)) + const char *err_fmt =3D "VERIFY X509NAME ERROR: %s, must be %s"; + const char *match_str =3D common_name; + bool verified =3D false; + switch (opt->verify_x509_type) { - msg(D_HANDSHAKE, "VERIFY X509NAME OK: %s", subject); + case VERIFY_X509_SUBJECT_DN: + match_str =3D subject; + verified =3D !strcmp(opt->verify_x509_name, match_str); + break; + case VERIFY_X509_SUBJECT_RDN: + verified =3D !strcmp(opt->verify_x509_name, match_str); + break; + case VERIFY_X509_SUBJECT_RDN_PREFIX: + err_fmt =3D "VERIFY X509NAME ERROR: %s, must start with %s= "; + verified =3D !strncmp(opt->verify_x509_name, match_str, st= rlen(opt->verify_x509_name)); + break; + default: + ASSERT(0); /* should not happen */ + break; } - else + if (!verified) { - msg(D_HANDSHAKE, "VERIFY X509NAME ERROR: %s, must be %s", subj= ect, - opt->verify_x509_name); - return FAILURE; /* Reject connection */ + msg(D_HANDSHAKE, err_fmt, match_str, opt->verify_x509_name); + return FAILURE; } + msg(D_HANDSHAKE, "VERIFY X509NAME OK: %s", subject); } return SUCCESS; -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1624?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings?usp=3Demail Gerrit-MessageType: merged Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I6e7947ab81cf229f0d27714dd563a07ace6bd38a Gerrit-Change-Number: 1624 Gerrit-PatchSet: 2 Gerrit-Owner: selvanair Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-CC: ordex --Yhcu+ijaJ20= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 sub= mitted this change.

View Change

verify_x509_name: Improve the error message on f=
ailure

Print the actual string that was used for the match instead o= f the
whole subject.

Github: closes OpenVPN/openvpn#992

Ch= ange-Id: I6e7947ab81cf229f0d27714dd563a07ace6bd38a
Signed-off-by: Selva = Nair <selva.nair@...277...>
Acked-by: Arne Schwabe <arne-openvp= n@...1227...>
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1624=
Message-Id: <20260414055830.17032-1-gert@...1296...>
URL: http= s://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg36606.html<= br>Signed-off-by: Gert Doering <gert@...1296...>
---
M src/open= vpn/ssl_verify.c
1 file changed, 22 insertions(+), 11 deletions(-)
diff --git a/src/openvpn/ssl_verify.c b/src/openvpn/ssl_verify.c<=
br>index d44f25f..21b516d 100644
--- a/src/openvpn/ss= l_verify.c
+++ b/src/openvpn/ssl_verify.c
@= @ -369,21 +369,32 @@
/* verify X509 name or username a= gainst --verify-x509-[user]name */
if (opt->verify_= x509_type !=3D VERIFY_X509_NONE)
{
- if ((opt->verify_x509_type =3D= =3D VERIFY_X509_SUBJECT_DN
- && strcmp(opt->verify_x509_name, subject) =3D= =3D 0)
- || = (opt->verify_x509_type =3D=3D VERIFY_X509_SUBJECT_RDN
- && strcmp(opt-&g= t;verify_x509_name, common_name) =3D=3D 0)
- || (opt->verify_x509_type =3D=3D VERIFY= _X509_SUBJECT_RDN_PREFIX
+ const char *err_fmt =3D "VERIFY X50= 9NAME ERROR: %s, must be %s";
+ const char *match_str =3D common_name;
+ bool verified =3D false;<= /span>
+ switch (opt-= >verify_x509_type)
{
- msg(D_HANDSHAKE, "VERIFY X509NA= ME OK: %s", subject);
+ case VERIFY_X509_SUBJECT_DN:
+ match_str =3D subject;+ verified =3D= !strcmp(opt->verify_x509_name, match_str);
+ break;
+ case VERIFY_X509_SUBJECT_RDN:

+ verifie= d =3D !strcmp(opt->verify_x509_name, match_str);
+ break;
+ case VERIFY_X509_SUBJECT_R= DN_PREFIX:
+ = err_fmt =3D "VERIFY X509NAME ERROR: %s, must start with %s"= ;;
+ v= erified =3D !strncmp(opt->verify_x509_name, match_str, strlen(opt->ve= rify_x509_name));
+ = break;
= + default:
+ ASSERT(0); /* should not happen */
+ break;
= }
- else<= /span>
+ if (!verifie= d)
{
- msg(D_HANDSHAKE, "VERIFY X509NAME ERROR: %s, must = be %s", subject,
-= opt->verify_x509_name);
- return FAILURE; /* Reject connection */
+ msg(D_HAND= SHAKE, err_fmt, match_str, opt->verify_x509_name);
+ return FAILURE;
}

+ = msg(D_HANDSHAKE, "VERIFY X509NAME OK: %s", subject);
= }

return SUCCESS;<= br>

To view, visit change 1624. To unsubscribe, or for= help writing mail filters, visit settings.

Gerrit-MessageType: merged
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I6e7947ab81cf229f0d27714dd56= 3a07ace6bd38a
Gerrit-Change-Number: 1624
Gerrit-PatchSet: 2
Gerrit-Owner: selvanair <selva.nair@...1354...= ..>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-CC: ordex <antonio@...2726...> = --Yhcu+ijaJ20=--