Skip to content

src/lib/socket.c: fix build with libressl >= 3.5.0 #253

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.

Sign up for GitHub

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

Open
ffontaine wants to merge 1 commit into
base: master
Choose a base branch
from
Open

src/lib/socket.c: fix build with libressl >= 3.5.0 #253

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/lib/socket.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ int socket_v_api(void) {
#endif

#ifndef HAVE_SSL_IS_SERVER
#define HAVE_SSL_IS_SERVER OPENSSL_PREREQ(1,1,0)
#define HAVE_SSL_IS_SERVER (OPENSSL_PREREQ(1,1,0) || LIBRESSL_PREREQ(3,5,0))
#endif

#ifndef HAVE_SSL_UP_REF
Expand Down Expand Up @@ -2539,7 +2539,7 @@ static int bio_destroy(BIO *bio) {
return 1;
} /* bio_destroy() */

#if !OPENSSL_PREREQ(1,1,0)
#if !OPENSSL_PREREQ(1,1,0) && !LIBRESSL_PREREQ(3,5,0)
static BIO_METHOD bio_methods = {
BIO_TYPE_SOURCE_SINK,
"struct socket*",
Expand All @@ -2559,7 +2559,9 @@ static BIO_METHOD *so_get_bio_methods() {
#else
static BIO_METHOD *bio_methods = NULL;

#ifndef LIBRESSL_VERSION_NUMBER
static CRYPTO_ONCE bio_methods_init_once = CRYPTO_ONCE_STATIC_INIT;
#endif

static void bio_methods_init(void) {
int type = BIO_get_new_index();
Expand All @@ -2580,7 +2582,9 @@ static void bio_methods_init(void) {

static BIO_METHOD *so_get_bio_methods() {
if (bio_methods == NULL) {
#ifndef LIBRESSL_VERSION_NUMBER
Copy link
Collaborator

@daurnimator daurnimator Jul 4, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What libressl feature is this checking for?

It should be more explicit.

CRYPTO_THREAD_run_once(&bio_methods_init_once, bio_methods_init);
#endif
}
return bio_methods;
} /* so_get_bio_methods() */
Expand Down