Skip to content

Backport 3.6: Fix broken config autodetection in ssl-opt.sh on Ubuntu 24.04 #10002

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

Open
wants to merge 2 commits into
base: mbedtls-3.6
Choose a base branch
from
Open

Backport 3.6: Fix broken config autodetection in ssl-opt.sh on Ubuntu 24.04 #10002

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4c32cb
Fix MBEDTLS_SSL_TICKET_C autodependency not triggering with some shells
gilles-peskine-arm Feb 20, 2025
d845739
Change correct code that came up as a false positive in checkbashisms
gilles-peskine-arm Feb 20, 2025
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
6 changes: 3 additions & 3 deletions tests/ssl-opt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,7 @@ detect_required_features() {
esac

case " $CMD_LINE " in
*[-_\ =]tickets=[^0]*)
*[-_\ =]tickets=[!0]*)
requires_config_enabled MBEDTLS_SSL_TICKET_C;;
esac
case " $CMD_LINE " in
Expand Down Expand Up @@ -11614,7 +11614,7 @@ run_test "DTLS-SRTP all profiles supported. server doesn't support mki." \
-c "selected srtp profile" \
-c "DTLS-SRTP key material is"\
-c "DTLS-SRTP no mki value negotiated"\
-g "find_in_both '^ *Keying material: [0-9A-F]*$'"\
-g "find_in_both '^ *Keying material: [0-9A-F]*\$'"\
-c "dumping 'sending mki' (8 bytes)" \
-C "dumping 'received mki' (8 bytes)" \
-C "error"
Expand All @@ -11630,7 +11630,7 @@ run_test "DTLS-SRTP all profiles supported. openssl client." \
-s "selected srtp profile" \
-s "server hello, adding use_srtp extension" \
-s "DTLS-SRTP key material is"\
-g "find_in_both '^ *Keying material: [0-9A-F]*$'"\
-g "find_in_both '^ *Keying material: [0-9A-F]*\$'"\
-c "SRTP Extension negotiated, profile=SRTP_AES128_CM_SHA1_80"

requires_config_enabled MBEDTLS_SSL_DTLS_SRTP
Expand Down