[sr-dev] git:master:cffd8bd8: tls: condition on libressl version for declaring BIO data functions

Daniel-Constantin Mierla miconda at gmail.com
Wed Apr 25 14:10:20 CEST 2018


Module: kamailio
Branch: master
Commit: cffd8bd88f140487db8149184e15e08ff3d71f44
URL: https://github.com/kamailio/kamailio/commit/cffd8bd88f140487db8149184e15e08ff3d71f44

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date: 2018-04-25T14:08:00+02:00

tls: condition on libressl version for declaring BIO data functions

- it is required only for LIBRESSL_VERSION_NUMBER < 0x20700000L
- fixes compilation on Alpine linux
- part of GH #1511

---

Modified: src/modules/tls/tls_bio.c

---

Diff:  https://github.com/kamailio/kamailio/commit/cffd8bd88f140487db8149184e15e08ff3d71f44.diff
Patch: https://github.com/kamailio/kamailio/commit/cffd8bd88f140487db8149184e15e08ff3d71f44.patch

---

diff --git a/src/modules/tls/tls_bio.c b/src/modules/tls/tls_bio.c
index 567ed6f563..beb177399d 100644
--- a/src/modules/tls/tls_bio.c
+++ b/src/modules/tls/tls_bio.c
@@ -85,6 +85,8 @@ static void *CRYPTO_zalloc(size_t num, const char *file, int line)
 	return ret;
 }
 # define OPENSSL_zalloc(num) CRYPTO_zalloc(num, __FILE__, __LINE__)
+
+#if LIBRESSL_VERSION_NUMBER < 0x20700000L
 static void *BIO_get_data(BIO *b)
 {
 	return b->ptr;
@@ -97,6 +99,8 @@ static void BIO_set_init(BIO *b, int init)
 {
 	b->init = init;
 }
+#endif
+
 #else
 static BIO_METHOD *tls_mbuf_method = NULL;
 #endif




More information about the sr-dev mailing list