Update OpenVPN3 to least version

.clang-format

@@ -0,0 +1,13 @@
+BasedOnStyle: Microsoft
+ColumnLimit: 0
+SortIncludes: Never
+BreakBeforeBinaryOperators: All
+BinPackArguments: False
+BinPackParameters: False
+LambdaBodyIndentation: OuterScope
+IndentCaseBlocks: true
+MaxEmptyLinesToKeep: 3
+BraceWrapping:
+  AfterNamespace: false
+  AfterCaseLabel: true
+  BeforeLambdaBody: true

.dir-locals.el-example

@@ -0,0 +1,10 @@
+; Adapted from https://www.emacswiki.org/emacs/IndentingC
+
+((c++-mode
+  (c-file-style . "stroustrup")
+  (innamespace . -)
+  (inline-open . 0)
+  (inher-cont . c-lineup-multi-inher)
+  (arglist-cont-nonempty . +)
+  (template-args-cont . +))
+)

.git-blame-ignore-revs

@@ -0,0 +1,9 @@
+# This FILE allows git blame to ignore reformatting changes and instead
+# shows the previous commit that changed the line.
+#
+# Use the command below to always ignore specific commits
+#
+#   git config blame.ignoreRevsFile .git-blame-ignore-revs
+
+# First major code style update
+dde1574596aa39e218be4d44a9bfe30e2e458bb4

.gitattributes

@@ -0,0 +1,2 @@
+*.hpp eol=lf
+*.cpp eol=lf

.github/workflows/msbuild.yml

@@ -11,7 +11,6 @@ jobs:
     env:
       VCPKG_ROOT: ${{ github.workspace }}/vcpkg
       BUILD_CONFIGURATION: Release
-      buildDir: '${{ github.workspace }}/build'
 
     runs-on: windows-latest
     steps:
@@ -24,29 +23,64 @@ jobs:
     - name: Restore from cache and install vcpkg
       uses: lukka/run-vcpkg@v6
       with:
-        setupOnly: true
-        vcpkgGitCommitId: 'd8d61c941c333a147edffdcbdc9964dc0c0962f5'
-        additionalCachedPaths: ${{ env.buildDir }}/vcpkg_installed
-        appendedCacheKey: ${{ matrix.arch }}-${{ hashFiles( '**/vcpkg.json' ) }}
+        vcpkgGitCommitId: '36fb23307e10cc6ffcec566c46c4bb3f567c82c6'
+        vcpkgJsonGlob: '**/windows/vcpkg.json'
 
     - name: Run CMake with vcpkg.json manifest
-      uses: lukka/run-cmake@v3
-      env:
-        VCPKG_OVERLAY_PORTS: '${{ github.workspace }}/deps/vcpkg-ports'
+      uses: lukka/run-cmake@v10
       with:
-        useVcpkgToolchainFile: true
-        buildDirectory: '${{ env.buildDir }}'
-        buildWithCMake: true
-        cmakeAppendedArgs: '-DCLI_OVPNDCOWIN=ON'
-        cmakeBuildType: ${{env.BUILD_CONFIGURATION}}
+        configurePreset: win-${{ matrix.arch }}-release
+        buildPreset: win-${{ matrix.arch }}-release
 
     - uses: actions/upload-artifact@v2
       with:
-        name: openvpn3-${{ matrix.arch }}
+        name: openvpn3-msvc-${{ matrix.arch }}
         path: |
