Skip to content

Commit

Permalink
CI: get rid of travis-ci coverity wrapper
Browse files Browse the repository at this point in the history
  • Loading branch information
chipitsine committed Aug 8, 2023
1 parent f6f2660 commit 6bb3ebf
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 10 deletions.
33 changes: 23 additions & 10 deletions .github/workflows/coverity.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,13 @@ on:
schedule:
- cron: "0 0 * * *"

permissions:
contents: read

jobs:
scan:
runs-on: ubuntu-latest
if: ${{ github.repository_owner == 'SoftEtherVPN' }}
env:
COVERITY_SCAN_PROJECT_NAME: 'SoftEtherVPN/SoftEtherVPN'
COVERITY_SCAN_BRANCH_PATTERN: '*'
COVERITY_SCAN_NOTIFICATION_EMAIL: '[email protected]'
COVERITY_SCAN_BUILD_COMMAND_PREPEND: "./configure"
COVERITY_SCAN_BUILD_COMMAND: "make -C build"
steps:
- uses: actions/checkout@v2
with:
Expand All @@ -23,8 +20,24 @@ jobs:
run: |
sudo apt-get update
sudo apt-get install -y cmake gcc g++ libncurses5-dev libreadline-dev libssl-dev make zlib1g-dev libsodium-dev
- name: Run Coverity Scan
env:
COVERITY_SCAN_TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
- name: Download Coverity build tool
run: |
wget -c -N https://scan.coverity.com/download/linux64 --post-data "token=${{ secrets.COVERITY_SCAN_TOKEN }}&project=SoftEtherVPN%2FSoftEtherVPN" -O coverity_tool.tar.gz
mkdir coverity_tool
tar xzf coverity_tool.tar.gz --strip 1 -C coverity_tool
- name: Configure
run: |
./configure
- name: Build with Coverity build tool
run: |
export PATH=`pwd`/coverity_tool/bin:$PATH
cov-build --dir cov-int make -C build
- name: Submit build result to Coverity Scan
run: |
curl -fsSL "https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh" | bash || true
tar czvf cov.tar.gz cov-int
curl --form token=${{ secrets.COVERITY_SCAN_TOKEN }} \
--form [email protected] \
--form [email protected] \
--form version="Commit $GITHUB_SHA" \
--form description="Build submitted via CI" \
https://scan.coverity.com/builds?project=SoftEtherVPN%2FSoftEtherVPN
8 changes: 8 additions & 0 deletions src/Mayaqua/Network.c
Original file line number Diff line number Diff line change
Expand Up @@ -5724,6 +5724,10 @@ SSL_PIPE *NewSslPipeEx3(bool server_mode, X *x, K *k, LIST *chain, DH_CTX *dh, b
SSL_PIPE *s;
SSL *ssl;
SSL_CTX *ssl_ctx = NewSSLCtx(server_mode);
if (ssl_ctx == NULL)
{
return NULL;
}

Lock(openssl_lock);
{
Expand Down Expand Up @@ -11727,6 +11731,10 @@ bool StartSSLEx3(SOCK *sock, X *x, K *priv, LIST *chain, UINT ssl_timeout, char
}

ssl_ctx = NewSSLCtx(sock->ServerMode);
if (ssl_ctx == NULL)
{
return false;
}

Lock(openssl_lock);
{
Expand Down

0 comments on commit 6bb3ebf

Please sign in to comment.