crypto: Removed internal tomcat crypto.

Signed-off-by: Andrii Melnychenko <a.melnychenko@vyos.io>

13 files changed, 26 insertions, 17 deletions

diff --git a/accel-pppd/auth/auth_chap_md5.c b/accel-pppd/auth/auth_chap_md5.c
index e0820dba..9cfecb7f 100644
--- a/accel-pppd/auth/auth_chap_md5.c
+++ b/accel-pppd/auth/auth_chap_md5.c
@@ -7,7 +7,7 @@
 #include <stdio.h>
 #include <arpa/inet.h>
 
-#include "crypto.h"
+#include <openssl/md5.h>
 
 #include "log.h"
 #include "events.h"
diff --git a/accel-pppd/auth/auth_mschap_v1.c b/accel-pppd/auth/auth_mschap_v1.c
index bddaabf5..909bcc5c 100644
--- a/accel-pppd/auth/auth_mschap_v1.c
+++ b/accel-pppd/auth/auth_mschap_v1.c
@@ -8,7 +8,9 @@
 #include <byteswap.h>
 #include <arpa/inet.h>
 
-#include "crypto.h"
+#include <openssl/md4.h>
+#include <openssl/sha.h>
+#include <openssl/des.h>
 
 #include "log.h"
 #include "ppp.h"
diff --git a/accel-pppd/auth/auth_mschap_v2.c b/accel-pppd/auth/auth_mschap_v2.c
index 3e944500..440a0995 100644
--- a/accel-pppd/auth/auth_mschap_v2.c
+++ b/accel-pppd/auth/auth_mschap_v2.c
@@ -8,7 +8,9 @@
 #include <byteswap.h>
 #include <arpa/inet.h>
 
-#include "crypto.h"
+#include <openssl/md4.h>
+#include <openssl/sha.h>
+#include <openssl/des.h>
 
 #include "log.h"
 #include "ppp.h"
diff --git a/accel-pppd/ctrl/l2tp/l2tp.c b/accel-pppd/ctrl/l2tp/l2tp.c
index ecf66f91..d6807377 100644
--- a/accel-pppd/ctrl/l2tp/l2tp.c
+++ b/accel-pppd/ctrl/l2tp/l2tp.c
@@ -16,6 +16,8 @@
 #include <linux/if_ether.h>
 #include <linux/if_pppox.h>
 
+#include <openssl/md5.h>
+
 #include "triton.h"
 #include "mempool.h"
 #include "log.h"
@@ -24,7 +26,6 @@
 #include "utils.h"
 #include "iprange.h"
 #include "cli.h"
-#include "crypto.h"
 
 #include "connlimit.h"
 
diff --git a/accel-pppd/ctrl/l2tp/packet.c b/accel-pppd/ctrl/l2tp/packet.c
index e2756a7e..1e1488b5 100644
--- a/accel-pppd/ctrl/l2tp/packet.c
+++ b/accel-pppd/ctrl/l2tp/packet.c
@@ -8,7 +8,8 @@
 #include <fcntl.h>
 #include <arpa/inet.h>
 
-#include "crypto.h"
+#include <openssl/md5.h>
+
 #include "triton.h"
 #include "log.h"
 #include "mempool.h"
diff --git a/accel-pppd/ctrl/pppoe/pppoe.c b/accel-pppd/ctrl/pppoe/pppoe.c
index 93412b95..dd70ad00 100644
--- a/accel-pppd/ctrl/pppoe/pppoe.c
+++ b/accel-pppd/ctrl/pppoe/pppoe.c
@@ -15,8 +15,6 @@
 #include <printf.h>
 #endif
 
-#include "crypto.h"
-
 #include "events.h"
 #include "triton.h"
 #include "log.h"
diff --git a/accel-pppd/ctrl/pppoe/pppoe.h b/accel-pppd/ctrl/pppoe/pppoe.h
index 7ba4ac63..2510c320 100644
--- a/accel-pppd/ctrl/pppoe/pppoe.h
+++ b/accel-pppd/ctrl/pppoe/pppoe.h
@@ -6,8 +6,10 @@
 #include <linux/if.h>
 #include <linux/if_pppox.h>
 
+#include <openssl/md5.h>
+#include <openssl/des.h>
+
 #include "rbtree.h"
-#include "crypto.h"
 
 /* PPPoE codes */
 #define CODE_PADI           0x09
diff --git a/accel-pppd/extra/chap-secrets.c b/accel-pppd/extra/chap-secrets.c
index b486bb11..501653be 100644
--- a/accel-pppd/extra/chap-secrets.c
+++ b/accel-pppd/extra/chap-secrets.c
@@ -7,7 +7,10 @@
 #include <arpa/inet.h>
 
 #ifdef CRYPTO_OPENSSL
-#include "crypto.h"
+#include <openssl/md4.h>
+#include <openssl/sha.h>
+#include <openssl/des.h>
+#include <openssl/evp.h>
 #endif
 
 #include "pwdb.h"
diff --git a/accel-pppd/ppp/ppp.c b/accel-pppd/ppp/ppp.c
index 8a4cce7c..2e91c2e4 100644
--- a/accel-pppd/ppp/ppp.c
+++ b/accel-pppd/ppp/ppp.c
@@ -12,8 +12,6 @@
 #include <sys/ioctl.h>
 #include "linux_ppp.h"
 
-#include "crypto.h"
-
 #include "triton.h"
 
 #include "ap_session.h"
diff --git a/accel-pppd/radius/acct.c b/accel-pppd/radius/acct.c
index 1cbd9296..803c9454 100644
--- a/accel-pppd/radius/acct.c
+++ b/accel-pppd/radius/acct.c
@@ -5,9 +5,10 @@
 #include <unistd.h>
 #include <sys/ioctl.h>
 #include <netinet/in.h>
-#include "linux_ppp.h"
 
-#include "crypto.h"
+#include <openssl/md5.h>
+
+#include "linux_ppp.h"
 
 #include "log.h"
 #include "backup.h"
diff --git a/accel-pppd/radius/auth.c b/accel-pppd/radius/auth.c
index 05058547..69f1b2ef 100644
--- a/accel-pppd/radius/auth.c
+++ b/accel-pppd/radius/auth.c
@@ -1,7 +1,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "crypto.h"
+#include <openssl/md5.h>
+#include <openssl/sha.h>
 
 #include "triton.h"
 #include "mempool.h"
diff --git a/accel-pppd/radius/dm_coa.c b/accel-pppd/radius/dm_coa.c
index 8eb45a60..5f4220d1 100644
--- a/accel-pppd/radius/dm_coa.c
+++ b/accel-pppd/radius/dm_coa.c
@@ -10,7 +10,7 @@
 #include <netinet/in.h>
 #include <sys/socket.h>
 
-#include "crypto.h"
+#include <openssl/md5.h>
 
 #include "triton.h"
 #include "events.h"
diff --git a/accel-pppd/radius/serv.c b/accel-pppd/radius/serv.c
index 4af6a67a..9954afd5 100644
--- a/accel-pppd/radius/serv.c
+++ b/accel-pppd/radius/serv.c
@@ -11,14 +11,14 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
+#include <openssl/md5.h>
+
 #include "log.h"
 #include "triton.h"
 #include "events.h"
 #include "cli.h"
 #include "utils.h"
 
-#include "crypto.h"
-
 #include "radius_p.h"
 
 #include "memdebug.h"