coffee/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2026-10-28 18:07:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge e579a4d6d555a0869210f0ab20a1dc349dd15c32 into 03e1438089654fb884ac48e0f3cd0049cfe2c102

Browse Source
This commit is contained in:
Jerry Yu 2026-10-27 21:19:52 -04:00 committed by GitHub
commit 5f8bccd298
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/compat.sh
View File

@ -33,6 +33,7 @@ SRVMEM=0
: ${M_SRV:=../programs/ssl/ssl_server2} : ${M_SRV:=../programs/ssl/ssl_server2}
: ${M_CLI:=../programs/ssl/ssl_client2} : ${M_CLI:=../programs/ssl/ssl_client2}
: ${OPENSSL:=openssl} : ${OPENSSL:=openssl}
: ${M_QUERY:=../programs/test/query_compile_time_config}
: ${GNUTLS_CLI:=gnutls-cli} : ${GNUTLS_CLI:=gnutls-cli}
: ${GNUTLS_SERV:=gnutls-serv} : ${GNUTLS_SERV:=gnutls-serv}
@ -993,6 +994,15 @@ else
DOG_DELAY=10 DOG_DELAY=10
fi fi
# `$M_QUERY MBEDTLS_PLATFORM_STD_NV_SEED_FILE` will return `"seedfile"` and
# `dd` will create file with double quotes. That's not expected, with `eval`
# we can remove double quotes
NV_SEED_FILE=$(eval "echo `$M_QUERY MBEDTLS_PLATFORM_STD_NV_SEED_FILE`")
if [ -n "$NV_SEED_FILE" ] && [ ! -f $NV_SEED_FILE ]
then
dd if=/dev/urandom of=$NV_SEED_FILE bs=64 count=1 2>/dev/null
fi
SKIP_NEXT="NO" SKIP_NEXT="NO"
trap cleanup INT TERM HUP trap cleanup INT TERM HUP

14
tests/ssl-opt.sh
View File

@ -337,11 +337,10 @@ get_config_value_or_default() {
# Note that if the configuration is not defined or is defined to nothing, # Note that if the configuration is not defined or is defined to nothing,
# the output of this function will be an empty string. # the output of this function will be an empty string.
if [ "$LIST_TESTS" -eq 0 ];then if [ "$LIST_TESTS" -eq 0 ];then
${P_SRV} "query_config=${1}" ${P_QUERY} "${1}"
else else
echo "1" echo "1"
fi fi
} }
requires_config_value_at_least() { requires_config_value_at_least() {
@ -2142,6 +2141,17 @@ CLI_OUT="cli_out.$$"
PXY_OUT="pxy_out.$$" PXY_OUT="pxy_out.$$"
SESSION="session.$$" SESSION="session.$$"
# `$P_QUERY MBEDTLS_PLATFORM_STD_NV_SEED_FILE` will return `"seedfile"` and
# `dd` will create file with double quotes. That's not expected, with `eval`
# we can remove double quotes
NV_SEED_FILE=$(eval "echo `$P_QUERY MBEDTLS_PLATFORM_STD_NV_SEED_FILE`")
if [ -n "$NV_SEED_FILE" ] && [ ! -f $NV_SEED_FILE ]
then
dd if=/dev/urandom of=$NV_SEED_FILE bs=64 count=1 2>/dev/null
fi
SKIP_NEXT="NO" SKIP_NEXT="NO"
trap cleanup INT TERM HUP trap cleanup INT TERM HUP

3
tests/suites/test_suite_ssl.function
View File

@ -4540,6 +4540,8 @@ void raw_key_agreement_fail(int bad_server_ecdhe_key)
&(server.socket), &(server.socket),
BUFFSIZE), 0); BUFFSIZE), 0);
USE_PSA_INIT();
TEST_EQUAL(mbedtls_test_move_handshake_to_state( TEST_EQUAL(mbedtls_test_move_handshake_to_state(
&(client.ssl), &(server.ssl), &(client.ssl), &(server.ssl),
MBEDTLS_SSL_CLIENT_KEY_EXCHANGE), 0); MBEDTLS_SSL_CLIENT_KEY_EXCHANGE), 0);
@ -4555,6 +4557,7 @@ void raw_key_agreement_fail(int bad_server_ecdhe_key)
(client.ssl).handshake->xxdh_psa_peerkey[0] ^= 0x02; (client.ssl).handshake->xxdh_psa_peerkey[0] ^= 0x02;
} }
TEST_EQUAL(mbedtls_test_move_handshake_to_state( TEST_EQUAL(mbedtls_test_move_handshake_to_state(
&(client.ssl), &(server.ssl), MBEDTLS_SSL_HANDSHAKE_OVER), &(client.ssl), &(server.ssl), MBEDTLS_SSL_HANDSHAKE_OVER),
bad_server_ecdhe_key ? MBEDTLS_ERR_SSL_HW_ACCEL_FAILED : 0); bad_server_ecdhe_key ? MBEDTLS_ERR_SSL_HW_ACCEL_FAILED : 0);