From: "cron2 (Code Review)" Date: Tue, 2 Apr 2024 09:55:57 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <51d8829d737bfe4c97a0896ae8a0de5be2b982f6-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="BzlYyiWt/s0="; charset=UTF-8 Subject: [Openvpn-devel] [XS] Change in openvpn[master]: Match ifdef for get_sigtype function with if ifdef of caller List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: plaisthos Cc: flichtenheld , openvpn-devel --BzlYyiWt/s0= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/55= 1?usp=3Demail ) Change subject: Match ifdef for get_sigtype function with if ifdef of caller ...................................................................... Match ifdef for get_sigtype function with if ifdef of caller These two ifdef needs to be the same otherwise the compiler will break with a undefined function. Change-Id: I5b14bf90bb07935f0bb84373ec4e62352752c03f Signed-off-by: Arne Schwabe Acked-by: Gert Doering Message-Id: <20240402063646.25490-1-gert@...1296...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg28= 512.html Signed-off-by: Gert Doering --- M src/openvpn/ssl_openssl.c 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/openvpn/ssl_openssl.c b/src/openvpn/ssl_openssl.c index 6f29c3d..a158617 100644 --- a/src/openvpn/ssl_openssl.c +++ b/src/openvpn/ssl_openssl.c @@ -2166,7 +2166,8 @@ EVP_PKEY_free(pkey); } -#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >=3D 0x10= 10000fL +#if (!defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >=3D 0x10= 10000fL) \ + || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >=3D 0= x3090000fL) /** * Translate an OpenSSL NID into a more human readable name * @param nid -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/551?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: I5b14bf90bb07935f0bb84373ec4e62352752c03f Gerrit-Change-Number: 551 Gerrit-PatchSet: 2 Gerrit-Owner: plaisthos Gerrit-Reviewer: cron2 Gerrit-Reviewer: flichtenheld Gerrit-CC: openvpn-devel Gerrit-MessageType: merged --BzlYyiWt/s0= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 submitted this change.

View Change

Match ifdef for get_sigtype function with if i=
fdef of caller

These two ifdef needs to be the same otherwise the co= mpiler will
break with a undefined function.

Change-Id: I5b14bf90= bb07935f0bb84373ec4e62352752c03f
Signed-off-by: Arne Schwabe <arne@...1186...= .1227...>
Acked-by: Gert Doering <gert@...1296...>
Message-I= d: <20240402063646.25490-1-gert@...1296...>
URL: https://www.mail-= archive.com/openvpn-devel@lists.sourceforge.net/msg28512.html
Signed-off= -by: Gert Doering <gert@...1296...>
---
M src/openvpn/ssl_opens= sl.c
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/openvpn/ssl_openssl.c b/src/openvpn/ssl_openssl.c
index 6f29c3d..a158617 100644
--- a/src/openvpn/= ssl_openssl.c
+++ b/src/openvpn/ssl_openssl.c
@@ -2166,7 +2166,8 @@
EVP_PKEY_free(pkey); }

-#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NU= MBER >=3D 0x1010000fL
+#if (!defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMB= ER >=3D 0x1010000fL) \
+ || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_= NUMBER >=3D 0x3090000fL)
/**
* Transl= ate an OpenSSL NID into a more human readable name
* @par= am nid

To view, visit change 551. To unsubsc= ribe, or for help writing mail filters, visit settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I5b14bf90bb07935f0bb84373ec4= e62352752c03f
Gerrit-Change-Number: 551
Gerrit-PatchSet: 2
Gerrit-Owner: plaisthos <arne-openvpn@...1711...= 27...>
Gerrit-Reviewer: cron2 <gert@...1296...>=
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-MessageType: merged
--BzlYyiWt/s0=--