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

Jump to bottom

fix(ci): fips: ensure apisix compiles with openssl3 #9427

Merged
merged 4 commits into from
May 9, 2023
Merged

fix(ci): fips: ensure apisix compiles with openssl3 #9427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
231b5ba
fix(ci): fips: ensure apisix compiles with openssl3
kingluo May 8, 2023
2f30a58
fix PR
kingluo May 8, 2023
b655408
adjust expected error msg for both openssl versions
kingluo May 8, 2023
0821e61
fix PR
kingluo May 8, 2023
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
9 changes: 7 additions & 2 deletions .github/workflows/fips.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,18 @@ jobs:
path: ~/openssl-3.0
key: ${{ runner.os }}-${{ env.cache-name }}-${{ matrix.os_name }}

- name: set openssl prefix
id: set_openssl_prefix
shell: bash
run: |
echo "openssl3_prefix=$HOME" >>$GITHUB_OUTPUT

- name: Toggle openssl compile
id: test_ssl_env
shell: bash
if: steps.cache-openssl.outputs.cache-hit != 'true'
run: |
echo "openssl3=yes" >>$GITHUB_OUTPUT
echo "openssl3_prefix=$HOME" >>$GITHUB_OUTPUT

- name: Extract test type
shell: bash
Expand Down Expand Up @@ -132,7 +137,7 @@ jobs:
- name: Linux Install
env:
COMPILE_OPENSSL3: ${{ steps.test_ssl_env.outputs.openssl3 }}
OPENSSL3_PREFIX: ${{ steps.test_ssl_env.outputs.openssl3_prefix }}
OPENSSL3_PREFIX: ${{ steps.set_openssl_prefix.outputs.openssl3_prefix }}
USE_OPENSSL3: yes
run: |
sudo --preserve-env=OPENRESTY_VERSION \
Expand Down
4 changes: 2 additions & 2 deletions t/node/client-mtls.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,12 +609,12 @@ curl --cert t/certs/test2.crt --key t/certs/test2.key -k https://localhost:1994/
--- response_body eval
qr/400 Bad Request/
--- error_log
client certificate verification is not passed: FAILED:self signed certifica
client certificate verification is not passed: FAILED



=== TEST 20: mtls failed, at handshake phase
--- exec
curl -k -v --resolve "test.com:1994:127.0.0.1" https://test.com:1994/hello
--- error_log
tls_process_client_certificate:peer did not return a certificate
peer did not return a certificate