From 04f20d4b154a1a46596bc0544747a9def1da0d6e Mon Sep 17 00:00:00 2001 From: Chris Mc Date: Tue, 17 Aug 2021 09:12:35 -0400 Subject: [PATCH 1/4] Update README.md --- README.md | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 701c2b783..1afcbd0d4 100644 --- a/README.md +++ b/README.md @@ -6,9 +6,13 @@ [![MacOS Badge][MacOS]][Cross-Platform] [![Windows Badge][Windows]][Cross-Platform] [![Coverage Status](https://coveralls.io/repos/github/Thalhammer/jwt-cpp/badge.svg?branch=master)](https://coveralls.io/github/Thalhammer/jwt-cpp?branch=master) + [![Documentation Badge](https://img.shields.io/badge/Documentation-master-blue)](https://thalhammer.github.io/jwt-cpp/) -[![GitHub release (latest SemVer including pre-releases)](https://img.shields.io/github/v/release/Thalhammer/jwt-cpp?include_prereleases)](https://github.com/Thalhammer/jwt-cpp/releases) + [![Stars Badge](https://img.shields.io/github/stars/Thalhammer/jwt-cpp)](https://github.com/Thalhammer/jwt-cpp/stargazers) +[![GitHub release (latest SemVer including pre-releases)](https://img.shields.io/github/v/release/Thalhammer/jwt-cpp?include_prereleases)](https://github.com/Thalhammer/jwt-cpp/releases) +[![ConanCenter package](https://repology.org/badge/version-for-repo/conancenter/jwt-cpp.svg)](https://repology.org/project/jwt-cpp/versions) +[![Vcpkg package](https://repology.org/badge/version-for-repo/vcpkg/jwt-cpp.svg)](https://repology.org/project/jwt-cpp/versions) [Linux]: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/Thalhammer/jwt-cpp/badges/cross-platform/ubuntu-latest/shields.json [MacOS]: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/Thalhammer/jwt-cpp/badges/cross-platform/macos-latest/shields.json @@ -23,11 +27,12 @@ jwt-cpp supports all the algorithms defined by the specifications. The modular d For completeness, here is a list of all supported algorithms: -| HMSC | RSA | ECDSA | PSS | EdDSA | -| ----- | ----- | ----- | ----- | ------- | -| HS256 | RS256 | ES256 | PS256 | Ed25519 | -| HS384 | RS384 | ES384 | PS384 | Ed448 | -| HS512 | RS512 | ES512 | PS512 | | +| HMSC | RSA | ECDSA | PSS | EdDSA | +| ----- | ----- | ------ | ----- | ------- | +| HS256 | RS256 | ES256 | PS256 | Ed25519 | +| HS384 | RS384 | ES384 | PS384 | Ed448 | +| HS512 | RS512 | ES512 | PS512 | | +| | | ES256K | | | ## SSL Compatibility From 7da9ae6956a9bb39804867d5edbd918693f065fa Mon Sep 17 00:00:00 2001 From: Chris Mc Date: Tue, 17 Aug 2021 09:17:02 -0400 Subject: [PATCH 2/4] Update openssl.yml --- .github/workflows/openssl.yml | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/.github/workflows/openssl.yml b/.github/workflows/openssl.yml index ffe7a108d..d514b27db 100644 --- a/.github/workflows/openssl.yml +++ b/.github/workflows/openssl.yml @@ -5,33 +5,28 @@ on: branches: [master] pull_request: branches: [master] - paths: - - "CMakeLists.txt" - - "include/jwt-cpp/**" - - "tests/cmake/**" - - ".github/actions/**" - - ".github/workflows/openssl.yml" jobs: with-openssl: runs-on: ubuntu-latest strategy: matrix: - openssl: ["openssl-3.0.0-beta2", "OpenSSL_1_1_1k", "OpenSSL_1_1_0i", "OpenSSL_1_0_2u"] + openssl: + - {tag: "openssl-3.0.0-beta2", name: "3.0.0-beta2"} + - {tag: "OpenSSL_1_1_1k", name: "1.1.1k"} + - {tag: "OpenSSL_1_1_0i", name: "1.1.0i"} + - {tag: "OpenSSL_1_0_2u", name: "1.0.2u"} steps: - uses: actions/checkout@v2 - uses: lukka/get-cmake@latest - uses: ./.github/actions/install/gtest - uses: ./.github/actions/install/openssl with: - version: ${{ matrix.openssl }} + version: ${{ matrix.openssl.tag }} - name: configure - run: | - cmake . -DJWT_BUILD_TESTS=ON -DOPENSSL_ROOT_DIR=/tmp - + run: cmake . -DJWT_BUILD_TESTS=ON -DOPENSSL_ROOT_DIR=/tmp - run: make - - name: test run: ./tests/jwt-cpp-test @@ -40,14 +35,14 @@ jobs: uses: ./.github/actions/badge with: category: openssl - label: ${{ matrix.openssl }} + label: ${{ matrix.openssl.name }} - name: badge failure if: github.event_name == 'push' && !success() uses: ./.github/actions/badge with: category: openssl - label: ${{ matrix.openssl }} + label: ${{ matrix.openssl.name }} message: Failing color: red From f320dd25ae015361f3f80079e6f1e54edaa82911 Mon Sep 17 00:00:00 2001 From: Chris Mc Date: Tue, 17 Aug 2021 09:18:32 -0400 Subject: [PATCH 3/4] Update README.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 1afcbd0d4..3997b457d 100644 --- a/README.md +++ b/README.md @@ -45,10 +45,10 @@ In the name of flexibility and extensibility, jwt-cpp supports both [OpenSSL](ht | ![1.1.1k][o1.1.1] | ![3.3.3][l3.3] | | ![3.0.0-beta2][o3.0] | | -[o1.0.2]: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/Thalhammer/jwt-cpp/badges/openssl/OpenSSL_1_0_2u/shields.json -[o1.1.0]: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/Thalhammer/jwt-cpp/badges/openssl/OpenSSL_1_1_0i/shields.json -[o1.1.1]: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/Thalhammer/jwt-cpp/badges/openssl/OpenSSL_1_1_1k/shields.json -[o3.0]: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/Thalhammer/jwt-cpp/badges/openssl/openssl-3.0.0-beta2/shields.json +[o1.0.2]: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/Thalhammer/jwt-cpp/badges/openssl/1.0.2u/shields.json +[o1.1.0]: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/Thalhammer/jwt-cpp/badges/openssl/1.1.0i/shields.json +[o1.1.1]: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/Thalhammer/jwt-cpp/badges/openssl/1.1.1l/shields.json +[o3.0]: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/Thalhammer/jwt-cpp/badges/openssl/3.0.0-beta2/shields.json [l3.1]: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/Thalhammer/jwt-cpp/badges/libressl/3.1.5/shields.json [l3.2]: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/Thalhammer/jwt-cpp/badges/libressl/3.2.5/shields.json [l3.3]: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/Thalhammer/jwt-cpp/badges/libressl/3.3.3/shields.json From 4a3d1d91cd291eab0347b5381dfa9b9bb23670b2 Mon Sep 17 00:00:00 2001 From: Chris Mc Date: Tue, 17 Aug 2021 09:20:20 -0400 Subject: [PATCH 4/4] Update README.md --- README.md | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 3997b457d..844af48a9 100644 --- a/README.md +++ b/README.md @@ -27,12 +27,11 @@ jwt-cpp supports all the algorithms defined by the specifications. The modular d For completeness, here is a list of all supported algorithms: -| HMSC | RSA | ECDSA | PSS | EdDSA | -| ----- | ----- | ------ | ----- | ------- | -| HS256 | RS256 | ES256 | PS256 | Ed25519 | -| HS384 | RS384 | ES384 | PS384 | Ed448 | -| HS512 | RS512 | ES512 | PS512 | | -| | | ES256K | | | +| HMSC | RSA | ECDSA | PSS | EdDSA | +| ----- | ----- | ----- | ----- | ------- | +| HS256 | RS256 | ES256 | PS256 | Ed25519 | +| HS384 | RS384 | ES384 | PS384 | Ed448 | +| HS512 | RS512 | ES512 | PS512 | | ## SSL Compatibility