Merge b60d6e46d87992afb86f4f0fce30103aa5b4ebfb into 03e1438089654fb884ac48e0f3cd0049cfe2c102

This commit is contained in:
Gilles Peskine 2026-10-27 10:46:12 -04:00 committed by GitHub
commit e82435484b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -453,7 +453,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
@ -11168,7 +11168,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"
@ -11184,7 +11184,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