diff options
| author | Dmitry Kozlov <xeb@mail.ru> | 2013-10-30 16:19:33 +0400 |
|---|---|---|
| committer | Dmitry Kozlov <xeb@mail.ru> | 2013-10-30 16:19:44 +0400 |
| commit | 286cbc87fff9344ff85db0efd54c41f619509c74 (patch) | |
| tree | 6e356ee6a15835903b91ba869f7e953a7e5838c6 /accel-pppd | |
| parent | 68b7256c31e4efcb613854d73571edcca13fcd6e (diff) | |
| download | accel-ppp-286cbc87fff9344ff85db0efd54c41f619509c74.tar.gz accel-ppp-286cbc87fff9344ff85db0efd54c41f619509c74.zip | |
fix build with internal & tomcrypt crypto libraries
Signed-off-by: Vladislav Grishenko <themiron@mail.ru>
Diffstat (limited to 'accel-pppd')
| -rw-r--r-- | accel-pppd/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | accel-pppd/auth/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | accel-pppd/ctrl/pppoe/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | accel-pppd/extra/chap-secrets.c | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/accel-pppd/CMakeLists.txt b/accel-pppd/CMakeLists.txt index af9e5f4f..7a016eff 100644 --- a/accel-pppd/CMakeLists.txt +++ b/accel-pppd/CMakeLists.txt @@ -1,3 +1,4 @@ +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden") ADD_DEFINITIONS(-DPTHREAD_SPINLOCK) INCLUDE_DIRECTORIES(include) diff --git a/accel-pppd/auth/CMakeLists.txt b/accel-pppd/auth/CMakeLists.txt index f93d9e35..7a1eb0b0 100644 --- a/accel-pppd/auth/CMakeLists.txt +++ b/accel-pppd/auth/CMakeLists.txt @@ -3,10 +3,6 @@ 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/pppoe/CMakeLists.txt b/accel-pppd/ctrl/pppoe/CMakeLists.txt index fad9efd0..dc65aa41 100644 --- a/accel-pppd/ctrl/pppoe/CMakeLists.txt +++ b/accel-pppd/ctrl/pppoe/CMakeLists.txt @@ -12,6 +12,5 @@ SET(sources ${sources} tr101.c) ENDIF(RADIUS) ADD_LIBRARY(pppoe SHARED ${sources}) -TARGET_LINK_LIBRARIES(pppoe ${crypto_lib}) INSTALL(TARGETS pppoe LIBRARY DESTINATION lib${LIB_SUFFIX}/accel-ppp) diff --git a/accel-pppd/extra/chap-secrets.c b/accel-pppd/extra/chap-secrets.c index d2d752a2..21edcbdb 100644 --- a/accel-pppd/extra/chap-secrets.c +++ b/accel-pppd/extra/chap-secrets.c @@ -30,11 +30,13 @@ static int conf_netmask; static void *pd_key; static struct ipdb_t ipdb; +#ifdef CRYPTO_OPENSSL struct hash_chain { struct list_head entry; const EVP_MD *md; }; +#endif struct cs_pd_t { @@ -44,7 +46,9 @@ struct cs_pd_t char *rate; }; +#ifdef CRYPTO_OPENSSL static LIST_HEAD(hash_chain); +#endif static char *skip_word(char *ptr) { |