AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-11-22 17:39:53 +03:00
Code Releases Activity

Change from unix only implementation to all os and skip ENGINE_load_dynamic if oss is 1.1.0 or later

Browse Source
This commit is contained in:
mcallist 2020-10-09 09:58:34 +02:00
parent 1e164ecc4e
commit d1ad4196bb
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Mayaqua/Encrypt.c
View File

@ -3114,11 +3114,11 @@ bool IsEncryptedK(BUF *b, bool private_key)
K *OpensslEngineToK(char *key_file_name, char *engine_name) K *OpensslEngineToK(char *key_file_name, char *engine_name)
{ {
#ifdef UNIX_LINUX
#if OPENSSL_API_COMPAT < 0x10100000L
K *k; K *k;
#if OPENSSL_API_COMPAT < 0x10100000L
ENGINE_load_dynamic(); ENGINE_load_dynamic();
ENGINE *engine = ENGINE_by_id("tpm2tss"); #endif // OPENSSL_API_COMPAT >= 0x10100000L
ENGINE *engine = ENGINE_by_id(engine_name);
ENGINE_init(engine); ENGINE_init(engine);
EVP_PKEY *pkey; EVP_PKEY *pkey;
pkey = ENGINE_load_private_key(engine, key_file_name, NULL, NULL); pkey = ENGINE_load_private_key(engine, key_file_name, NULL, NULL);
@ -3126,10 +3126,6 @@ K *OpensslEngineToK(char *key_file_name, char *engine_name)
k->pkey = pkey; k->pkey = pkey;
k->private_key = true; k->private_key = true;
return k; return k;
#endif // OPENSSL_API_COMPAT >= 0x10100000L
#else
return NULL;
#endif // UNIX_LINUX
} }
// Convert the BUF to a K // Convert the BUF to a K