walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Compile with libressl >= 3.5

This commit is contained in:
Tatsuhiro Tsujikawa 2022-06-08 19:58:12 +09:00
parent 0d1894ecbb
commit f38d9f8cf6
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/shrpx_connection.cc
View File

@ -44,13 +44,13 @@ using namespace nghttp2;
namespace shrpx { namespace shrpx {
#if !LIBRESSL_2_7_API && !OPENSSL_1_1_API #if !LIBRESSL_3_5_API && !LIBRESSL_2_7_API && !OPENSSL_1_1_API
void *BIO_get_data(BIO *bio) { return bio->ptr; } void *BIO_get_data(BIO *bio) { return bio->ptr; }
void BIO_set_data(BIO *bio, void *ptr) { bio->ptr = ptr; } void BIO_set_data(BIO *bio, void *ptr) { bio->ptr = ptr; }
void BIO_set_init(BIO *bio, int init) { bio->init = init; } void BIO_set_init(BIO *bio, int init) { bio->init = init; }
#endif // !LIBRESSL_2_7_API && !OPENSSL_1_1_API #endif // !LIBRESSL_3_5_API && !LIBRESSL_2_7_API && !OPENSSL_1_1_API
Connection::Connection(struct ev_loop *loop, int fd, SSL *ssl, Connection::Connection(struct ev_loop *loop, int fd, SSL *ssl,
MemchunkPool *mcpool, ev_tstamp write_timeout, MemchunkPool *mcpool, ev_tstamp write_timeout,
@ -259,14 +259,14 @@ long shrpx_bio_ctrl(BIO *b, int cmd, long num, void *ptr) {
namespace { namespace {
int shrpx_bio_create(BIO *b) { int shrpx_bio_create(BIO *b) {
#if OPENSSL_1_1_API #if OPENSSL_1_1_API || LIBRESSL_3_5_API
BIO_set_init(b, 1); BIO_set_init(b, 1);
#else // !OPENSSL_1_1_API #else // !OPENSSL_1_1_API && !LIBRESSL_3_5_API
b->init = 1; b->init = 1;
b->num = 0; b->num = 0;
b->ptr = nullptr; b->ptr = nullptr;
b->flags = 0; b->flags = 0;
#endif // !OPENSSL_1_1_API #endif // !OPENSSL_1_1_API && !LIBRESSL_3_5_API
return 1; return 1;
} }
} // namespace } // namespace
@ -277,17 +277,17 @@ int shrpx_bio_destroy(BIO *b) {
return 0; return 0;
} }
#if !OPENSSL_1_1_API #if !OPENSSL_1_1_API && !LIBRESSL_3_5_API
b->ptr = nullptr; b->ptr = nullptr;
b->init = 0; b->init = 0;
b->flags = 0; b->flags = 0;
#endif // !OPENSSL_1_1_API #endif // !OPENSSL_1_1_API && !LIBRESSL_3_5_API
return 1; return 1;
} }
} // namespace } // namespace
#if OPENSSL_1_1_API #if OPENSSL_1_1_API || LIBRESSL_3_5_API
BIO_METHOD *create_bio_method() { BIO_METHOD *create_bio_method() {
auto meth = BIO_meth_new(BIO_TYPE_FD, "nghttpx-bio"); auto meth = BIO_meth_new(BIO_TYPE_FD, "nghttpx-bio");
@ -302,7 +302,7 @@ BIO_METHOD *create_bio_method() {
return meth; return meth;
} }
#else // !OPENSSL_1_1_API #else // !OPENSSL_1_1_API && !LIBRESSL_3_5_API
BIO_METHOD *create_bio_method() { BIO_METHOD *create_bio_method() {
static auto meth = new BIO_METHOD{ static auto meth = new BIO_METHOD{
@ -314,7 +314,7 @@ BIO_METHOD *create_bio_method() {
return meth; return meth;
} }
#endif // !OPENSSL_1_1_API #endif // !OPENSSL_1_1_API && !LIBRESSL_3_5_API
void Connection::set_ssl(SSL *ssl) { void Connection::set_ssl(SSL *ssl) {
tls.ssl = ssl; tls.ssl = ssl;

2
src/ssl_compat.h
View File

@ -33,6 +33,7 @@
# define LIBRESSL_IN_USE 1 # define LIBRESSL_IN_USE 1
# define LIBRESSL_LEGACY_API (LIBRESSL_VERSION_NUMBER < 0x20700000L) # define LIBRESSL_LEGACY_API (LIBRESSL_VERSION_NUMBER < 0x20700000L)
# define LIBRESSL_2_7_API (LIBRESSL_VERSION_NUMBER >= 0x20700000L) # define LIBRESSL_2_7_API (LIBRESSL_VERSION_NUMBER >= 0x20700000L)
# define LIBRESSL_3_5_API (LIBRESSL_VERSION_NUMBER >= 0x30500000L)
# else // !LIBRESSL_VERSION_NUMBER # else // !LIBRESSL_VERSION_NUMBER
# define OPENSSL_1_1_API (OPENSSL_VERSION_NUMBER >= 0x1010000fL) # define OPENSSL_1_1_API (OPENSSL_VERSION_NUMBER >= 0x1010000fL)
# define OPENSSL_1_1_1_API (OPENSSL_VERSION_NUMBER >= 0x10101000L) # define OPENSSL_1_1_1_API (OPENSSL_VERSION_NUMBER >= 0x10101000L)
@ -40,6 +41,7 @@
# define LIBRESSL_IN_USE 0 # define LIBRESSL_IN_USE 0
# define LIBRESSL_LEGACY_API 0 # define LIBRESSL_LEGACY_API 0
# define LIBRESSL_2_7_API 0 # define LIBRESSL_2_7_API 0
# define LIBRESSL_3_5_API 0
# endif // !LIBRESSL_VERSION_NUMBER # endif // !LIBRESSL_VERSION_NUMBER
#endif // OPENSSL_COMPAT_H #endif // OPENSSL_COMPAT_H