Mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-04-28 19:57:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

add config options to disable aes/avx

Browse source
This commit is contained in:
R4SAS 2020-11-11 14:59:57 +03:00
parent b1f4c71765
commit 8e5392784d
7 changed files with 24 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
daemon/Daemon.cpp
View file

@ -128,7 +128,9 @@ namespace i2p
LogPrint(eLogDebug, "FS: data directory: ", datadir);
bool precomputation; i2p::config::GetOption("precomputation.elgamal", precomputation);
i2p::crypto::InitCrypto (precomputation);
bool aesni; i2p::config::GetOption("aesni", aesni);
bool avx; i2p::config::GetOption("avx", avx);
i2p::crypto::InitCrypto (precomputation, aesni, avx);
int netID; i2p::config::GetOption("netid", netID);
i2p::context.SetNetID (netID);

6
libi2pd/CPU.cpp
View file

@ -27,7 +27,7 @@ namespace cpu
bool aesni = false;
bool avx = false;
void Detect()
void Detect(bool AesSwitch, bool AvxSwitch)
{
#if defined(__x86_64__) || defined(__i386__)
__builtin_cpu_init();
@ -35,10 +35,10 @@ namespace cpu
__cpuid(0, info[0], info[1], info[2], info[3]);
if (info[0] >= 0x00000001) {
__cpuid(0x00000001, info[0], info[1], info[2], info[3]);
if (__builtin_cpu_supports("aes")) {
if (__builtin_cpu_supports("aes") && AesSwitch) {
aesni = info[2] & bit_AES; // AESNI
}
if (__builtin_cpu_supports("avx")) {
if (__builtin_cpu_supports("avx") && AvxSwitch) {
avx = info[2] & bit_AVX; // AVX
}
}

2
libi2pd/CPU.h
View file

@ -16,7 +16,7 @@ namespace cpu
extern bool aesni;
extern bool avx;
void Detect();
void Detect(bool AesSwitch, bool AvxSwitch);
}
}

12
libi2pd/Config.cpp
View file

@ -47,11 +47,11 @@ namespace config {
("ifname", value<std::string>()->default_value(""), "Network interface to bind to")
("ifname4", value<std::string>()->default_value(""), "Network interface to bind to for ipv4")
("ifname6", value<std::string>()->default_value(""), "Network interface to bind to for ipv6")
("nat", value<bool>()->default_value(true), "Should we assume we are behind NAT? (default: enabled)")
("nat", bool_switch()->default_value(true), "Should we assume we are behind NAT? (default: enabled)")
("port", value<uint16_t>()->default_value(0), "Port to listen for incoming connections (default: auto)")
("ipv4", value<bool>()->default_value(true), "Enable communication through ipv4 (default: enabled)")
("ipv4", bool_switch()->default_value(true), "Enable communication through ipv4 (default: enabled)")
("ipv6", bool_switch()->default_value(false), "Enable communication through ipv6 (default: disabled)")
("reservedrange", value<bool>()->default_value(true), "Check remote RI for being in blacklist of reserved IP ranges (default: enabled)")
("reservedrange", bool_switch()->default_value(true), "Check remote RI for being in blacklist of reserved IP ranges (default: enabled)")
("netid", value<int>()->default_value(I2PD_NET_ID), "Specify NetID. Main I2P is 2")
("daemon", bool_switch()->default_value(false), "Router will go to background after start (default: disabled)")
("service", bool_switch()->default_value(false), "Router will use system folders like '/var/lib/i2pd' (default: disabled)")
@ -59,9 +59,11 @@ namespace config {
("floodfill", bool_switch()->default_value(false), "Router will be floodfill (default: disabled)")
("bandwidth", value<std::string>()->default_value(""), "Bandwidth limit: integer in KBps or letters: L (32), O (256), P (2048), X (>9000)")
("share", value<int>()->default_value(100), "Limit of transit traffic from max bandwidth in percents. (default: 100)")
("ntcp", value<bool>()->default_value(false), "Ignored. Always false")
("ssu", value<bool>()->default_value(true), "Enable SSU transport (default: enabled)")
("ntcp", bool_switch()->default_value(false), "Ignored. Always false")
("ssu", bool_switch()->default_value(true), "Enable SSU transport (default: enabled)")
("ntcpproxy", value<std::string>()->default_value(""), "Ignored")
("aesni", bool_switch()->default_value(true), "Use auto detection for AESNI CPU extensions. If false, AESNI will be not used")
("avx", bool_switch()->default_value(true), "Use auto detection for AVX CPU extensions. If false, AVX will be not used")
#ifdef _WIN32
("svcctl", value<std::string>()->default_value(""), "Windows service management ('install' or 'remove')")
("insomnia", bool_switch()->default_value(false), "Prevent system from sleeping (default: disabled)")

4
libi2pd/Crypto.cpp
View file

@ -1345,9 +1345,9 @@ namespace crypto
}
}*/
void InitCrypto (bool precomputation)
void InitCrypto (bool precomputation, bool aesni, bool avx)
{
i2p::cpu::Detect ();
i2p::cpu::Detect (aesni, avx);
#if LEGACY_OPENSSL
SSL_library_init ();
#endif

2
libi2pd/Crypto.h
View file

@ -319,7 +319,7 @@ namespace crypto
};
// init and terminate
void InitCrypto (bool precomputation);
void InitCrypto (bool precomputation, bool aesni, bool avx);
void TerminateCrypto ();
}
}

4
libi2pd/api.cpp
View file

@ -37,7 +37,9 @@ namespace api
i2p::fs::Init();
bool precomputation; i2p::config::GetOption("precomputation.elgamal", precomputation);
i2p::crypto::InitCrypto (precomputation);
bool aesni; i2p::config::GetOption("aesni", aesni);
bool avx; i2p::config::GetOption("avx", avx);
i2p::crypto::InitCrypto (precomputation, aesni, avx);
int netID; i2p::config::GetOption("netid", netID);
i2p::context.SetNetID (netID);