From 755e09e5c1f68a886c7b3960d9dfd2c9fc57ccf4 Mon Sep 17 00:00:00 2001
From: Davide Beatrici <git@davidebeatrici.dev>
Date: Mon, 27 Jul 2020 03:54:14 +0200
Subject: [PATCH] Don't include OpenSSL headers in vpndrvinst.c

The inclusion of the headers is probably a very old leftover, from when OpenSSL was not encapsulated into Mayaqua yet.

In fact, there was a "HAM_C" (defined in vpndrvinst.c) definition check in Mayaqua/Encrypt.h preventing the redefinition of OpenSSL types.
---
 src/Mayaqua/MayaType.h      |  2 +-
 src/vpndrvinst/vpndrvinst.c | 13 -------------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/src/Mayaqua/MayaType.h b/src/Mayaqua/MayaType.h
index d7390a08..cc29bbed 100644
--- a/src/Mayaqua/MayaType.h
+++ b/src/Mayaqua/MayaType.h
@@ -16,7 +16,7 @@
 #endif	// WINDOWS_H
 
 
-#if	!defined(ENCRYPT_C) && !defined(HAM_C)
+#if	!defined(ENCRYPT_C)
 // Structure which is used by OpenSSL
 typedef struct x509_st X509;
 typedef struct evp_pkey_st EVP_PKEY;
diff --git a/src/vpndrvinst/vpndrvinst.c b/src/vpndrvinst/vpndrvinst.c
index b18421a5..5baf1d7a 100644
--- a/src/vpndrvinst/vpndrvinst.c
+++ b/src/vpndrvinst/vpndrvinst.c
@@ -4,8 +4,6 @@
 
 #include <GlobalConst.h>
 
-#define	HAM_C
-
 #ifdef	WIN32
 #define	HAM_WIN32
 #define	_WIN32_WINNT		0x0502
@@ -27,17 +25,6 @@
 #include <time.h>
 #include <errno.h>
 #include <math.h>
-#include <openssl/ssl.h>
-#include <openssl/err.h>
-#include <openssl/rand.h>
-#include <openssl/engine.h>
-#include <openssl/bio.h>
-#include <openssl/x509.h>
-#include <openssl/pkcs7.h>
-#include <openssl/pkcs12.h>
-#include <openssl/rc4.h>
-#include <openssl/md5.h>
-#include <openssl/sha.h>
 #include <Mayaqua/Mayaqua.h>
 #include <Cedar/Cedar.h>
 #include "vpndrvinst.h"