Merge 48f6bc57cc into c76f11a523

Merge pull request #2026 from siddharth-narayan/fedora-fix-engine
Fix openssl engine support on Fedora Rawhide
2024-11-25 02:49:52 +03:00 · 2024-07-10 14:17:51 +08:00 · 2024-07-04 19:26:11 +02:00 · 2024-07-04 13:05:30 -04:00 · 2024-07-04 13:02:16 -04:00 · 2024-06-22 23:43:23 +09:00
3 changed files with 4 additions and 2 deletions
--- a/.github/workflows/fedora-rawhide.yml
+++ b/.github/workflows/fedora-rawhide.yml
@ -25,7 +25,7 @@ jobs:
        submodules: true
    - name: Install dependencies
      run: |
-        dnf -y install git cmake ncurses-devel openssl-devel libsodium-devel readline-devel zlib-devel gcc-c++ clang
+        dnf -y install git cmake ncurses-devel openssl-devel-engine libsodium-devel readline-devel zlib-devel gcc-c++ clang
    - name: Compile with ${{ matrix.cc }}
      run: |
        export CC=${{ matrix.cc }}
--- a/README.md
+++ b/README.md
@ -201,7 +201,7 @@ Also SoftEther VPN [Stable Edition](https://www.freshports.org/security/softethe

 ## For Windows

-[Nightly builds](https://dev.azure.com/SoftEther-VPN/SoftEther%20VPN/_build?definitionId=6)
+[Nightly builds](https://github.com/SoftEtherVPN/SoftEtherVPN/releases)
 (choose appropriate platform, then find binaries or installers as artifacts)

 ## From binary installers (stable channel)
--- a/src/Mayaqua/Encrypt.c
+++ b/src/Mayaqua/Encrypt.c
@ -20,7 +20,9 @@
 #include <openssl/ssl.h>
 #include <openssl/err.h>
 #include <openssl/rand.h>
+#ifndef OPENSSL_NO_ENGINE
 #include <openssl/engine.h>
+#endif
 #include <openssl/bio.h>
 #include <openssl/x509.h>
 #include <openssl/pkcs7.h>
Author	SHA1	Message	Date
Minpyo Kim	8e7c4c005a	Merge `48f6bc57cc` into `c76f11a523`	2024-07-10 14:17:51 +08:00
Ilya Shipitsin	c76f11a523	Merge pull request #2026 from siddharth-narayan/fedora-fix-engine Fix openssl engine support on Fedora Rawhide	2024-07-04 19:26:11 +02:00
siddharth-narayan	25585a1e3d	Guard engine.h include	2024-07-04 13:05:30 -04:00
siddharth-narayan	4370efcc90	replace openssl-devel with openssl-devel-engine	2024-07-04 13:02:16 -04:00
Minpyo Kim	48f6bc57cc	URL for Nightly builds is updated Based on issue #1993, the build has been moved from Azure to Github.	2024-06-22 23:43:23 +09:00