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

Compare commits

base: AMajor:7f104d925bfe3c4d23bce62e3ea34257ca23f138
Branches Tags
AMajor:master
AMajor:5.02.5187
AMajor:5.02.5186
AMajor:5.02.5185
AMajor:5.02.5184
AMajor:5.02.5183
AMajor:5.02.5182
AMajor:5.02.5181
AMajor:5.02.5180
AMajor:5.02.0
AMajor:5.01.9674
AMajor:5.01.9673
AMajor:5.01.9672
AMajor:5.01.9671
AMajor:5.01.9670
AMajor:5.01.9669
AMajor:5.01.9668
AMajor:5.01.9667
AMajor:5.01.9666
AMajor:5.01.9665
AMajor:5.01.9664
AMajor:5.01.9663
AMajor:5.01.9662
AMajor:5.01.9661
AMajor:5.01.9660
AMajor:5.01.9659
AMajor:5.01.9658
...
compare: AMajor:4889dfe150551c92ac830dcc1a131ca881f1c6b1
Branches Tags
AMajor:master
AMajor:5.02.5187
AMajor:5.02.5186
AMajor:5.02.5185
AMajor:5.02.5184
AMajor:5.02.5183
AMajor:5.02.5182
AMajor:5.02.5181
AMajor:5.02.5180
AMajor:5.02.0
AMajor:5.01.9674
AMajor:5.01.9673
AMajor:5.01.9672
AMajor:5.01.9671
AMajor:5.01.9670
AMajor:5.01.9669
AMajor:5.01.9668
AMajor:5.01.9667
AMajor:5.01.9666
AMajor:5.01.9665
AMajor:5.01.9664
AMajor:5.01.9663
AMajor:5.01.9662
AMajor:5.01.9661
AMajor:5.01.9660
AMajor:5.01.9659
AMajor:5.01.9658

7 Commits
7f104d925b ... 4889dfe150

Author SHA1 Message Date
siddharth-narayan
4889dfe150
Merge d4d20e4443 into c76f11a523 2024-07-04 17:56:29 +00:00
Siddharth
d4d20e4443 Remove testing code 2024-07-04 13:56:13 -04: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
a45219bb78 Revert "Fix engine include errors on Fedora Rawhide" 
This reverts commit 1d57ccf94a.
 2024-07-04 13:15:50 -04: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
Siddharth
1d57ccf94a Fix engine include errors on Fedora Rawhide 2024-07-04 06:55:06 -04:00
3 changed files with 4 additions and 8 deletions
Show Stats Expand all files Collapse all files

2
.github/workflows/fedora-rawhide.yml vendored
View File

@ -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 }}

6
src/Mayaqua/CMakeLists.txt
View File

@ -91,9 +91,6 @@ if(WIN32)
add_subdirectory(3rdparty/oqs-provider)
target_include_directories(oqsprovider PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/3rdparty/liboqs/include)
get_target_property(target_include_dirs oqsprovider INCLUDE_DIRECTORIES)
message("Include directories for target_name: ${target_include_dirs}")
set_property(TARGET oqsprovider PROPERTY POSITION_INDEPENDENT_CODE ON)
target_link_libraries(mayaqua PRIVATE oqsprovider)
endif()
@ -128,9 +125,6 @@ if(UNIX)
add_subdirectory(3rdparty/oqs-provider)
target_include_directories(oqsprovider PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/3rdparty/liboqs/include)
get_target_property(target_include_dirs oqsprovider INCLUDE_DIRECTORIES)
message("Include directories for target_name: ${target_include_dirs}")
set_property(TARGET oqsprovider PROPERTY POSITION_INDEPENDENT_CODE ON)
target_link_libraries(mayaqua PRIVATE oqsprovider)
endif()

2
src/Mayaqua/Encrypt.c
View File

@ -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>