From 9739251101bffde2c62ba08c1869eb170d952d5b Mon Sep 17 00:00:00 2001
From: Kozlov Dmitry <xeb@mail.ru>
Date: Sat, 3 Sep 2011 21:40:34 +0400
Subject: implemented crypto library selection:
 -DCRYPTO=OPENSSL|TOMCRYPT|INTERNAL (default OPENSSL)

---
 accel-pppd/ctrl/pppoe/CMakeLists.txt | 6 +++++-
 accel-pppd/ctrl/pppoe/pppoe.c        | 3 +--
 accel-pppd/ctrl/pppoe/pppoe.h        | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'accel-pppd/ctrl')

diff --git a/accel-pppd/ctrl/pppoe/CMakeLists.txt b/accel-pppd/ctrl/pppoe/CMakeLists.txt
index b2c0584..a38cfb2 100644
--- a/accel-pppd/ctrl/pppoe/CMakeLists.txt
+++ b/accel-pppd/ctrl/pppoe/CMakeLists.txt
@@ -12,6 +12,10 @@ SET(sources ${sources} tr101.c)
 ENDIF(RADIUS)
 
 ADD_LIBRARY(pppoe SHARED ${sources})
-TARGET_LINK_LIBRARIES(pppoe crypto)
+TARGET_LINK_LIBRARIES(pppoe ${crypto_lib})
+#set_property(TARGET pppoe PROPERTY CMAKE_SKIP_BUILD_RPATH FALSE)
+#set_property(TARGET pppoe PROPERTY CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+#set_property(TARGET pppoe PROPERTY INSTALL_RPATH_USE_LINK_PATH FALSE)
+#set_property(TARGET pppoe PROPERTY INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib/accel-ppp)
 
 INSTALL(TARGETS pppoe LIBRARY DESTINATION lib/accel-ppp)
diff --git a/accel-pppd/ctrl/pppoe/pppoe.c b/accel-pppd/ctrl/pppoe/pppoe.c
index 9293403..4d04f07 100644
--- a/accel-pppd/ctrl/pppoe/pppoe.c
+++ b/accel-pppd/ctrl/pppoe/pppoe.c
@@ -13,7 +13,7 @@
 #include <arpa/inet.h>
 #include <printf.h>
 
-#include <openssl/md5.h>
+#include "crypto.h"
 
 #include "events.h"
 #include "triton.h"
@@ -459,7 +459,6 @@ static void generate_cookie(struct pppoe_serv_t *serv, const uint8_t *src, uint8
 		uint8_t raw[24];
 	} u1, u2;
 
-	memset(&key, 0, sizeof(key));
 	DES_random_key(&key);
 	DES_set_key(&key, &ks);
 
diff --git a/accel-pppd/ctrl/pppoe/pppoe.h b/accel-pppd/ctrl/pppoe/pppoe.h
index 2264dd1..b8c7281 100644
--- a/accel-pppd/ctrl/pppoe/pppoe.h
+++ b/accel-pppd/ctrl/pppoe/pppoe.h
@@ -3,11 +3,11 @@
 
 #include <pthread.h>
 
-#include <openssl/des.h>
-
 #include <linux/if.h>
 #include <linux/if_pppox.h>
 
+#include "crypto.h"
+
 /* PPPoE codes */
 #define CODE_PADI           0x09
 #define CODE_PADO           0x07
-- 
cgit v1.2.3