AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-11-24 18:39:53 +03:00
Code Releases Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
Syuugo 2024-07-10 02:41:21 +09:00 committed by GitHub
commit fe5a0de159
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File 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>