From: "cron2 (Code Review)" Date: Tue, 2 Apr 2024 09:55:55 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <51d8829d737bfe4c97a0896ae8a0de5be2b982f6-EmailReplacePatchSet-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="Vt5OFx8NxWA="; 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 , flichtenheld Cc: openvpn-devel --Vt5OFx8NxWA= 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= plaisthos. ( http://gerrit.openvpn.net/c/openvpn/+/551?usp=3Demail ) The following approvals got outdated and were removed: Code-Review+2 by cron2 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(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/51/551/2 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: newpatchset --Vt5OFx8NxWA= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

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

View Change

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

Match ifdef for get_sigtype function with if ifdef o=
f caller

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

Change-Id: I5b14bf90bb0793= 5f0bb84373ec4e62352752c03f
Signed-off-by: Arne Schwabe <arne@...2639...= ..>
Acked-by: Gert Doering <gert@...1296...>
Message-Id: <= ;20240402063646.25490-1-gert@...1296...>
URL: https://www.mail-archiv= e.com/openvpn-devel@lists.sourceforge.net/msg28512.html
Signed-off-by: G= ert Doering <gert@...1296...>
---
M src/openvpn/ssl_openssl.c1 file changed, 2 insertions(+), 1 deletion(-)

git pull ssh://g=
errit.openvpn.net:29418/openvpn refs/changes/51/551/2
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 +2= 166,8 @@
EVP_PKEY_free(pkey);
}

-#if !defi= ned(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >=3D 0x1= 010000fL
+#if (!defin= ed(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >=3D 0x101= 0000fL) \
+ || (de= fined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >=3D 0= x3090000fL)
/**
* Translate an OpenSSL N= ID into a more human readable name
* @param nid

To view, visit change 551. To unsubscribe, or for hel= p 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: newpatchset
--Vt5OFx8NxWA=--