AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-09-18 01:33:00 +03:00
Code Releases Activity

Don't include OpenSSL headers in vpndrvinst.c

Browse Source 
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.
This commit is contained in:
Davide Beatrici 2020-07-27 03:54:14 +02:00
parent 2cdffffa54
commit 755e09e5c1
2 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mayaqua/MayaType.h
View File

@ -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;

13
src/vpndrvinst/vpndrvinst.c
View File

@ -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"