From: "plaisthos (Code Review)" Date: Tue, 2 Apr 2024 00:22:01 +0000 References: Reply-To: arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="QIrfg9bK/W0="; 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: flichtenheld Cc: openvpn-devel --QIrfg9bK/W0= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: flichtenheld. Hello flichtenheld, I'd like you to do a code review. Please visit http://gerrit.openvpn.net/c/openvpn/+/551?usp=3Demail to review the following change. 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 --- 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/1 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: 1 Gerrit-Owner: plaisthos Gerrit-Reviewer: flichtenheld Gerrit-CC: openvpn-devel Gerrit-Attention: flichtenheld Gerrit-MessageType: newchange --QIrfg9bK/W0= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: flichtenheld.

plaisthos would like flichtenheld to review this change.

Vi= ew Change

Match ifdef for get_sigtype function with if ifdef of caller<=
br>
These two ifdef needs to be the same otherwise the compiler will
= break with a undefined function.

Change-Id: I5b14bf90bb07935f0bb8437= 3ec4e62352752c03f
Signed-off-by: Arne Schwabe <arne@...1227...>---
M src/openvpn/ssl_openssl.c
1 file changed, 2 insertions(+), 1 d= eletion(-)

git pull ssh://gerrit.openvpn.net:29418/openvpn refs/c=
hanges/51/551/1
diff --git a/src/openvpn/ssl_openssl.c b/src/openvp=
n/ssl_openssl.c
index 6f29c3d..a158617 100644
--- a/src/openvpn/ssl_openssl.c
+++ b/src/openvpn/ssl_op= enssl.c
@@ -2166,7 +2166,8 @@
EVP_PKEY= _free(pkey);
}

-#if !defined(LIBRESSL_VERSION_NUMBER) &&am= p; OPENSSL_VERSION_NUMBER >=3D 0x1010000fL
+#if (!defined(LIBRESSL_VERSION_NUMBER) &&= OPENSSL_VERSION_NUMBER >=3D 0x1010000fL) \
+ || (defined(LIBRESSL_VERSION_NUMBER) &&a= mp; LIBRESSL_VERSION_NUMBER >=3D 0x3090000fL)
/**
* Translate an OpenSSL NID into a more human readable name

* @param nid

To view, vi= sit chang= e 551. To unsubscribe, 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: 1
Gerrit-Owner: plaisthos <arne-openvpn@...1711...= 27...>
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: flichtenheld <frank@...2375...= 41...>
Gerrit-MessageType: newchange
--QIrfg9bK/W0=--