Skip to content

Commit 2eb81bf

Browse files
Merge pull request #2 from sophos/feature/NCL-1834--upgrade-openvpn-for-Sophos-Connect-Client-to-2.6.10
NCL-1834 : Address CVEs which affect - OpenVPN: 2.0 - 2.6.9
2 parents b1f8a8d + 30bb1aa commit 2eb81bf

File tree

386 files changed

+8958
-7103
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

386 files changed

+8958
-7103
lines changed

.github/workflows/build.yaml

Lines changed: 93 additions & 185 deletions
Large diffs are not rendered by default.

.github/workflows/coverity-scan.yml

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
name: coverity-scan
2+
on:
3+
schedule:
4+
- cron: '0 20 * * *' # Daily at 20:00 UTC
5+
workflow_dispatch:
6+
7+
jobs:
8+
latest:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: Check submission cache
12+
id: check_submit
13+
uses: actions/cache/restore@v4
14+
with:
15+
path: |
16+
cov-int
17+
key: check-submit-${{ github.sha }}
18+
19+
- name: Install dependencies
20+
if: steps.check_submit.outputs.cache-hit != 'true'
21+
run: sudo apt update && sudo apt install -y liblzo2-dev libpam0g-dev liblz4-dev libcap-ng-dev libnl-genl-3-dev linux-libc-dev man2html libcmocka-dev python3-docutils libtool automake autoconf libssl-dev libpkcs11-helper1-dev softhsm2 gnutls-bin
22+
23+
- name: Checkout OpenVPN
24+
if: steps.check_submit.outputs.cache-hit != 'true'
25+
uses: actions/checkout@v4
26+
27+
- name: Download Coverity Build Tool
28+
if: steps.check_submit.outputs.cache-hit != 'true'
29+
run: |
30+
wget -q https://scan.coverity.com/download/cxx/linux64 --post-data "token=$TOKEN&project=OpenVPN%2Fopenvpn" -O cov-analysis-linux64.tar.gz
31+
mkdir cov-analysis-linux64
32+
tar xzf cov-analysis-linux64.tar.gz --strip 1 -C cov-analysis-linux64
33+
env:
34+
TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
35+
36+
- name: autoconf
37+
if: steps.check_submit.outputs.cache-hit != 'true'
38+
run: autoreconf -fvi
39+
- name: configure
40+
if: steps.check_submit.outputs.cache-hit != 'true'
41+
run: ./configure --enable-pkcs11
42+
43+
- name: Build with cov-build
44+
if: steps.check_submit.outputs.cache-hit != 'true'
45+
run: |
46+
PATH=`pwd`/cov-analysis-linux64/bin:$PATH
47+
cov-build --dir cov-int make
48+
49+
- name: Submit the result to Coverity Scan
50+
if: steps.check_submit.outputs.cache-hit != 'true'
51+
run: |
52+
tar czvf openvpn.tgz cov-int
53+
curl --form token=$TOKEN \
54+
--form email=$EMAIL \
55+
56+
--form version="$GITHUB_SHA" \
57+
--form description="master" \
58+
https://scan.coverity.com/builds?project=OpenVPN%2Fopenvpn
59+
env:
60+
TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
61+
EMAIL: ${{ secrets.COVERITY_SCAN_EMAIL }}
62+
63+
- name: Cache submission
64+
if: steps.check_submit.outputs.cache-hit != 'true'
65+
uses: actions/cache/save@v4
66+
with:
67+
path: |
68+
cov-int
69+
key: ${{ steps.check_submit.outputs.cache-primary-key }}

.gitignore

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,8 @@
1010
*.idb
1111
*.suo
1212
*.ncb
13-
*.vcproj.*
14-
*.vcxproj.user
15-
*.sln.cache
1613
*.log
17-
Release
18-
Debug
19-
Win32-Output
14+
out
2015
.vs
2116
.deps
2217
.libs
@@ -44,12 +39,8 @@ m4/ltoptions.m4
4439
m4/ltsugar.m4
4540
m4/ltversion.m4
4641
m4/lt~obsolete.m4
47-
vcpkg_installed
4842

4943
version.sh
50-
msvc-env-local.bat
51-
config-msvc-local.h
52-
config-msvc-version.h
5344
doc/openvpn-examples.5
5445
doc/openvpn-examples.5.html
5546
doc/openvpn.8
@@ -61,17 +52,12 @@ distro/systemd/*.service
6152
sample/sample-keys/sample-ca/
6253
vendor/cmocka_build
6354
vendor/dist
64-
build/msvc/msvc-generate/version.m4
6555

6656
tests/t_client.sh
6757
tests/t_client-*-20??????-??????/
6858
t_client.rc
6959
t_client_ips.rc
7060
tests/unit_tests/**/*_testdriver
71-
tests/unit_tests/engine-key/client.key
72-
tests/unit_tests/engine-key/log.txt
73-
tests/unit_tests/engine-key/openssl.cnf
74-
tests/unit_tests/engine-key/passwd
7561

7662
src/openvpn/openvpn
7763
include/openvpn-plugin.h

.travis.yml

Lines changed: 0 additions & 126 deletions
This file was deleted.

.travis/build-check.sh

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)