Change in openvpn[master]: Match ifdef for get_sigtype function with if ifdef of caller
A message that is not in the archive (sent off-list or not yet received): gerrit.1712017317000.I5b14bf90bb07935f0bb84373ec4e62352752c03f@...2715...
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=email
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.
---
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
src/openvpn/ssl_openssl.c +2 -1
@@ -2166,7 +2166,8 @@EVP_PKEY_free (pkey); } -#if !defined(LIBRESSL_VERSION_NUMBER ) &&OPENSSL_VERSION_NUMBER >=0x1010000fL +#if (!defined(LIBRESSL_VERSION_NUMBER ) &&OPENSSL_VERSION_NUMBER >=0x1010000fL ) \ + || (defined(LIBRESSL_VERSION_NUMBER ) &&LIBRESSL_VERSION_NUMBER >=0x3090000fL )/** * Translate an OpenSSL NID into a more human readable name * @param nid
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/551?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I5b14bf90bb07935f0bb84373ec4e62352752c03f
Gerrit-Change-Number: 551
Gerrit-PatchSet: 1
Gerrit-Owner: plaisthos <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newchange
Attention is currently required from: flichtenheld, plaisthos.
cron2 has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/551?usp=email )
Change subject: Match ifdef for get_sigtype function with if ifdef of caller
......................................................................
Patch Set 1: Code-Review+2
(1 comment)
Patchset:
PS1:
verified, now the #ifdef matches the other one
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/551?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I5b14bf90bb07935f0bb84373ec4e62352752c03f
Gerrit-Change-Number: 551
Gerrit-PatchSet: 1
Gerrit-Owner: plaisthos <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Tue, 02 Apr 2024 06:36:22 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
PATCH 1/1 Match ifdef for get_sigtype function with if ifdef of caller
In reply to a message not in the archiveFrom: Arne Schwabe <[email protected]...>
These two ifdef needs to be the same otherwise the compiler will break with a undefined function.
---
This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/551
This mail reflects revision 1 of this Change.
Acked-by according to Gerrit (reflected above):
Gert Doering <[email protected]...>
src/openvpn/ssl_openssl.c +2 -1
@@ -2166,7 +2166,8 @@EVP_PKEY_free (pkey); } -#if !defined(LIBRESSL_VERSION_NUMBER ) &&OPENSSL_VERSION_NUMBER >=0x1010000fL +#if (!defined(LIBRESSL_VERSION_NUMBER ) &&OPENSSL_VERSION_NUMBER >=0x1010000fL ) \ + || (defined(LIBRESSL_VERSION_NUMBER ) &&LIBRESSL_VERSION_NUMBER >=0x3090000fL )/** * Translate an OpenSSL NID into a more human readable name * @param nid
[Openvpn-devel] [PATCH applied] Re: Match ifdef for get_sigtype function with if ifdef of caller
ACK, verified that it fixes the GHA build fails we've seen since the recent LibreSSL upgrade on the MacOS builders.
Your patch has been applied to the master branch.
Not applicable to release/2.6 as the offending code is not in there.
commit ff402c7c2fbc49ff6d352ebdc3cdc4c27c2bbcbb (master)
Author: Arne Schwabe Date: Tue Apr 2 08:36:46 2024 +0200
Match ifdef for get_sigtype function with if ifdef of caller
Signed-off-by: Arne Schwabe <[email protected]...>
Acked-by: Gert Doering <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg28512.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering
cron2 has uploaded a new patch set (#2) to the change originally created by plaisthos. ( http://gerrit.openvpn.net/c/openvpn/+/551?usp=email )
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.
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg28512.html
---
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
src/openvpn/ssl_openssl.c +2 -1
@@ -2166,7 +2166,8 @@EVP_PKEY_free (pkey); } -#if !defined(LIBRESSL_VERSION_NUMBER ) &&OPENSSL_VERSION_NUMBER >=0x1010000fL +#if (!defined(LIBRESSL_VERSION_NUMBER ) &&OPENSSL_VERSION_NUMBER >=0x1010000fL ) \ + || (defined(LIBRESSL_VERSION_NUMBER ) &&LIBRESSL_VERSION_NUMBER >=0x3090000fL )/** * Translate an OpenSSL NID into a more human readable name * @param nid
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/551?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I5b14bf90bb07935f0bb84373ec4e62352752c03f
Gerrit-Change-Number: 551
Gerrit-PatchSet: 2
Gerrit-Owner: plaisthos <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: newpatchset
cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/551?usp=email )
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.
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg28512.html
---
M src/openvpn/ssl_openssl.c
1 file changed, 2 insertions(+), 1 deletion(-)
src/openvpn/ssl_openssl.c +2 -1
@@ -2166,7 +2166,8 @@EVP_PKEY_free (pkey); } -#if !defined(LIBRESSL_VERSION_NUMBER ) &&OPENSSL_VERSION_NUMBER >=0x1010000fL +#if (!defined(LIBRESSL_VERSION_NUMBER ) &&OPENSSL_VERSION_NUMBER >=0x1010000fL ) \ + || (defined(LIBRESSL_VERSION_NUMBER ) &&LIBRESSL_VERSION_NUMBER >=0x3090000fL )/** * Translate an OpenSSL NID into a more human readable name * @param nid
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/551?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I5b14bf90bb07935f0bb84373ec4e62352752c03f
Gerrit-Change-Number: 551
Gerrit-PatchSet: 2
Gerrit-Owner: plaisthos <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: merged