Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

include/ssl_compat.h: fix build with libressl >= 3.5.0 #2435

Merged
merged 1 commit into from
Feb 17, 2023
Merged

include/ssl_compat.h: fix build with libressl >= 3.5.0 #2435

merged 1 commit into from
Feb 17, 2023

Conversation

ffontaine
Copy link
Contributor

Fix the following build failure with libressl >= 3.5.0:

In file included from /tmp/instance-10/output-1/build/mariadb-10.3.36/vio/viosslfactories.c:18: /tmp/instance-10/output-1/build/mariadb-10.3.36/vio/viosslfactories.c: In function 'get_dh2048': /tmp/instance-10/output-1/build/mariadb-10.3.36/include/ssl_compat.h:68:45: error: invalid use of incomplete typedef 'DH' {aka 'struct dh_st'}
   68 | #define DH_set0_pqg(D,P,Q,G)            ((D)->p= (P), (D)->g= (G))
      |                                             ^~

Fixes:

Signed-off-by: Fabrice Fontaine fontaine.fabrice@gmail.com

@CLAassistant
Copy link

CLAassistant commented Jan 15, 2023

CLA assistant check
All committers have signed the CLA.

@grooverdan
Copy link
Member

10.3 branch is currently closed to important fixes so I triggered a build against 10.4. If its stable can you rebase this on 10.4 and edit the base in the github PR title to be 10.4 too.

@ffontaine ffontaine changed the base branch from 11.0 to 10.4 February 8, 2023 09:48
@ffontaine ffontaine changed the base branch from 10.4 to 11.0 February 8, 2023 09:51
@grooverdan
Copy link
Member

Sorry, wasn't clear, both a git rebase --onto origin/10.4 HEAD^; git push -f and a editing of the target branch in GH is required.

@ffontaine ffontaine changed the base branch from 11.0 to 10.4 February 14, 2023 09:53
Fix the following build failure with libressl >= 3.5.0:

In file included from /tmp/instance-10/output-1/build/mariadb-10.3.36/vio/viosslfactories.c:18:
/tmp/instance-10/output-1/build/mariadb-10.3.36/vio/viosslfactories.c: In function 'get_dh2048':
/tmp/instance-10/output-1/build/mariadb-10.3.36/include/ssl_compat.h:68:45: error: invalid use of incomplete typedef 'DH' {aka 'struct dh_st'}
   68 | #define DH_set0_pqg(D,P,Q,G)            ((D)->p= (P), (D)->g= (G))
      |                                             ^~

Fixes:
 - http://autobuild.buildroot.org/results/524198344aafca58d214537af64c5961c407b0f8

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
@LinuxJedi LinuxJedi merged commit 9ab16e7 into MariaDB:10.4 Feb 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

4 participants