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

Compare commits

base: AMajor:e532519f83657fcb8a11742ff42f3210426d07e8
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:fe5a0de159d4cfdbc6641c1a471a55423cbabf54
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

8 Commits
e532519f83 ... fe5a0de159

Author SHA1 Message Date
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
Ilya Shipitsin
b8fbb3e3d8
Merge pull request #2025 from chipitsine/fedora_pull_request 
CI: enable Fedora Rawgide on pull requests
 2024-07-03 23:43:19 +02:00
Ilia Shipitsin
98a8d5249d CI: enable Fedora Rawgide on pull requests 2024-07-03 23:21:44 +02:00
Ilya Shipitsin
dd2a53e049
Merge pull request #2024 from chipitsine/master 
bump version for upcoming 5186 release
 2024-07-03 21:16:01 +02:00
Ilia Shipitsin
7ce9c088ff bump version for upcoming 5186 release 2024-07-03 19:20:14 +02:00
4 changed files with 6 additions and 3 deletions
Show Stats Expand all files Collapse all files

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

@ -4,6 +4,7 @@ on:
schedule: schedule:
- cron: "0 0 25 * *" - cron: "0 0 25 * *"
push: push:
pull_request:
workflow_dispatch: workflow_dispatch:
permissions: permissions:
@ -22,7 +23,7 @@ jobs:
- name: Install dependencies - name: Install dependencies
run: | 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 - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v4

2
CMakeLists.txt
View File

@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.10)
set(BUILD_NUMBER CACHE STRING "The number of the current build.") set(BUILD_NUMBER CACHE STRING "The number of the current build.")
if ("${BUILD_NUMBER}" STREQUAL "") if ("${BUILD_NUMBER}" STREQUAL "")
set(BUILD_NUMBER "5185") set(BUILD_NUMBER "5186")
endif() endif()
if (BUILD_NUMBER LESS 5180) if (BUILD_NUMBER LESS 5180)

2
CMakeSettings.json
View File

@ -1,5 +1,5 @@
{ {
"environments": [ { "BuildNumber": "5185" } ], "environments": [ { "BuildNumber": "5186" } ],
"configurations": [ "configurations": [
{ {
"name": "x64-native", "name": "x64-native",

2
src/Mayaqua/Encrypt.c
View File

@ -20,7 +20,9 @@
#include <openssl/ssl.h> #include <openssl/ssl.h>
#include <openssl/err.h> #include <openssl/err.h>
#include <openssl/rand.h> #include <openssl/rand.h>
#ifndef OPENSSL_NO_ENGINE
#include <openssl/engine.h> #include <openssl/engine.h>
#endif
#include <openssl/bio.h> #include <openssl/bio.h>
#include <openssl/x509.h> #include <openssl/x509.h>
#include <openssl/pkcs7.h> #include <openssl/pkcs7.h>