diff options
| author | Rosen Penev <rosenp@gmail.com> | 2021-08-20 08:25:31 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-20 08:25:31 -0700 |
| commit | 3096840aef15adf3de144e2cd7dbe91d0c35aef2 (patch) | |
| tree | d05bb780097f8e7357426fe239d128a9d278a4d3 | |
| parent | 84058b3980a5be03e1c2422aa9d61e2a963644db (diff) | |
| parent | 3e9295546e87fd80c583af6c3cfd7448015ad33e (diff) | |
Merge pull request #16379 from neheb/sft
softethervpn5: fix compilation without engines
| -rw-r--r-- | net/softethervpn5/patches/010-engines.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/net/softethervpn5/patches/010-engines.patch b/net/softethervpn5/patches/010-engines.patch new file mode 100644 index 000000000..89898b5f7 --- /dev/null +++ b/net/softethervpn5/patches/010-engines.patch @@ -0,0 +1,30 @@ +From ee3bf7f5079bcad51cc89197b6a9e34da746fc7e Mon Sep 17 00:00:00 2001 +From: Rosen Penev <rosenp@gmail.com> +Date: Sat, 7 Aug 2021 20:05:04 -0700 +Subject: [PATCH] fix compilation without OpenSSL engines + +Signed-off-by: Rosen Penev <rosenp@gmail.com> +--- + src/Mayaqua/Encrypt.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/src/Mayaqua/Encrypt.c ++++ b/src/Mayaqua/Encrypt.c +@@ -3128,6 +3128,7 @@ bool IsEncryptedK(BUF *b, bool private_k +
+ K *OpensslEngineToK(char *key_file_name, char *engine_name)
+ {
++#ifndef OPENSSL_NO_ENGINE
+ K *k;
+ #if OPENSSL_API_COMPAT < 0x10100000L
+ ENGINE_load_dynamic();
+@@ -3140,6 +3141,9 @@ K *OpensslEngineToK(char *key_file_name, + k->pkey = pkey;
+ k->private_key = true;
+ return k;
++#else
++ return NULL;
++#endif
+ }
+
+ // Convert the BUF to a K
|