src/lib/socket.c: fix build with libressl >= 3.5.0#253
Open
ffontaine wants to merge 1 commit intowahern:masterfrom
Open
src/lib/socket.c: fix build with libressl >= 3.5.0#253ffontaine wants to merge 1 commit intowahern:masterfrom
ffontaine wants to merge 1 commit intowahern:masterfrom
Conversation
Fix the following build failure with libressl >= 3.5.0:
/nvmedata/autobuild/instance-26/output-1/build/lua-cqueues-20200726/src/lib/socket.c: In function 'compat_SSL_is_server':
/nvmedata/autobuild/instance-26/output-1/build/lua-cqueues-20200726/src/lib/socket.c:188:12: error: invalid use of incomplete typedef 'SSL' {aka 'struct ssl_st'}
188 | return ssl->server != NULL;
| ^~
/nvmedata/autobuild/instance-26/output-1/build/lua-cqueues-20200726/src/lib/socket.c: At top level:
/nvmedata/autobuild/instance-26/output-1/build/lua-cqueues-20200726/src/lib/socket.c:2543:1: error: variable 'bio_methods' has initializer but incomplete type
2543 | static BIO_METHOD bio_methods = {
| ^~~~~~
Fixes:
- http://autobuild.buildroot.org/results/823c9e27cdb8e01a048cb751287c01c5dc70f860
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
daurnimator
reviewed
Jul 4, 2022
|
|
||
| static BIO_METHOD *so_get_bio_methods() { | ||
| if (bio_methods == NULL) { | ||
| #ifndef LIBRESSL_VERSION_NUMBER |
Collaborator
There was a problem hiding this comment.
What libressl feature is this checking for?
It should be more explicit.
|
i just ran into this as well, and it's preventing cqueues from working on OpenBSD. i took an alternate approach that still calls bio_methods_init, with an approach lifted from public domain code in exim (https://github.com/Exim/exim/blob/13835a3c1e057efad7da269c0f93bf2eac850205/src/src/dane-openssl.c#L1684). i can send a different PR for this if it looks ok, @daurnimator. side note, i tried to run diff --git a/src/lib/socket.c b/src/lib/socket.c
index 10b230d..959ee9b 100644
--- a/src/lib/socket.c
+++ b/src/lib/socket.c
@@ -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(2,7,0))
#endif
#ifndef HAVE_SSL_UP_REF
@@ -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(2,8,0)
static BIO_METHOD bio_methods = {
BIO_TYPE_SOURCE_SINK,
"struct socket*",
@@ -2557,6 +2557,36 @@ static BIO_METHOD *so_get_bio_methods() {
return &bio_methods;
} /* so_get_bio_methods() */
#else
+
+/* LibreSSL lacks CRYPTO_ONCE and friends */
+#ifndef CRYPTO_ONCE
+#define CRYPTO_ONCE volatile int
+#define CRYPTO_ONCE_STATIC_INIT 0
+#define CRYPTO_THREAD_run_once run_once
+static void
+run_once(volatile int * once, void (*init)(void))
+{
+int wlock = 0;
+
+CRYPTO_r_lock(CRYPTO_LOCK_SSL_CTX);
+if (!*once)
+ {
+ CRYPTO_r_unlock(CRYPTO_LOCK_SSL_CTX);
+ CRYPTO_w_lock(CRYPTO_LOCK_SSL_CTX);
+ wlock = 1;
+ if (!*once)
+ {
+ *once = 1;
+ init();
+ }
+ }
+if (wlock)
+ CRYPTO_w_unlock(CRYPTO_LOCK_SSL_CTX);
+else
+ CRYPTO_r_unlock(CRYPTO_LOCK_SSL_CTX);
+}
+#endif
+
static BIO_METHOD *bio_methods = NULL;
static CRYPTO_ONCE bio_methods_init_once = CRYPTO_ONCE_STATIC_INIT; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fix the following build failure with libressl >= 3.5.0:
Fixes:
Signed-off-by: Fabrice Fontaine fontaine.fabrice@gmail.com