telephony/baresip/re: fix build with opaque HMAC_CTX and BIO_METHOD
in LibreSSL 3.5.
This commit is contained in:
parent
ebf1d683da
commit
3f2ce0d07a
@ -1,10 +1,12 @@
|
||||
# $OpenBSD: Makefile,v 1.22 2021/06/15 06:51:31 landry Exp $
|
||||
# $OpenBSD: Makefile,v 1.23 2021/12/04 21:30:04 tb Exp $
|
||||
|
||||
COMMENT = portable library for real-time communications
|
||||
|
||||
GH_ACCOUNT = baresip
|
||||
GH_PROJECT = re
|
||||
GH_TAGNAME = v2.0.1
|
||||
REVISION = 0
|
||||
|
||||
SHARED_LIBS = re 6.0
|
||||
CATEGORIES += devel
|
||||
|
||||
|
27
telephony/baresip/re/patches/patch-src_hmac_openssl_hmac_c
Normal file
27
telephony/baresip/re/patches/patch-src_hmac_openssl_hmac_c
Normal file
@ -0,0 +1,27 @@
|
||||
$OpenBSD: patch-src_hmac_openssl_hmac_c,v 1.1 2021/12/04 21:30:04 tb Exp $
|
||||
|
||||
Fix build with opaque HMAC_CTX in LibreSSL 3.5.
|
||||
|
||||
Index: src/hmac/openssl/hmac.c
|
||||
--- src/hmac/openssl/hmac.c.orig
|
||||
+++ src/hmac/openssl/hmac.c
|
||||
@@ -20,8 +20,7 @@ static void destructor(void *arg)
|
||||
{
|
||||
struct hmac *hmac = arg;
|
||||
|
||||
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \
|
||||
- !defined(LIBRESSL_VERSION_NUMBER)
|
||||
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
|
||||
|
||||
if (hmac->ctx)
|
||||
HMAC_CTX_free(hmac->ctx);
|
||||
@@ -61,8 +60,7 @@ int hmac_create(struct hmac **hmacp, enum hmac_hash ha
|
||||
if (!hmac)
|
||||
return ENOMEM;
|
||||
|
||||
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \
|
||||
- !defined(LIBRESSL_VERSION_NUMBER)
|
||||
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
|
||||
|
||||
hmac->ctx = HMAC_CTX_new();
|
||||
if (!hmac->ctx) {
|
18
telephony/baresip/re/patches/patch-src_tls_openssl_tls_h
Normal file
18
telephony/baresip/re/patches/patch-src_tls_openssl_tls_h
Normal file
@ -0,0 +1,18 @@
|
||||
$OpenBSD: patch-src_tls_openssl_tls_h,v 1.1 2021/12/04 21:30:04 tb Exp $
|
||||
|
||||
Fix build with opaque BIO_METHOD in LibreSSL 3.5.
|
||||
|
||||
Index: src/tls/openssl/tls.h
|
||||
--- src/tls/openssl/tls.h.orig
|
||||
+++ src/tls/openssl/tls.h
|
||||
@@ -17,10 +17,6 @@
|
||||
#define TLS_BIO_OPAQUE 1
|
||||
#endif
|
||||
|
||||
-#if defined (LIBRESSL_VERSION_NUMBER)
|
||||
-#undef TLS_BIO_OPAQUE
|
||||
-#endif
|
||||
-
|
||||
|
||||
#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \
|
||||
!defined(LIBRESSL_VERSION_NUMBER)
|
Loading…
x
Reference in New Issue
Block a user