diff --git a/src/http.c b/src/http.c index 99fa8c0..c01310c 100644 --- a/src/http.c +++ b/src/http.c @@ -1517,7 +1517,7 @@ static long op_bio_retry_ctrl(BIO *_b,int _cmd,long _num,void *_ptr){ return ret; } -# if OPENSSL_VERSION_NUMBER<0x10100000L +# if OPENSSL_VERSION_NUMBER<0x10100000L || LIBRESSL_VERSION_NUMBER<=0x2040100fL # define BIO_set_data(_b,_ptr) ((_b)->ptr=(_ptr)) # define BIO_set_init(_b,_init) ((_b)->init=(_init)) # endif @@ -1535,7 +1535,7 @@ static int op_bio_retry_free(BIO *_b){ return _b!=NULL; } -# if OPENSSL_VERSION_NUMBER<0x10100000L +# if OPENSSL_VERSION_NUMBER<0x10100000L || LIBRESSL_VERSION_NUMBER<=0x2040100fL /*This is not const because OpenSSL doesn't allow it, even though it won't write to it.*/ static BIO_METHOD op_bio_retry_method={ @@ -1556,7 +1556,7 @@ static BIO_METHOD op_bio_retry_method={ proxying https URL requests.*/ static int op_http_conn_establish_tunnel(OpusHTTPStream *_stream, OpusHTTPConn *_conn,op_sock _fd,SSL *_ssl_conn,BIO *_ssl_bio){ -# if OPENSSL_VERSION_NUMBER>=0x10100000L +# if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) BIO_METHOD *bio_retry_method; # endif BIO *retry_bio; @@ -1569,7 +1569,7 @@ static int op_http_conn_establish_tunnel(OpusHTTPStream *_stream, ret=op_http_conn_write_fully(_conn, _stream->proxy_connect.buf,_stream->proxy_connect.nbuf); if(OP_UNLIKELY(ret<0))return ret; -# if OPENSSL_VERSION_NUMBER>=0x10100000L +# if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) bio_retry_method=BIO_meth_new(BIO_TYPE_NULL,"retry"); if(bio_retry_method==NULL)return OP_EFAULT; BIO_meth_set_write(bio_retry_method,op_bio_retry_write); @@ -1592,7 +1592,7 @@ static int op_http_conn_establish_tunnel(OpusHTTPStream *_stream, /*This shouldn't succeed, since we can't read yet.*/ OP_ALWAYS_TRUE(SSL_connect(_ssl_conn)<0); SSL_set_bio(_ssl_conn,_ssl_bio,_ssl_bio); -# if OPENSSL_VERSION_NUMBER>=0x10100000L +# if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) BIO_meth_free(bio_retry_method); # endif /*Only now do we disable write coalescing, to allow the CONNECT @@ -2231,7 +2231,7 @@ static int op_http_stream_open(OpusHTTPStream *_stream,const char *_url, /*Initialize the SSL library if necessary.*/ if(OP_URL_IS_SSL(&_stream->url)&&_stream->ssl_ctx==NULL){ SSL_CTX *ssl_ctx; -# if OPENSSL_VERSION_NUMBER<0x10100000L +# if OPENSSL_VERSION_NUMBER<0x10100000L || LIBRESSL_VERSION_NUMBER<=0x2040100fL # if !defined(OPENSSL_NO_LOCKING) /*The documentation says SSL_library_init() is not reentrant. We don't want to add our own depenencies on a threading library, and it