[apisix] branch master updated: fix(ci): fips: ensure apisix compiles with openssl3 (#9427)

[monkeydluffy]

This is an automated email from the ASF dual-hosted git repository.

monkeydluffy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix.git


The following commit(s) were added to refs/heads/master by this push:
     new e85ef6474 fix(ci): fips: ensure apisix compiles with openssl3 (#9427)
e85ef6474 is described below

commit e85ef647471effdc2eb861a9bc29565660172558
Author: jinhua luo <home_k...@163.com>
AuthorDate: Tue May 9 09:33:20 2023 +0800

    fix(ci): fips: ensure apisix compiles with openssl3 (#9427)
---
 .github/workflows/fips.yml | 9 +++++++--
 t/node/client-mtls.t       | 4 ++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/fips.yml b/.github/workflows/fips.yml
index e6516d9bb..7af7859ae 100644
--- a/.github/workflows/fips.yml
+++ b/.github/workflows/fips.yml
@@ -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
@@ -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 \
diff --git a/t/node/client-mtls.t b/t/node/client-mtls.t
index 4e1f16425..a0de7d4cf 100644
--- a/t/node/client-mtls.t
+++ b/t/node/client-mtls.t
@@ -609,7 +609,7 @@ 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
 
 
 
@@ -617,4 +617,4 @@ client certificate verification is not passed: FAILED:self 
signed certifica
 --- 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