cleaning

Makefile.in

@@ -16,7 +16,7 @@ SERVERTURN_HEADERS = src/server/ns_turn_allocation.h src/server/ns_turn_ioalib.h
 SERVERTURN_DEPS = ${LIBCLIENTTURN_HEADERS} ${SERVERTURN_HEADERS} ${MAKE_DEPS} 
 SERVERTURN_MODS = ${LIBCLIENTTURN_MODS} src/server/ns_turn_allocation.c src/server/ns_turn_maps_rtcp.c src/server/ns_turn_maps.c src/server/ns_turn_server.c
 
-COMMON_HEADERS = src/apps/common/apputils.h src/apps/common/ns_turn_utils.h src/apps/common/stun_buffer.h
+COMMON_HEADERS = src/apps/common/apputils.h src/apps/common/ns_turn_openssl.h src/apps/common/ns_turn_utils.h src/apps/common/stun_buffer.h
 COMMON_MODS = src/apps/common/apputils.c src/apps/common/ns_turn_utils.c src/apps/common/stun_buffer.c
 COMMON_DEPS = ${LIBCLIENTTURN_DEPS} ${COMMON_MODS} ${COMMON_HEADERS}
 

src/apps/common/apputils.h

@@ -33,17 +33,12 @@
 
 #include <event2/event.h>
 
-#include <openssl/ssl.h>
+#include "ns_turn_openssl.h"
 
 #include "ns_turn_ioaddr.h"
 #include "ns_turn_msg_defs.h"
 #include "ns_turn_ioalib.h"
 
-#if (defined LIBRESSL_VERSION_NUMBER && OPENSSL_VERSION_NUMBER == 0x20000000L)
-#undef OPENSSL_VERSION_NUMBER
-#define OPENSSL_VERSION_NUMBER 0x1000107FL
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif

src/apps/common/ns_turn_openssl.h

@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2011, 2012, 2013 Citrix Systems
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef __NST_OPENSSL_LIB__
+#define __NST_OPENSSL_LIB__
+
+#include <openssl/md5.h>
+#include <openssl/hmac.h>
+#include <openssl/ssl.h>
+#include <openssl/bio.h>
+#include <openssl/err.h>
+#include <openssl/rand.h>
+#include <openssl/crypto.h>
+#include <openssl/opensslv.h>
+#include <openssl/dh.h>
+#include <openssl/bn.h>
+
+#if (defined LIBRESSL_VERSION_NUMBER && OPENSSL_VERSION_NUMBER == 0x20000000L)
+#undef OPENSSL_VERSION_NUMBER
+#define OPENSSL_VERSION_NUMBER 0x1000107FL
+#endif
+
+#endif //__NST_OPENSSL_LIB__

src/apps/relay/dtls_listener.c

@@ -34,15 +34,7 @@
 #include "dtls_listener.h"
 #include "ns_ioalib_impl.h"
 
-#include <openssl/ssl.h>
-#include <openssl/bio.h>
-#include <openssl/err.h>
-#include <openssl/rand.h>
-
-#if (defined LIBRESSL_VERSION_NUMBER && OPENSSL_VERSION_NUMBER == 0x20000000L)
-#undef OPENSSL_VERSION_NUMBER
-#define OPENSSL_VERSION_NUMBER 0x1000107FL
-#endif
+#include "ns_turn_openssl.h"
 
 #include <pthread.h>
 

src/apps/relay/mainrelay.h

@@ -59,14 +59,7 @@
 #include <event2/bufferevent.h>
 #include <event2/buffer.h>
 
-#include <openssl/ssl.h>
-#include <openssl/bio.h>
-#include <openssl/err.h>
-#include <openssl/rand.h>
-#include <openssl/crypto.h>
-#include <openssl/opensslv.h>
-#include <openssl/dh.h>
-#include <openssl/bn.h>
+#include "ns_turn_openssl.h"
 
 #include "ns_turn_utils.h"
 #include "ns_turn_khash.h"

