yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-01-22 23:21:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

ssl-opt.sh: add --priority=normal to gnutls

Browse source 
For calls to gnutls-serv and gnutls-cli where --priority is not
specified, explicitly add the default value: --priority=normal. This is
needed for some tests on Ubuntu 20.04 (gnutls 3.6.13).

For example:
./ssl-opt.sh -f "DTLS fragmenting: gnutls.*1.0"
requires this PR to work on Ubuntu 20.04

Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
This commit is contained in:
Dave Rodgman 2021-02-10 12:45:41 +00:00
parent 8a129828da
commit 0279c2fc70
1 changed files with 39 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
tests/ssl-opt.sh
View file

@ -634,6 +634,21 @@ detect_dtls() {
fi fi
} }
# check if the given command uses gnutls and sets global variable CMD_IS_GNUTLS
is_gnutls() {
case "$1" in
*gnutls-cli*)
CMD_IS_GNUTLS=1
;;
*gnutls-serv*)
CMD_IS_GNUTLS=1
;;
*)
CMD_IS_GNUTLS=0
;;
esac
}
# Compare file content # Compare file content
# Usage: find_in_both pattern file1 file2 # Usage: find_in_both pattern file1 file2
# extract from file1 the first line matching the pattern # extract from file1 the first line matching the pattern
@ -726,6 +741,30 @@ run_test() {
esac esac
fi fi
# update CMD_IS_GNUTLS variable
is_gnutls "$SRV_CMD"
# if the server uses gnutls but doesn't set priority, explicitly
# set the default priority
if [ "$CMD_IS_GNUTLS" -eq 1 ]; then
case "$SRV_CMD" in
*--priority*) :;;
*) SRV_CMD="$SRV_CMD --priority=NORMAL";;
esac
fi
# update CMD_IS_GNUTLS variable
is_gnutls "$CLI_CMD"
# if the client uses gnutls but doesn't set priority, explicitly
# set the default priority
if [ "$CMD_IS_GNUTLS" -eq 1 ]; then
case "$CLI_CMD" in
*--priority*) :;;
*) CLI_CMD="$CLI_CMD --priority=NORMAL";;
esac
fi
# fix client port # fix client port
if [ -n "$PXY_CMD" ]; then if [ -n "$PXY_CMD" ]; then
CLI_CMD=$( echo "$CLI_CMD" | sed s/+SRV_PORT/$PXY_PORT/g ) CLI_CMD=$( echo "$CLI_CMD" | sed s/+SRV_PORT/$PXY_PORT/g )