[Pkg-voip-commits] [janus] 186/282: Add openssl pre 1.1 api macro
Jonas Smedegaard
dr at jones.dk
Wed Dec 20 21:53:40 UTC 2017
This is an automated email from the git hooks/post-receive script.
js pushed a commit to annotated tag debian/0.2.6-1
in repository janus.
commit 4f35a9942941b5d0ba08f99ad0cf5e7653b462f5
Author: Adam Duskett <aduskett at gmail.com>
Date: Thu Nov 16 10:52:26 2017 -0500
Add openssl pre 1.1 api macro
Instead of repeating the check for OPENSSL_VERSION_NUMBER < 0x10100000L or
defined(LIBRESSL_VERSION_NUMBER) over and over, it's cleaner to add the
checks for LIBRESSL_VERSION_NUMBER in dtls-bio.h and set a new define
JANUS_USE_OPENSSL_PRE_1_1_API if LibreSSL or OpenSSL < 1.1 are being
compiled against.
This will ease the transition to OpenSSL 1.0.2/1.1 support in the future
and will keep the code cleaner and easier to manage.
---
dtls-bio.c | 18 +++++++++---------
dtls-bio.h | 7 +++++++
dtls.c | 6 +++---
3 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/dtls-bio.c b/dtls-bio.c
index 35ea55a..6d3865c 100644
--- a/dtls-bio.c
+++ b/dtls-bio.c
@@ -36,7 +36,7 @@ int janus_dtls_bio_filter_new(BIO *h);
int janus_dtls_bio_filter_free(BIO *data);
/* Filter initialization */
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if JANUS_USE_OPENSSL_PRE_1_1_API
static BIO_METHOD janus_dtls_bio_filter_methods = {
BIO_TYPE_FILTER,
"janus filter",
@@ -53,7 +53,7 @@ static BIO_METHOD janus_dtls_bio_filter_methods = {
static BIO_METHOD *janus_dtls_bio_filter_methods = NULL;
#endif
int janus_dtls_bio_filter_init(void) {
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if JANUS_USE_OPENSSL_PRE_1_1_API
/* No initialization needed for OpenSSL pre-1.1.0 */
#else
janus_dtls_bio_filter_methods = BIO_meth_new(BIO_TYPE_FILTER | BIO_get_new_index(), "janus filter");
@@ -67,7 +67,7 @@ int janus_dtls_bio_filter_init(void) {
return 0;
}
BIO_METHOD *BIO_janus_dtls_filter(void) {
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if JANUS_USE_OPENSSL_PRE_1_1_API
return(&janus_dtls_bio_filter_methods);
#else
return janus_dtls_bio_filter_methods;
@@ -88,7 +88,7 @@ int janus_dtls_bio_filter_new(BIO *bio) {
janus_mutex_init(&filter->mutex);
/* Set the BIO as initialized */
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if JANUS_USE_OPENSSL_PRE_1_1_API
bio->init = 1;
bio->ptr = filter;
bio->flags = 0;
@@ -105,7 +105,7 @@ int janus_dtls_bio_filter_free(BIO *bio) {
return 0;
/* Get rid of the filter state */
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if JANUS_USE_OPENSSL_PRE_1_1_API
janus_dtls_bio_filter *filter = (janus_dtls_bio_filter *)bio->ptr;
#else
janus_dtls_bio_filter *filter = (janus_dtls_bio_filter *)BIO_get_data(bio);
@@ -115,7 +115,7 @@ int janus_dtls_bio_filter_free(BIO *bio) {
filter->packets = NULL;
g_free(filter);
}
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if JANUS_USE_OPENSSL_PRE_1_1_API
bio->ptr = NULL;
bio->init = 0;
bio->flags = 0;
@@ -129,7 +129,7 @@ int janus_dtls_bio_filter_free(BIO *bio) {
int janus_dtls_bio_filter_write(BIO *bio, const char *in, int inl) {
JANUS_LOG(LOG_HUGE, "janus_dtls_bio_filter_write: %p, %d\n", in, inl);
/* Forward data to the write BIO */
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if JANUS_USE_OPENSSL_PRE_1_1_API
long ret = BIO_write(bio->next_bio, in, inl);
#else
long ret = BIO_write(BIO_next(bio), in, inl);
@@ -137,7 +137,7 @@ int janus_dtls_bio_filter_write(BIO *bio, const char *in, int inl) {
JANUS_LOG(LOG_HUGE, " -- %ld\n", ret);
/* Keep track of the packet, as we'll advertize them one by one after a pending check */
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if JANUS_USE_OPENSSL_PRE_1_1_API
janus_dtls_bio_filter *filter = (janus_dtls_bio_filter *)bio->ptr;
#else
janus_dtls_bio_filter *filter = (janus_dtls_bio_filter *)BIO_get_data(bio);
@@ -164,7 +164,7 @@ long janus_dtls_bio_filter_ctrl(BIO *bio, int cmd, long num, void *ptr) {
return 0L;
case BIO_CTRL_PENDING: {
/* We only advertize one packet at a time, as they may be fragmented */
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if JANUS_USE_OPENSSL_PRE_1_1_API
janus_dtls_bio_filter *filter = (janus_dtls_bio_filter *)bio->ptr;
#else
janus_dtls_bio_filter *filter = (janus_dtls_bio_filter *)BIO_get_data(bio);
diff --git a/dtls-bio.h b/dtls-bio.h
index f3bb697..f30521b 100644
--- a/dtls-bio.h
+++ b/dtls-bio.h
@@ -14,6 +14,7 @@
#ifndef _JANUS_DTLS_BIO_H
#define _JANUS_DTLS_BIO_H
+#include <openssl/opensslv.h>
#include <openssl/err.h>
#include <openssl/ssl.h>
@@ -33,4 +34,10 @@ BIO_METHOD *BIO_janus_dtls_filter(void);
*/
void janus_dtls_bio_filter_set_mtu(int start_mtu);
+#if defined(LIBRESSL_VERSION_NUMBER)
+#define JANUS_USE_OPENSSL_PRE_1_1_API (1)
+#else
+#define JANUS_USE_OPENSSL_PRE_1_1_API (OPENSSL_VERSION_NUMBER < 0x10100000L)
+#endif
+
#endif
diff --git a/dtls.c b/dtls.c
index c2c28d3..25a5aa1 100644
--- a/dtls.c
+++ b/dtls.c
@@ -105,7 +105,7 @@ void *janus_dtls_sctp_setup_thread(void *data);
#endif
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if JANUS_USE_OPENSSL_PRE_1_1_API
/*
* DTLS locking stuff to make OpenSSL thread safe (not needed for 1.1.0)
*
@@ -308,7 +308,7 @@ error:
/* DTLS-SRTP initialization */
gint janus_dtls_srtp_init(const char* server_pem, const char* server_key) {
const char *crypto_lib = NULL;
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if JANUS_USE_OPENSSL_PRE_1_1_API
#if defined(LIBRESSL_VERSION_NUMBER)
crypto_lib = "LibreSSL";
#else
@@ -331,7 +331,7 @@ gint janus_dtls_srtp_init(const char* server_pem, const char* server_key) {
JANUS_LOG(LOG_INFO, "Crypto: %s\n", crypto_lib);
/* Go on and create the DTLS context */
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if JANUS_USE_OPENSSL_PRE_1_1_API
ssl_ctx = SSL_CTX_new(DTLSv1_method());
#else
ssl_ctx = SSL_CTX_new(DTLS_method());
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/janus.git
More information about the Pkg-voip-commits
mailing list