src/apps/relay/ns_ioalib_engine_impl.c

@@ -44,7 +44,7 @@
 
 #include <event2/listener.h>
 
-#include <openssl/err.h>
+#include "ns_turn_openssl.h"
 
 #if !defined(TURN_NO_HIREDIS)
 #include "hiredis_libevent2.h"
@@ -54,11 +54,6 @@
 #include TURN_SCTP_INCLUDE
 #endif
 
-#if (defined LIBRESSL_VERSION_NUMBER && OPENSSL_VERSION_NUMBER == 0x20000000L)
-#undef OPENSSL_VERSION_NUMBER
-#define OPENSSL_VERSION_NUMBER 0x1000107FL
-#endif
-
 /* Compilation test:
 #if defined(IP_RECVTTL)
 #undef IP_RECVTTL

src/apps/relay/ns_ioalib_impl.h

@@ -41,7 +41,7 @@
 
 #include <event2/thread.h>
 
-#include <openssl/ssl.h>
+#include "ns_turn_openssl.h"
 
 #include "ns_turn_ioalib.h"
 #include "turn_ports.h"

src/apps/uclient/mainuclient.c

@@ -44,14 +44,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include <openssl/ssl.h>
-#include <openssl/opensslv.h>
-#include <openssl/rand.h>
-
-#if (defined LIBRESSL_VERSION_NUMBER && OPENSSL_VERSION_NUMBER == 0x20000000L)
-#undef OPENSSL_VERSION_NUMBER
-#define OPENSSL_VERSION_NUMBER 0x1000107FL
-#endif
+#include "ns_turn_openssl.h"
 
 /////////////// extern definitions /////////////////////
 

src/apps/uclient/session.h

@@ -40,7 +40,7 @@
 #include "stun_buffer.h"
 #include "apputils.h"
 
-#include <openssl/ssl.h>
+#include "ns_turn_openssl.h"
 
 #ifdef __cplusplus
 extern "C" {

src/apps/uclient/startuclient.c

@@ -37,7 +37,7 @@
 #include "uclient.h"
 #include "session.h"
 
-#include <openssl/err.h>
+#include "ns_turn_openssl.h"
 
 /////////////////////////////////////////
 

src/apps/uclient/uclient.c

@@ -37,8 +37,7 @@
 #include <unistd.h>
 #include <time.h>
 
-#include <openssl/err.h>
-#include <openssl/rand.h>
+#include "ns_turn_openssl.h"
 
 #include <sys/select.h>
 

src/apps/uclient/uclient.h

@@ -35,9 +35,7 @@
 #include "stun_buffer.h"
 #include "session.h"
 
-#include <openssl/ssl.h>
-#include <openssl/dh.h>
-#include <openssl/bn.h>
+#include "ns_turn_openssl.h"
 
 #ifdef __cplusplus
 extern "C" {

src/client/ns_turn_msg.c

@@ -33,16 +33,7 @@
 
 ///////////// Security functions implementation from ns_turn_msg.h ///////////
 
-#include <openssl/md5.h>
-#include <openssl/hmac.h>
-#include <openssl/ssl.h>
-#include <openssl/err.h>
-#include <openssl/rand.h>
-
-#if (defined LIBRESSL_VERSION_NUMBER && OPENSSL_VERSION_NUMBER == 0x20000000L)
-#undef OPENSSL_VERSION_NUMBER
-#define OPENSSL_VERSION_NUMBER 0x1000107FL
-#endif
+#include "ns_turn_openssl.h"
 
 ///////////
 

src/ns_turn_defs.h

@@ -39,11 +39,6 @@
 #include <sys/param.h>
 #endif
 
-#if (defined LIBRESSL_VERSION_NUMBER && OPENSSL_VERSION_NUMBER == 0x20000000L)
-#undef OPENSSL_VERSION_NUMBER
-#define OPENSSL_VERSION_NUMBER 0x1000107FL
-#endif
-
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>