Skip to content

Commit eb4167f

Browse files
authored
ci: use correct openssl version for updated AL2023 version (#5255)
1 parent 529b01a commit eb4167f

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

codebuild/bin/install_al_dependencies.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ source ./codebuild/bin/s2n_setup_env.sh
1818

1919
al2023_main(){
2020
case "$S2N_LIBCRYPTO" in
21-
"openssl-3.0"|"default") echo "Installing AL2023 packages";;
21+
"openssl-3.0"|"openssl-3.2.2"|"default") echo "Installing AL2023 packages";;
2222
*) echo "${S2N_LIBCRYPTO} is not installed on this platform."; exit 1;;
2323
esac
2424
common_packages

codebuild/spec/buildspec_generalbatch.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ batch:
135135
privileged-mode: true
136136
variables:
137137
TESTS: unit
138-
S2N_LIBCRYPTO: openssl-3.0
138+
S2N_LIBCRYPTO: openssl-3.2.2
139139
identifier: UnitAl2023x86Openssl30
140140
- buildspec: codebuild/spec/buildspec_amazonlinux.yml
141141
env:

tests/unit/s2n_build_test.c

+9-1
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ S2N_RESULT s2n_check_supported_libcrypto(const char *s2n_libcrypto)
8585
{ .libcrypto = "openssl-1.1.1", .is_openssl = true },
8686
{ .libcrypto = "openssl-3.0", .is_openssl = true },
8787
{ .libcrypto = "openssl-3.0-fips", .is_openssl = true, .is_opensslfips = true },
88+
{ .libcrypto = "openssl-3.2.2", .is_openssl = true },
8889
{ .libcrypto = "openssl-3.4", .is_openssl = true },
8990
};
9091

@@ -163,7 +164,14 @@ int main()
163164
{
164165
if (version != NULL) {
165166
const char *ssleay_version_text = SSLeay_version(SSLEAY_VERSION);
166-
EXPECT_NOT_NULL(strstr(ssleay_version_text, version));
167+
if (strstr(ssleay_version_text, version) == NULL) {
168+
char fail_msg[256];
169+
snprintf(
170+
fail_msg, sizeof(fail_msg),
171+
"Libcrypto version mismatch - expected version '%s' not found in '%s'",
172+
version, ssleay_version_text);
173+
FAIL_MSG(fail_msg);
174+
}
167175
}
168176
};
169177

0 commit comments

Comments
 (0)