Skip to content

Commit 5df320b

Browse files
Symbol versioning follow-ups: register peer cert APIs, fix dist_pkg_tests matrix (#3338)
1 parent db0dc86 commit 5df320b

4 files changed

Lines changed: 10 additions & 50 deletions

File tree

.github/workflows/linux-multi-arch-omnibus.yml

Lines changed: 5 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -381,65 +381,21 @@ jobs:
381381
instance-size:large
382382
strategy:
383383
fail-fast: false
384+
# AmazonLinux 2023 only, latest gcc and clang, across x86_64 and aarch64.
384385
matrix:
385-
test:
386-
- install
387-
- run
388-
include:
389-
# Ubuntu 24.04
390-
- image: ubuntu:24.04
391-
arch: x86_64
392-
compiler: gcc-14
393-
- image: ubuntu:24.04
394-
arch: x86_64
395-
compiler: clang-19
396-
- image: ubuntu:24.04
397-
arch: aarch64
398-
compiler: gcc-14
399-
- image: ubuntu:24.04
400-
arch: aarch64
401-
compiler: clang-19
402-
403-
# AmazonLinux 2
404-
- image: amazonlinux:2
405-
arch: x86_64
406-
compiler: gcc-7
407-
- image: amazonlinux:2
408-
arch: x86_64
409-
compiler: clang-11
410-
- image: amazonlinux:2
411-
arch: aarch64
412-
compiler: gcc-7
413-
- image: amazonlinux:2
414-
arch: aarch64
415-
compiler: clang-11
416-
417-
# AmazonLinux 2023
418-
- image: amazonlinux:2023
419-
arch: x86_64
420-
compiler: gcc-11
421-
- image: amazonlinux:2023
422-
arch: x86_64
423-
compiler: clang-15
424-
- image: amazonlinux:2023
425-
arch: aarch64
426-
compiler: gcc-11
427-
- image: amazonlinux:2023
428-
arch: aarch64
429-
compiler: clang-15
386+
test: [install, run]
387+
arch: [x86_64, aarch64]
388+
compiler: [gcc-11, clang-15]
389+
image: ["amazonlinux:2023"]
430390
steps:
431391
- uses: actions/checkout@v7
432392
- name: Login to Amazon ECR
433393
id: login-ecr
434394
uses: aws-actions/amazon-ecr-login@v2
435395
- uses: ./.github/actions/codebuild-docker-run
436396
name: Run Container (${{ matrix.image }})
437-
env:
438-
AWSLC_32BIT: ${{ matrix.build32 || 0 }}
439397
with:
440398
image: ${{ steps.login-ecr.outputs.registry }}/aws-lc/${{ matrix.image }}
441-
env: |
442-
AWSLC_32BIT
443399
run: |
444400
source /opt/compiler-env/setup-${{ matrix.compiler }}.sh
445401
./tests/ci/run_dist_pkg_${{ matrix.test }}_tests.sh

ssl/libssl.map

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -338,6 +338,7 @@ AWS_LC_1.0 {
338338
SSL_get0_ocsp_response;
339339
SSL_get0_param;
340340
SSL_get0_peer_application_settings;
341+
SSL_get0_peer_certificate;
341342
SSL_get0_peer_certificates;
342343
SSL_get0_peer_delegation_algorithms;
343344
SSL_get0_peer_verify_algorithms;
@@ -346,6 +347,7 @@ AWS_LC_1.0 {
346347
SSL_get0_session_id_context;
347348
SSL_get0_signed_cert_timestamp_list;
348349
SSL_get0_verified_chain;
350+
SSL_get1_peer_certificate;
349351
SSL_get1_session;
350352
SSL_get_SSL_CTX;
351353
SSL_get_all_cipher_names;

ssl/libssl.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,7 @@ SSL_get0_next_proto_negotiated AWS_LC_1.0 PUBLIC
331331
SSL_get0_ocsp_response AWS_LC_1.0 PUBLIC
332332
SSL_get0_param AWS_LC_1.0 PUBLIC
333333
SSL_get0_peer_application_settings AWS_LC_1.0 PUBLIC
334+
SSL_get0_peer_certificate AWS_LC_1.0 PUBLIC
334335
SSL_get0_peer_certificates AWS_LC_1.0 PUBLIC
335336
SSL_get0_peer_delegation_algorithms AWS_LC_1.0 PUBLIC
336337
SSL_get0_peer_verify_algorithms AWS_LC_1.0 PUBLIC
@@ -339,6 +340,7 @@ SSL_get0_server_requested_CAs AWS_LC_1.0 PUBLIC
339340
SSL_get0_session_id_context AWS_LC_1.0 PUBLIC
340341
SSL_get0_signed_cert_timestamp_list AWS_LC_1.0 PUBLIC
341342
SSL_get0_verified_chain AWS_LC_1.0 PUBLIC
343+
SSL_get1_peer_certificate AWS_LC_1.0 PUBLIC
342344
SSL_get1_session AWS_LC_1.0 PUBLIC
343345
SSL_get_SSL_CTX AWS_LC_1.0 PUBLIC
344346
SSL_get_all_cipher_names AWS_LC_1.0 PUBLIC

tests/ci/common_posix_setup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ function run_build {
5454
mkdir -p "$BUILD_ROOT"
5555
cd "$BUILD_ROOT" || exit 1
5656

57-
if [[ "${AWSLC_32BIT}" == "1" ]]; then
57+
if [[ "${AWSLC_32BIT:-0}" == "1" ]]; then
5858
cflags+=("-DCMAKE_TOOLCHAIN_FILE=${SRC_ROOT}/util/32-bit-toolchain.cmake")
5959
fi
6060

0 commit comments

Comments
 (0)