-            ${{ env.buildDir }}/**/*.exe
-            ${{ env.buildDir }}/**/*.dll
-            !${{ env.buildDir }}/test/ssl/**
-            !${{ env.buildDir }}/test/unittests/**
-            !${{ env.buildDir }}/CMakeFiles/**
-            !${{ env.buildDir }}/vcpkg_installed/**
+            ${{ github.workspace }}/build/**/*.exe
+            ${{ github.workspace }}/build/**/*.dll
+            !${{ github.workspace }}/build/**/test/ssl/**
+            !${{ github.workspace }}/build/**/test/unittests/**
+            !${{ github.workspace }}/build/**/CMakeFiles/**
+            !${{ github.workspace }}/build/**/vcpkg_installed/**
+  mingw:
+    strategy:
+      matrix:
+        arch: [x86, x64]
+
+    env:
+      VCPKG_ROOT: ${{ github.workspace }}/vcpkg
+
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: lukka/get-cmake@latest
+
+    - name: Install dependencies
+      run: sudo apt update && sudo apt install -y mingw-w64 unzip cmake build-essential
+
+    - name: Restore from cache and install vcpkg
+      uses: lukka/run-vcpkg@v10
+      with:
+        vcpkgGitCommitId: '36fb23307e10cc6ffcec566c46c4bb3f567c82c6'
+        vcpkgJsonGlob: '**/mingw/vcpkg.json'
+
+    - name: Run CMake with vcpkg.json manifest
+      uses: lukka/run-cmake@v10
+      with:
+        configurePreset: mingw-${{ matrix.arch }}-release
+        buildPreset: mingw-${{ matrix.arch }}-release
+
+    - name: List $RUNNER_WORKSPACE after build
+      run: find $RUNNER_WORKSPACE
+      shell: bash
+
+    - uses: actions/upload-artifact@v2
+      with:
+        name: openvpn3-mingw-${{ matrix.arch }}
+        path: |
+            ${{ github.workspace }}/build/**/*.exe
+            ${{ github.workspace }}/build/**/*.dll
+            !${{ github.workspace }}/build/**/test/ssl/**
+            !${{ github.workspace }}/build/**/test/unittests/**
+            !${{ github.workspace }}/build/**/CMakeFiles/**
+            !${{ github.workspace }}/build/**/vcpkg_installed/**

CMakeLists.txt

@@ -1,26 +1,58 @@
-cmake_minimum_required(VERSION 3.5)
-cmake_policy(SET CMP0048 NEW)
+cmake_minimum_required(VERSION 3.13...3.28)
 
 project(OpenVPN3-core VERSION 3)
 
+# AddressSanitize - use CXX=clang++ CC=clang cmake -DCMAKE_BUILD_TYPE=asan to build with ASAN
+# export  UBSAN_OPTIONS=print_stacktrace=1 helps debugging these
+set(CMAKE_C_FLAGS_ASAN
+        "-fsanitize=address,undefined -fno-sanitize-recover=all -fno-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame-pointer -g -O1"
+        CACHE STRING "Flags used by the C compiler during AddressSanitizer builds."
+        FORCE)
+set(CMAKE_CXX_FLAGS_ASAN
+        "-fsanitize=address,undefined -fno-sanitize-recover=all -fno-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame-pointer -g -O1"
+        CACHE STRING "Flags used by the C++ compiler during AddressSanitizer builds."
+        FORCE)
+
+set(CMAKE_LINKER_FLAGS_ASAN
+        "-fsanitize=address,undefined -fno-sanitize-recover=all -fsanitize-address-use-after-scope"
+        CACHE STRING "Flags used by the linker during AddressSanitizer builds."
+        FORCE)
+
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake
                       ${CMAKE_MODULE_PATH})
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+set(CMAKE_C_STANDARD 99)
+
+include(CTest)
 
 include(findcoredeps)
+include(ovpn-doxygen)
 
 add_subdirectory(client)
 add_subdirectory(test/unittests)
 add_subdirectory(test/ovpncli)
 add_subdirectory(test/ssl)
 
-
-if (WIN32)
-    add_subdirectory(openvpn/omi)
-    add_subdirectory(openvpn/ovpnagent/win)
+add_subdirectory(openvpn/omi)
+add_subdirectory(openvpn/ovpnagent/win)
+add_subdirectory(openvpn/ovpnagent/mac)
+
+if (ENABLE_DOXYGEN)
+    # Exclude some project specific directories
+    set(DOXYGEN_EXCLUDE_PATTERNS
+        "*/vcpkg_installed/*"
+        "*/googletest-src/*"
+        "${PROJECT_SOURCE_DIR}/deps/*")
+
+    # Use README.rst as the Doxygen main page
+    # Due to some doxygen oddities, it rejects processing README.rst, but a .md file is fine
+    # So we copy it into our build tree as a .md file and use that
+    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/README.rst"
+        "${CMAKE_CURRENT_BINARY_DIR}/doxygen/mainpage.md"
+        COPYONLY)
+    set(DOXYGEN_USE_MDFILE_AS_MAINPAGE "${CMAKE_CURRENT_BINARY_DIR}/doxygen/mainpage.md")
+
+    configure_doxygen("OpenVPN 3 Core Library" "doxygen/core")
 endif ()
-
-if (APPLE)
-    add_subdirectory(openvpn/ovpnagent/mac)
-endif ()
-