Fix build and tests for wolfSSL

.github/workflows/ssl.yml

@@ -85,11 +85,13 @@ jobs:
   wolfssl:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         wolfssl:
           - { ref: "v5.1.1-stable", name: "5.1.1"}
           - { ref: "v5.2.0-stable", name: "5.2.0" }
           - { ref: "v5.3.0-stable", name: "5.3.0"}
+          - { ref: "v5.7.0-stable", name: "5.7.0"}
     name: wolfSSL ${{ matrix.wolfssl.name }}
     steps:
       - uses: actions/checkout@v4

CMakeLists.txt

@@ -115,17 +115,18 @@ target_include_directories(jwt-cpp INTERFACE $<BUILD_INTERFACE:${JWT_INCLUDE_PAT
 
 if(${JWT_SSL_LIBRARY} MATCHES "OpenSSL")
   target_link_libraries(jwt-cpp INTERFACE OpenSSL::SSL OpenSSL::Crypto)
+  target_compile_definitions(jwt-cpp INTERFACE JWT_OPENSSL)
 endif()
 
 if(${JWT_SSL_LIBRARY} MATCHES "LibreSSL")
   target_link_libraries(jwt-cpp INTERFACE LibreSSL::TLS)
+  target_compile_definitions(jwt-cpp INTERFACE JWT_LIBRESSL)
 endif()
 
 if(${JWT_SSL_LIBRARY} MATCHES "wolfSSL")
   target_link_libraries(jwt-cpp INTERFACE PkgConfig::wolfssl)
   # This is required to access OpenSSL compatibility API
   target_include_directories(jwt-cpp INTERFACE ${wolfssl_INCLUDE_DIRS})
-  target_compile_definitions(jwt-cpp INTERFACE OPENSSL_EXTRA OPENSSL_ALL)
 endif()
 
 if(NOT JWT_DISABLE_PICOJSON AND JWT_EXTERNAL_PICOJSON)

docs/install.md

@@ -30,6 +30,10 @@ The minimum is `jwt.h` but you will need to add the defines:
 
 - [`JWT_DISABLE_BASE64`](https://github.com/Thalhammer/jwt-cpp/blob/c9a511f436eaa13857336ebeb44dbc5b7860fe01/include/jwt-cpp/jwt.h#L11)
 - [`JWT_DISABLE_PICOJSON`](https://github.com/Thalhammer/jwt-cpp/blob/c9a511f436eaa13857336ebeb44dbc5b7860fe01/include/jwt-cpp/jwt.h#L4)
+- The SSL library being used needs to be defined:
+  - `JWT_OPENSSL` for OpenSSL (Default)
+  - `JWT_LIBRESSL` for LibreSSL
+  - `JWT_WOLFSSL` for wolfSSL
 
 In addition to providing your own JSON traits implementation, see [traits.md](traits.md) for more information.
 

include/jwt-cpp/jwt.h

@@ -66,6 +66,8 @@
 
 #if defined(LIBWOLFSSL_VERSION_HEX)
 #define JWT_OPENSSL_1_1_1
+#include <wolfssl/options.h>
+#include <wolfssl/version.h>
 #endif
 
 #ifndef JWT_CLAIM_EXPLICIT

tests/HelperTest.cpp

@@ -113,7 +113,7 @@ namespace {
 	std::string google_cert =
 // This is to handle the different subject alternate name ordering
 // see https://github.com/wolfSSL/wolfssl/issues/4397
-#ifdef LIBWOLFSSL_VERSION_HEX
+#if defined(LIBWOLFSSL_VERSION_HEX) && LIBWOLFSSL_VERSION_HEX < 0x05007000
 		R"(-----BEGIN CERTIFICATE-----
 MIIFfTCCBOagAwIBAgIKYFOB9QABAACIvTANBgkqhkiG9w0BAQUFADBGMQswCQYD
 VQQGEwJVUzETMBEGA1UEChMKR29vZ2xlIEluYzEiMCAGA1UEAxMZR29vZ2xlIElu