openssl: suppress deprecated API warnings

8 files changed, 12 insertions, 7 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f5d472db..9aee13be 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,6 +7,7 @@ endif ()
 project(accel-ppp C)
 
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -fno-strict-aliasing -D_GNU_SOURCE -fPIC -rdynamic -Wno-unused-result")
+ADD_DEFINITIONS(-DOPENSSL_API_COMPAT=0x10100000L)
 
 IF (NOT DEFINED LIB_SUFFIX)
 	EXECUTE_PROCESS(
diff --git a/accel-pppd/auth/CMakeLists.txt b/accel-pppd/auth/CMakeLists.txt
index 7a1eb0b0..0270301a 100644
--- a/accel-pppd/auth/CMakeLists.txt
+++ b/accel-pppd/auth/CMakeLists.txt
@@ -3,7 +3,10 @@ ADD_LIBRARY(auth_chap_md5 SHARED auth_chap_md5.c)
 ADD_LIBRARY(auth_mschap_v1 SHARED auth_mschap_v1.c)
 ADD_LIBRARY(auth_mschap_v2 SHARED auth_mschap_v2.c)
 
+TARGET_LINK_LIBRARIES(auth_chap_md5 ${crypto_lib})
+TARGET_LINK_LIBRARIES(auth_mschap_v1 ${crypto_lib})
+TARGET_LINK_LIBRARIES(auth_mschap_v2 ${crypto_lib})
+
 INSTALL(TARGETS auth_pap auth_chap_md5 auth_mschap_v1 auth_mschap_v2
 	LIBRARY DESTINATION lib${LIB_SUFFIX}/accel-ppp
 )
-
diff --git a/accel-pppd/ctrl/l2tp/CMakeLists.txt b/accel-pppd/ctrl/l2tp/CMakeLists.txt
index 66dd3fc6..80cf453b 100644
--- a/accel-pppd/ctrl/l2tp/CMakeLists.txt
+++ b/accel-pppd/ctrl/l2tp/CMakeLists.txt
@@ -8,10 +8,10 @@ ADD_LIBRARY(l2tp SHARED
 	packet.c
 	#	netlink.c
 )
+TARGET_LINK_LIBRARIES(l2tp ${crypto_lib})
 #TARGET_LINK_LIBRARIES(l2tp nl nl-genl)
 
 INSTALL(TARGETS l2tp LIBRARY DESTINATION lib${LIB_SUFFIX}/accel-ppp)
 
 FILE(GLOB dict "${CMAKE_CURRENT_SOURCE_DIR}/dict/*")
 INSTALL(FILES ${dict} DESTINATION share/accel-ppp/l2tp)
-
diff --git a/accel-pppd/ctrl/pppoe/CMakeLists.txt b/accel-pppd/ctrl/pppoe/CMakeLists.txt
index b6f4a98f..92733b74 100644
--- a/accel-pppd/ctrl/pppoe/CMakeLists.txt
+++ b/accel-pppd/ctrl/pppoe/CMakeLists.txt
@@ -15,9 +15,9 @@ ENDIF(RADIUS)
 ADD_LIBRARY(pppoe SHARED ${sources})
 # if MUSL is set then we need to link with the connlimit library
 IF (MUSL)
-	TARGET_LINK_LIBRARIES(pppoe vlan-mon connlimit)
+	TARGET_LINK_LIBRARIES(pppoe vlan-mon connlimit ${crypto_lib})
 ELSE (MUSL)
-	TARGET_LINK_LIBRARIES(pppoe vlan-mon)
+	TARGET_LINK_LIBRARIES(pppoe vlan-mon ${crypto_lib})
 ENDIF (MUSL)
 set_property(TARGET pppoe PROPERTY CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
 set_property(TARGET pppoe PROPERTY INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/accel-ppp)
diff --git a/accel-pppd/ctrl/sstp/CMakeLists.txt b/accel-pppd/ctrl/sstp/CMakeLists.txt
index 3cb1799c..3a79526f 100644
--- a/accel-pppd/ctrl/sstp/CMakeLists.txt
+++ b/accel-pppd/ctrl/sstp/CMakeLists.txt
@@ -2,6 +2,6 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
 ADD_LIBRARY(sstp SHARED sstp.c)
 
-TARGET_LINK_LIBRARIES(sstp util)
+TARGET_LINK_LIBRARIES(sstp util ${crypto_lib})
 
 INSTALL(TARGETS sstp LIBRARY DESTINATION lib${LIB_SUFFIX}/accel-ppp)
diff --git a/accel-pppd/extra/CMakeLists.txt b/accel-pppd/extra/CMakeLists.txt
index 6b5beaff..08466f24 100644
--- a/accel-pppd/extra/CMakeLists.txt
+++ b/accel-pppd/extra/CMakeLists.txt
@@ -5,6 +5,7 @@ set_property(TARGET pppd_compat PROPERTY INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/l
 ADD_LIBRARY(ippool SHARED ippool.c)
 ADD_LIBRARY(ipv6pool SHARED ipv6pool.c)
 ADD_LIBRARY(chap-secrets SHARED chap-secrets.c)
+TARGET_LINK_LIBRARIES(chap-secrets ${crypto_lib})
 ADD_LIBRARY(logwtmp SHARED logwtmp.c)
 TARGET_LINK_LIBRARIES(logwtmp util)
 ADD_LIBRARY(connlimit SHARED connlimit.c)
diff --git a/accel-pppd/main.c b/accel-pppd/main.c
index dcbbc0a4..515b8036 100644
--- a/accel-pppd/main.c
+++ b/accel-pppd/main.c
@@ -73,12 +73,11 @@ static void ssl_lock_init(void)
 
 static void openssl_init(void)
 {
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
 	SSL_library_init();
 	SSL_load_error_strings();
 	OpenSSL_add_all_algorithms();
 	OpenSSL_add_all_digests();
-
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
 	ssl_lock_init();
 #endif
 }
diff --git a/accel-pppd/radius/CMakeLists.txt b/accel-pppd/radius/CMakeLists.txt
index a0c0d534..3ce72648 100644
--- a/accel-pppd/radius/CMakeLists.txt
+++ b/accel-pppd/radius/CMakeLists.txt
@@ -22,6 +22,7 @@ ENDIF ()
 ADD_DEFINITIONS(-DDICTIONARY="${CMAKE_INSTALL_PREFIX}/share/accel-ppp/radius/dictionary")
 
 ADD_LIBRARY(radius SHARED ${sources})
+TARGET_LINK_LIBRARIES(radius ${crypto_lib})
 set_property(TARGET radius PROPERTY CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
 set_property(TARGET radius PROPERTY INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/accel-ppp)