From: "cron2 (Code Review)" Date: Thu, 25 Jul 2024 11:38:13 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., heiko@...515..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <34d2e8069354bf95436bdf4eb4f93534f57852af-EmailReplacePatchSet-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="cldhpIZ9fEA="; charset=UTF-8 Subject: [Openvpn-devel] [XS] Change in openvpn[master]: add and send IV_PROTO_DNS_OPTION_V2 flag List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: d12fk , plaisthos , flichtenheld Cc: openvpn-devel --cldhpIZ9fEA= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has uploaded a new patch set (#2) to the change originally created by= d12fk. ( http://gerrit.openvpn.net/c/openvpn/+/680?usp=3Demail ) The following approvals got outdated and were removed: Code-Review+2 by plaisthos Change subject: add and send IV_PROTO_DNS_OPTION_V2 flag ...................................................................... add and send IV_PROTO_DNS_OPTION_V2 flag Incompatible changes to the --dns server address and --dns server exclude-domains options were introduced after the code for handling them was released. Add and send a new IV_PROTO flag, so servers which act on the flags set can differentiate between clients which have implemented --dns and those which just support the new option. This enables them to decide which variant of options to send to the client. Change-Id: I975057c20c1457ef88111f8d142ca3fd2039d5ff Signed-off-by: Heiko Hund Acked-by: Arne Schwabe Message-Id: <20240725112248.21075-1-gert@...1296...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg28= 970.html Signed-off-by: Gert Doering --- M src/openvpn/ssl.c M src/openvpn/ssl.h 2 files changed, 6 insertions(+), 3 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/80/680/2 diff --git a/src/openvpn/ssl.c b/src/openvpn/ssl.c index e0e9591..14c38cf 100644 --- a/src/openvpn/ssl.c +++ b/src/openvpn/ssl.c @@ -1900,8 +1900,8 @@ /* support for P_DATA_V2 */ int iv_proto =3D IV_PROTO_DATA_V2; - /* support for the --dns option */ - iv_proto |=3D IV_PROTO_DNS_OPTION; + /* support for the latest --dns option */ + iv_proto |=3D IV_PROTO_DNS_OPTION_V2; /* support for exit notify via control channel */ iv_proto |=3D IV_PROTO_CC_EXIT_NOTIFY; diff --git a/src/openvpn/ssl.h b/src/openvpn/ssl.h index 1a45048..6c2bfc3 100644 --- a/src/openvpn/ssl.h +++ b/src/openvpn/ssl.h @@ -94,7 +94,7 @@ * result. */ #define IV_PROTO_NCP_P2P (1<<5) -/** Supports the --dns option introduced in version 2.6 */ +/** Supports the --dns option introduced in version 2.6. Not sent anymore.= */ #define IV_PROTO_DNS_OPTION (1<<6) /** Support for explicit exit notify via control channel @@ -107,6 +107,9 @@ /** Support to dynamic tls-crypt (renegotiation with TLS-EKM derived tls-c= rypt key) */ #define IV_PROTO_DYN_TLS_CRYPT (1<<9) +/** Supports the --dns option after all the incompatible changes */ +#define IV_PROTO_DNS_OPTION_V2 (1<<11) + /* Default field in X509 to be username */ #define X509_USERNAME_FIELD_DEFAULT "CN" -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/680?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I975057c20c1457ef88111f8d142ca3fd2039d5ff Gerrit-Change-Number: 680 Gerrit-PatchSet: 2 Gerrit-Owner: d12fk Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-MessageType: newpatchset --cldhpIZ9fEA= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 uploaded patch set #2 to the change originally cr= eated by d12fk.

View Change

The following approvals got outdated and= were removed: Code-Review+2 by plaisthos

add and send IV_PROTO_DNS_OPTION_V2 flag

= Incompatible changes to the --dns server address and --dns server
exclud= e-domains options were introduced after the code for handling them
was r= eleased. Add and send a new IV_PROTO flag, so servers which act on
the f= lags set can differentiate between clients which have implemented
--dns = and those which just support the new option. This enables them to
decide= which variant of options to send to the client.

Change-Id: I975057c= 20c1457ef88111f8d142ca3fd2039d5ff
Signed-off-by: Heiko Hund <heiko@...1186...= .2662...>
Acked-by: Arne Schwabe <arne-openvpn@...1227...>
M= essage-Id: <20240725112248.21075-1-gert@...1296...>
URL: https://w= ww.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg28970.html
Si= gned-off-by: Gert Doering <gert@...1296...>
---
M src/openvpn/s= sl.c
M src/openvpn/ssl.h
2 files changed, 6 insertions(+), 3 deletion= s(-)

git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes=
/80/680/2
diff --git a/src/openvpn/ssl.c b/src/openvpn/ssl.c=

index e0e9591..14c38cf 100644
--- a/src/openvpn/s= sl.c
+++ b/src/openvpn/ssl.c
@@ -1900,8 +19= 00,8 @@
/* support for P_DATA_V2 */
int iv_proto =3D IV_PROTO_DATA_V2;

<= span style=3D"color: hsl(0, 100%, 40%);">- /* support for the --dns = option */
- iv_p= roto |=3D IV_PROTO_DNS_OPTION;
+ /* support for the latest --dns option */
+ iv_proto |=3D IV_PROTO_DNS= _OPTION_V2;

/* support for exit = notify via control channel */
iv_proto |=3D IV_PRO= TO_CC_EXIT_NOTIFY;
diff --git a/src/openvpn/ssl.h b/src/ope= nvpn/ssl.h
index 1a45048..6c2bfc3 100644
--= - a/src/openvpn/ssl.h
+++ b/src/openvpn/ssl.h
@@ -94,7 +94,7 @@
* result. */
#defin= e IV_PROTO_NCP_P2P (1<<5)

-/** Supports the --dns option introduce= d in version 2.6 */
+= /** Supports the --dns option introduced in version 2.6. Not sent anymore. = */
#define IV_PROTO_DNS_OPTION (1<<6)
/** Support for explicit exit notify via control = channel
@@ -107,6 +107,9 @@
/** Support to= dynamic tls-crypt (renegotiation with TLS-EKM derived tls-crypt key) */
#define IV_PROTO_DYN_TLS_CRYPT (1<<9)

+/** Supports the= --dns option after all the incompatible changes */
+#define IV_PROTO_DNS_OPTION_V2 (1<&l= t;11)
+
/* Default field in X509 to be username */
#define X50= 9_USERNAME_FIELD_DEFAULT "CN"

<= /span>

To view, visit change 680. To unsubscribe, or for help writin= g mail filters, visit settin= gs.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I975057c20c1457ef88111f8d142= ca3fd2039d5ff
Gerrit-Change-Number: 680
Gerrit-PatchSet: 2
Gerrit-Owner: d12fk <heiko@...515...>
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-MessageType: newpatchset
--cldhpIZ9fEA=--