mirror of
https://github.com/SoftEtherVPN/SoftEtherVPN.git
synced 2025-07-08 00:34:57 +03:00
Merge PR #485: Encrypt: use OpenSSL's EVP interface, which supports AES-NI without the need of another library
This commit is contained in:
@ -1770,8 +1770,8 @@ void GetServerCapsMain(SERVER *s, CAPSLIST *t)
|
||||
// UDP acceleration feature
|
||||
AddCapsBool(t, "b_support_udp_acceleration", true);
|
||||
|
||||
// Intel AES Acceleration function
|
||||
AddCapsBool(t, "b_support_intel_aes", IsIntelAesNiSupported());
|
||||
// AES acceleration function
|
||||
AddCapsBool(t, "b_support_aes_ni", IsAesNiSupported());
|
||||
|
||||
#ifdef OS_WIN32
|
||||
// SeLow driver
|
||||
@ -5946,9 +5946,6 @@ void SiLoadServerCfg(SERVER *s, FOLDER *f)
|
||||
// Disable the NAT-traversal feature
|
||||
s->DisableNatTraversal = CfgGetBool(f, "DisableNatTraversal");
|
||||
|
||||
// Intel AES
|
||||
s->DisableIntelAesAcceleration = CfgGetBool(f, "DisableIntelAesAcceleration");
|
||||
|
||||
if (s->Cedar->Bridge == false)
|
||||
{
|
||||
// Enable the VPN-over-ICMP
|
||||
@ -6372,9 +6369,6 @@ void SiWriteServerCfg(FOLDER *f, SERVER *s)
|
||||
CfgAddBool(f, "EnableVpnOverDns", s->EnableVpnOverDns);
|
||||
}
|
||||
|
||||
// Intel AES
|
||||
CfgAddBool(f, "DisableIntelAesAcceleration", s->DisableIntelAesAcceleration);
|
||||
|
||||
if (c->Bridge == false)
|
||||
{
|
||||
OPENVPN_SSTP_CONFIG config;
|
||||
@ -10982,12 +10976,6 @@ SERVER *SiNewServerEx(bool bridge, bool in_client_inner_server, bool relay_serve
|
||||
SetFifoCurrentReallocMemSize(MEM_FIFO_REALLOC_MEM_SIZE);
|
||||
|
||||
|
||||
if (s->DisableIntelAesAcceleration)
|
||||
{
|
||||
// Disable the Intel AES acceleration
|
||||
DisableIntelAesAccel();
|
||||
}
|
||||
|
||||
// Raise the priority
|
||||
if (s->NoHighPriorityProcess == false)
|
||||
{
|
||||
|
@ -293,7 +293,6 @@ struct SERVER
|
||||
bool DisableNatTraversal; // Disable the NAT-traversal feature
|
||||
bool EnableVpnOverIcmp; // VPN over ICMP is enabled
|
||||
bool EnableVpnOverDns; // VPN over DNS is enabled
|
||||
bool DisableIntelAesAcceleration; // Disable the Intel AES acceleration
|
||||
bool NoMoreSave; // Do not save any more
|
||||
bool EnableConditionalAccept; // Apply the Conditional Accept the Listener
|
||||
bool EnableLegacySSL; // Enable Legacy SSL
|
||||
|
Reference in New Issue
Block a user