Merge fe5a0de159 into c76f11a523

Merge branch 'master' into master
Merge pull request #2026 from siddharth-narayan/fedora-fix-engine
2024-11-22 09:29:52 +03:00 · 2024-07-09 17:41:24 +00:00 · 2024-07-10 02:41:21 +09: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
2 changed files with 3 additions and 1 deletions
--- a/.github/workflows/fedora-rawhide.yml
+++ b/.github/workflows/fedora-rawhide.yml
@ -23,7 +23,7 @@ jobs:

    - 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: Checkout
      uses: actions/checkout@v4
--- 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
Syuugo	f2f5f644e3	Merge `fe5a0de159` into `c76f11a523`	2024-07-09 17:41:24 +00:00
Syuugo	fe5a0de159	Merge branch 'master' into master	2024-07-10 02:41:21 +09: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