Skip to content

Commit 92ff0c5

Browse files
authored
Fix openssl comparison tests (#2888)
### Description of changes: * Our "openssl" command output no longer strictly matches the output from Openssl's master branch. * Previously, due to how the variables were declared, we were only actually comparing our output to that of their master branch. ### Testing: We are only concerned about comparisons with OpenSSL v1.1.1 and v3.0. Updated to only compare against these two. By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license and the ISC license.
1 parent d6298ee commit 92ff0c5

File tree

1 file changed

+9
-16
lines changed

1 file changed

+9
-16
lines changed

tests/ci/run_openssl_comparison_tests.sh

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,33 +10,27 @@ scratch_folder=${SYS_ROOT}/"openssl-scratch"
1010
install_dir="${scratch_folder}/libcrypto_install_dir"
1111
openssl_url='https://github.com/openssl/openssl.git'
1212
openssl_1_1_1_branch='OpenSSL_1_1_1-stable'
13-
openssl_3_1_branch='openssl-3.1'
14-
openssl_3_2_branch='openssl-3.2'
15-
openssl_master_branch='master'
13+
openssl_3_0_branch='openssl-3.0'
1614

1715
mkdir -p "${scratch_folder}"
1816
rm -rf "${scratch_folder:?}"/*
1917

2018
build_openssl $openssl_1_1_1_branch
21-
build_openssl $openssl_3_1_branch
22-
build_openssl $openssl_3_2_branch
23-
build_openssl $openssl_master_branch
19+
build_openssl $openssl_3_0_branch
2420

2521
run_build -DASAN=1
2622

27-
# OpenSSL 3.1.0 on switches from lib folder to lib64 folder
28-
declare -A openssl_branches=(
23+
# OpenSSL 3.0 on switches from lib folder to lib64 folder
24+
declare -A openssl_branches
25+
openssl_branches=(
2926
["$openssl_1_1_1_branch"]="lib"
30-
["$openssl_3_1_branch"]="lib64"
31-
["$openssl_3_2_branch"]="lib64"
32-
["$openssl_master_branch"]="lib64"
27+
["$openssl_3_0_branch"]="lib64"
3328
)
3429

35-
declare -A openssl_versions=(
30+
declare -A openssl_versions
31+
openssl_versions=(
3632
["$openssl_1_1_1_branch"]="1.1.1"
37-
["$openssl_3_1_branch"]="3.1"
38-
["$openssl_3_2_branch"]="3.2"
39-
["$openssl_master_branch"]="master"
33+
["$openssl_3_0_branch"]="3.0"
4034
)
4135

4236
# Run X509 Comparison Tests against all OpenSSL branches
@@ -48,4 +42,3 @@ for branch in "${!openssl_branches[@]}"; do
4842
echo "Running ${test} against OpenSSL ${branch}"
4943
LD_LIBRARY_PATH="${install_dir}/openssl-${branch}/${openssl_branches[$branch]}" "${BUILD_ROOT}/tool-openssl/tool_openssl_test"
5044
done
51-

0 commit comments

Comments
 (0)