Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build and tests for wolfSSL #352

Merged
merged 16 commits into from
Jul 29, 2024
Merged

Fix build and tests for wolfSSL #352

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
0f34fb0
Fix build and tests for wolfSSL
julek-wolfssl Jun 5, 2024
1ef34b3
Remove unnecessary symbols
julek-wolfssl Jun 5, 2024
23f9a43
Don't fail fast on wolfSSL actions
julek-wolfssl Jun 6, 2024
d64fe8a
Include wolfssl/options.h explicitly
julek-wolfssl Jun 7, 2024
f9d4940
Fix old wolfSSL failures
julek-wolfssl Jun 11, 2024
b4352e8
remove unused EVP_PKEY_get1_RSA
prince-chrismc Jun 15, 2024
871af79
Merge branch 'master' into wolfssl-fixes
prince-chrismc Jun 15, 2024
421809d
code review comments
prince-chrismc Jul 29, 2024
9899b9a
Apply suggestions from code review
prince-chrismc Jul 29, 2024
b623a74
rm extra headers?
prince-chrismc Jul 29, 2024
04ad18c
fix cmake test
prince-chrismc Jul 29, 2024
bd29c56
linter
prince-chrismc Jul 29, 2024
a7ea901
fix unused warning fail_HMAC
prince-chrismc Jul 29, 2024
85e404d
reenable fail fast
prince-chrismc Jul 29, 2024
ef2112a
Merge branch 'master' into wolfssl-fixes
prince-chrismc Jul 29, 2024
000200d
fix spelling
prince-chrismc Jul 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/ssl.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ jobs:
- { 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
Expand Down
3 changes: 2 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,8 @@ 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})
prince-chrismc marked this conversation as resolved.
Show resolved Hide resolved
target_compile_definitions(jwt-cpp INTERFACE OPENSSL_EXTRA OPENSSL_ALL)
# EXTERNAL_OPTS_OPENVPN is necessary so that wolfssl/options.h is included automatically
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why was this header not required before? Would it be possible to just at the header?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was always necessary to include wolfssl/options.h. Notice that in your current builds you have

In file included from /usr/local/include/wolfssl/openssl/bn.h:33,
                 from /usr/local/include/wolfssl/openssl/ec.h:27,
                 from /home/runner/work/jwt-cpp/jwt-cpp/include/jwt-cpp/jwt.h:15,
                 from /home/runner/work/jwt-cpp/jwt-cpp/tests/JwksTest.cpp:1:
/usr/local/include/wolfssl/wolfcrypt/settings.h:2369:14: warning: #warning "For timing resistance / side-channel attack prevention consider using harden options" [-Wcpp]
 2369 |             #warning "For timing resistance / side-channel attack prevention consider using harden options"
      |              ^~~~~~~

which is a dead giveaway that wolfssl/options.h is missing. I think by defining OPENSSL_EXTRA OPENSSL_ALL you were able to somewhat build with wolfSSL but I don't know how the tests are "passing". I didn't investigate this.

target_compile_definitions(jwt-cpp INTERFACE OPENSSL_EXTRA OPENSSL_ALL EXTERNAL_OPTS_OPENVPN)
endif()

if(NOT JWT_DISABLE_PICOJSON AND JWT_EXTERNAL_PICOJSON)
Expand Down
1 change: 1 addition & 0 deletions include/jwt-cpp/jwt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include <openssl/pem.h>
#include <openssl/rsa.h>
#include <openssl/ssl.h>
#include <openssl/opensslv.h>
prince-chrismc marked this conversation as resolved.
Show resolved Hide resolved

#include <algorithm>
#include <chrono>
Expand Down
2 changes: 1 addition & 1 deletion tests/HelperTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading
Loading