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

Merge pull request #1448 from neheb/eng

fix compilation without OpenSSL engines
This commit is contained in:
Ilya Shipitsin 2021-08-08 08:38:02 +05:00 committed by GitHub
commit b6d31af188
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -3128,6 +3128,7 @@ 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)
{ {
#ifndef OPENSSL_NO_ENGINE
K *k; K *k;
#if OPENSSL_API_COMPAT < 0x10100000L #if OPENSSL_API_COMPAT < 0x10100000L
ENGINE_load_dynamic(); ENGINE_load_dynamic();
@ -3140,6 +3141,9 @@ 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;
#else
return NULL;
#endif
} }
// Convert the BUF to a K // Convert the BUF to a K