From f1f539485bfbb0e72415b4449766931631ad258a Mon Sep 17 00:00:00 2001 From: Jon Shallow Date: Sat, 23 Sep 2023 16:51:40 +0100 Subject: [PATCH] workflows: Revert #1073 to add OpenSSL dev environment OpenSSL dev environment is no longer included in windows-latest builds. Disable Windows build OpenSSL 3 deprecation warnings --- .github/workflows/main.yml | 12 +++++++++++- src/coap_openssl.c | 5 +++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e9cb01d1..62fd0a0a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,7 +15,7 @@ on: env: PLATFORM: posix TESTS: yes - OPENSSL_INSTALL_PATH: C:\Program Files\OpenSSL\ + OPENSSL_INSTALL_PATH: C:\Program Files\OpenSSL-Win64\ jobs: build-linux: @@ -155,6 +155,11 @@ jobs: - name: Add MSBuild to PATH uses: microsoft/setup-msbuild@v1 + - name: Install OpenSSL on Windows (choco) + run: | + choco install openssl + shell: cmd + - name: Build sln shell: cmd run: call .\scripts\msbuild.sln.cmd @@ -163,6 +168,11 @@ jobs: steps: - uses: actions/checkout@v3 + - name: Install OpenSSL on Windows (choco) + run: | + choco install openssl + shell: cmd + - name: MS CMake setup run: | cmake -E make_directory build_test diff --git a/src/coap_openssl.c b/src/coap_openssl.c index 7a0ac68d..9f8832bf 100644 --- a/src/coap_openssl.c +++ b/src/coap_openssl.c @@ -75,6 +75,11 @@ /* Ignore OpenSSL 3.0 deprecated warnings for now */ #pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif +#if defined(_WIN32) +#if !defined(__MINGW32__) +#pragma warning(disable : 4996) +#endif /* ! __MINGW32__ */ +#endif /* _WIN32 */ #endif /* OPENSSL_VERSION_NUMBER >= 0x30000000L */ #ifdef COAP_EPOLL_SUPPORT